Merge pull request #15936 from taosdata/enh/refactor-idx

enh: refactor index

source/libs/index/src/index.c

@@ -485,7 +485,6 @@ static void idxMayMergeTempToFinalRslt(SArray* result, TFileValue* tfv, SIdxTRsl
       // handle last iterator
       idxTRsltMergeTo(tr, lv->tableId);
     } else {
-      // temp result saved in help
       tfileValueDestroy(tfv);
     }
   } else {

source/libs/index/src/indexCache.c

@@ -45,7 +45,7 @@ static int32_t cacheSearchLessEqual(void* cache, SIndexTerm* ct, SIdxTRslt* tr,
 static int32_t cacheSearchGreaterThan(void* cache, SIndexTerm* ct, SIdxTRslt* tr, STermValueType* s);
 static int32_t cacheSearchGreaterEqual(void* cache, SIndexTerm* ct, SIdxTRslt* tr, STermValueType* s);
 static int32_t cacheSearchRange(void* cache, SIndexTerm* ct, SIdxTRslt* tr, STermValueType* s);
-/*comm func of compare, used in (LE/LT/GE/GT compare)*/
+/*comm compare func, used in (LE/LT/GE/GT compare)*/
 static int32_t cacheSearchCompareFunc(void* cache, SIndexTerm* ct, SIdxTRslt* tr, STermValueType* s, RangeType type);
 static int32_t cacheSearchTerm_JSON(void* cache, SIndexTerm* ct, SIdxTRslt* tr, STermValueType* s);
 static int32_t cacheSearchEqual_JSON(void* cache, SIndexTerm* ct, SIdxTRslt* tr, STermValueType* s);
@@ -94,7 +94,6 @@ static int32_t cacheSearchTerm(void* cache, SIndexTerm* term, SIdxTRslt* tr, STe
     if (0 == strcmp(c->colVal, pCt->colVal) && strlen(pCt->colVal) == strlen(c->colVal)) {
       if (c->operaType == ADD_VALUE) {
         INDEX_MERGE_ADD_DEL(tr->del, tr->add, c->uid)
-        // taosArrayPush(result, &c->uid);
         *s = kTypeValue;
       } else if (c->operaType == DEL_VALUE) {
         INDEX_MERGE_ADD_DEL(tr->add, tr->del, c->uid)

source/libs/index/src/indexUtil.c

@@ -152,7 +152,7 @@ int verdataCompare(const void *a, const void *b) {
 
   int32_t cmp = compareUint64Val(&va->data, &vb->data);
   if (cmp == 0) {
-    cmp = 0 - compareUint32Val(&va->ver, &vb->data);
+    cmp = 0 - compareUint32Val(&va->ver, &vb->ver);
     return cmp;
   }
   return cmp;
@@ -181,6 +181,7 @@ void idxTRsltDestroy(SIdxTRslt *tr) {
   taosArrayDestroy(tr->total);
   taosArrayDestroy(tr->add);
   taosArrayDestroy(tr->del);
+  taosMemoryFree(tr);
 }
 void idxTRsltMergeTo(SIdxTRslt *tr, SArray *result) {
   taosArraySort(tr->total, uidCompare);