From ec0d8409a348368c053247ef8aeae5ebd644b327 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Fri, 6 Dec 2024 14:25:11 +0800
Subject: [PATCH] fix ci issues

---
 source/dnode/vnode/src/tsdb/tsdbCache.c    | 25 ++++++++++++++++------
 source/dnode/vnode/src/tsdb/tsdbMemTable.c |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index eb36f56291..493942252a 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -626,7 +626,7 @@ int32_t tsdbLoadFromImem(SMemTable *imem, int64_t suid, int64_t uid) {
   // tsdbBuildDeleteSkyline
   size_t delSize = TARRAY_SIZE(pMemDelData);
   if (delSize > 0) {
-    TAOS_CHECK_GOTO(tsdbBuildDeleteSkyline(pTombData, 0, (int32_t)(delSize - 1), pSkyline), &lino, _exit);
+    TAOS_CHECK_EXIT(tsdbBuildDeleteSkyline(pTombData, 0, (int32_t)(delSize - 1), pSkyline));
     iSkyline = taosArrayGetSize(pSkyline) - 1;
   }
 
@@ -687,6 +687,9 @@ int32_t tsdbLoadFromImem(SMemTable *imem, int64_t suid, int64_t uid) {
     STsdbRowKey tsdbRowKey = {0};
     tsdbRowGetKey(pMemRow, &tsdbRowKey);
 
+    STSDBRowIter iter = {0};
+    TAOS_CHECK_EXIT(tsdbRowIterOpen(&iter, pMemRow, pTSchema));
+
     int32_t iCol = 0;
     for (SColVal *pColVal = tsdbRowIterNext(&iter); pColVal && iCol < nCol; pColVal = tsdbRowIterNext(&iter), iCol++) {
       if (tSimpleHashGet(iColHash, &pColVal->cid, sizeof(pColVal->cid)) && COL_VAL_IS_VALUE(pColVal)) {
@@ -2485,12 +2488,16 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
   TAOS_CHECK_EXIT(tsdbRowIterOpen(&rowIter, pRow, pTSchema));
 
   int32_t iCol = 0, jCol = 0, jnCol = TARRAY_SIZE(pLastArray);
-  for (SColVal *pColVal = tsdbRowIterNext(&rowIter); pColVal && iCol < nCol && jCol < jnCol;
-       pColVal = tsdbRowIterNext(&rowIter), ++iCol) {
+  for (SColVal *pColVal = tsdbRowIterNext(&rowIter); pColVal && iCol < nCol && jCol < jnCol;) {
     SLastCol *pTargetCol = &((SLastCol *)TARRAY_DATA(pLastArray))[jCol];
     if (pColVal->cid < pTargetCol->colVal.cid) {
+      pColVal = tsdbRowIterNext(&rowIter), ++iCol;
+
       continue;
     }
+    if (pColVal->cid > pTargetCol->colVal.cid) {
+      break;
+    }
 
     int32_t cmp_res = tRowKeyCompare(&pTargetCol->rowKey, &rowKey.key);
     if (!IS_LAST_KEY(((SLastKey *)TARRAY_DATA(keyArray))[jCol])) {
@@ -2505,7 +2512,7 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
       if (COL_VAL_IS_VALUE(pColVal)) {
         if (cmp_res <= 0) {
           SLastCol lastCol = {
-              .rowKey = rowKey.key, .colVal = pTargetCol->colVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
+              .rowKey = rowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
           TAOS_CHECK_GOTO(tsdbCacheReallocSLastCol(&lastCol, NULL), &lino, _exit);
 
           tsdbCacheFreeSLastColItem(pTargetCol);
@@ -2526,6 +2533,10 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
     }
 
     ++jCol;
+
+    if (jCol < jnCol && ((SLastCol *)TARRAY_DATA(pLastArray))[jCol].colVal.cid > pColVal->cid) {
+      pColVal = tsdbRowIterNext(&rowIter), ++iCol;
+    }
   }
   tsdbRowClose(&rowIter);
 
@@ -2554,12 +2565,12 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
          pColVal = tsdbRowIterNext(&rowIter), iCol++) {
       int32_t *pjCol = tSimpleHashGet(iColHash, &pColVal->cid, sizeof(pColVal->cid));
       if (pjCol && COL_VAL_IS_VALUE(pColVal)) {
-        SLastCol *pTargetCol = &((SLastCol *)TARRAY_DATA(pLastArray))[jCol];
-        int32_t   cmp_res = tRowKeyCompare(&pTargetCol->rowKey, &rowKey.key);
+        SLastCol *pTargetCol = &((SLastCol *)TARRAY_DATA(pLastArray))[*pjCol];
+        int32_t   cmp_res = tRowKeyCompare(&pTargetCol->rowKey, &tsdbRowKey.key);
 
         if (cmp_res <= 0) {
           SLastCol lastCol = {
-              .rowKey = rowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
+              .rowKey = tsdbRowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
           TAOS_CHECK_GOTO(tsdbCacheReallocSLastCol(&lastCol, NULL), &lino, _exit);
 
           tsdbCacheFreeSLastColItem(pTargetCol);
diff --git a/source/dnode/vnode/src/tsdb/tsdbMemTable.c b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
index 019e309444..aaf48924e5 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
@@ -335,7 +335,7 @@ int32_t tsdbMemTableSaveToCache(SMemTable *pMemTable, void *func) {
     STbData *pTbData = pMemTable->aBucket[i];
     while (pTbData) {
       code = (*cb)(pMemTable, pTbData->suid, pTbData->uid);
-      if (!code) {
+      if (code) {
         TAOS_RETURN(code);
       }