Merge pull request #28921 from taosdata/fix/TD-33008-main

guanshengliang · web-flow · commit 135131fb3a8e · 2024-11-26T11:56:41.000+08:00
fix(query)[TD-33008]. fix error handling in tsdbCacheRead
diff --git a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
@@ -346,7 +346,8 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, void* pTableIdList,
       p->rowKey.pks[0].pData = taosMemoryCalloc(1, pPkCol->bytes);
       if (p->rowKey.pks[0].pData == NULL) {
         taosMemoryFreeClear(p);
-        TSDB_CHECK_NULL(p->rowKey.pks[0].pData, code, lino, _end, terrno);
+        code = terrno;
+        TSDB_CHECK_CODE(code, lino, _end);
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,8 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, void* pTableIdList,`
`346`	`346`	`p->rowKey.pks[0].pData = taosMemoryCalloc(1, pPkCol->bytes);`
`347`	`347`	`if (p->rowKey.pks[0].pData == NULL) {`
`348`	`348`	`taosMemoryFreeClear(p);`
`349`		`- TSDB_CHECK_NULL(p->rowKey.pks[0].pData, code, lino, _end, terrno);`
	`349`	`+ code = terrno;`
	`350`	`+ TSDB_CHECK_CODE(code, lino, _end);`
`350`	`351`	`}`
`351`	`352`	`}`
`352`	`353`