Merge pull request #25842 from taosdata/last-fix-3.0

fix: cache update for last key
taosdata · May 17, 2024 · 589e822 · 589e822
2 parents 5760ac2 + bf40585
commit 589e822
Showing 1 changed file with 33 additions and 35 deletions.
diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -1075,51 +1075,49 @@ static int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, SArray
         continue;
       }
 
-      if (IS_LAST_ROW_KEY(idxKey->key)) {
-        int32_t cmp_res = 1;
-        if (pLastCol) {
-          cmp_res = tRowKeyCompare(&pLastCol->rowKey, pRowKey);
-        }
-
-        if (NULL == pLastCol || cmp_res < 0 || (cmp_res == 0 && !COL_VAL_IS_NONE(pColVal))) {
-          char    *value = NULL;
-          size_t   vlen = 0;
-          SLastCol lastColTmp = {.rowKey = *pRowKey, .colVal = *pColVal};
-          tsdbCacheSerialize(&lastColTmp, &value, &vlen);
+      int32_t cmp_res = 1;
+      if (pLastCol) {
+        cmp_res = tRowKeyCompare(&pLastCol->rowKey, pRowKey);
+      }
 
-          taosThreadMutexLock(&pTsdb->rCache.rMutex);
+      if (NULL == pLastCol || cmp_res < 0 || (cmp_res == 0 && !COL_VAL_IS_NONE(pColVal))) {
+        char    *value = NULL;
+        size_t   vlen = 0;
+        SLastCol lastColTmp = {.rowKey = *pRowKey, .colVal = *pColVal};
+        tsdbCacheSerialize(&lastColTmp, &value, &vlen);
 
-          rocksdb_writebatch_put(wb, (char *)&idxKey->key, ROCKS_KEY_LEN, value, vlen);
+        taosThreadMutexLock(&pTsdb->rCache.rMutex);
 
-          taosThreadMutexUnlock(&pTsdb->rCache.rMutex);
+        rocksdb_writebatch_put(wb, (char *)&idxKey->key, ROCKS_KEY_LEN, value, vlen);
 
-          pLastCol = &lastColTmp;
-          SLastCol *pTmpLastCol = taosMemoryCalloc(1, sizeof(SLastCol));
-          *pTmpLastCol = *pLastCol;
-          pLastCol = pTmpLastCol;
+        taosThreadMutexUnlock(&pTsdb->rCache.rMutex);
 
-          size_t charge = sizeof(*pLastCol);
-          for (int8_t i = 0; i < pLastCol->rowKey.numOfPKs; i++) {
-            SValue *pValue = &pLastCol->rowKey.pks[i];
-            if (IS_VAR_DATA_TYPE(pValue->type)) {
-              reallocVarDataVal(pValue);
-              charge += pValue->nData;
-            }
-          }
+        pLastCol = &lastColTmp;
+        SLastCol *pTmpLastCol = taosMemoryCalloc(1, sizeof(SLastCol));
+        *pTmpLastCol = *pLastCol;
+        pLastCol = pTmpLastCol;
 
-          if (IS_VAR_DATA_TYPE(pLastCol->colVal.value.type)) {
-            reallocVarData(&pLastCol->colVal);
-            charge += pLastCol->colVal.value.nData;
+        size_t charge = sizeof(*pLastCol);
+        for (int8_t i = 0; i < pLastCol->rowKey.numOfPKs; i++) {
+          SValue *pValue = &pLastCol->rowKey.pks[i];
+          if (IS_VAR_DATA_TYPE(pValue->type)) {
+            reallocVarDataVal(pValue);
+            charge += pValue->nData;
           }
+        }
 
-          LRUStatus status = taosLRUCacheInsert(pTsdb->lruCache, &idxKey->key, ROCKS_KEY_LEN, pLastCol, charge,
-                                                tsdbCacheDeleter, NULL, TAOS_LRU_PRIORITY_LOW, &pTsdb->flushState);
-          if (status != TAOS_LRU_STATUS_OK) {
-            code = -1;
-          }
+        if (IS_VAR_DATA_TYPE(pLastCol->colVal.value.type)) {
+          reallocVarData(&pLastCol->colVal);
+          charge += pLastCol->colVal.value.nData;
+        }
 
-          taosMemoryFree(value);
+        LRUStatus status = taosLRUCacheInsert(pTsdb->lruCache, &idxKey->key, ROCKS_KEY_LEN, pLastCol, charge,
+                                              tsdbCacheDeleter, NULL, TAOS_LRU_PRIORITY_LOW, &pTsdb->flushState);
+        if (status != TAOS_LRU_STATUS_OK) {
+          code = -1;
         }
+
+        taosMemoryFree(value);
       }
 
       taosMemoryFreeClear(PToFree);