Merge pull request #17209 from taosdata/fix/TS-1880-V26

fix(query): mem tskey maybe large than pCheckInfo->lastKey if order desc

Merge pull request #17209 from taosdata/fix/TS-1880-V26
fix(query): mem tskey maybe large than pCheckInfo->lastKey if order desc
27c1064d · dapan1121 · GitHub · 52fd0196 · 5f18a32e · 27c1064d
隐藏空白更改
内联并排

Showing with 8 addition and 4 deletion

src/tsdb/src/tsdbRead.c src/tsdb/src/tsdbRead.c +8 -4

未找到文件。
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -836,9 +836,11 @@ static bool initTableMemIterator(STsdbQueryHandle* pHandle, STableCheckInfo* pCh

    if (ASCENDING_TRAVERSE(order)) {
      assert(pCheckInfo->lastKey <= key);
-    } else {
-      assert(pCheckInfo->lastKey >= key);
    }
+    // mem data tskey maybe large than pCheckInfo->lastKey
+    //} else {
+    //  assert(pCheckInfo->lastKey >= key);
+    //}

  } else {
    tsdbDebug("%p uid:%"PRId64", tid:%d no data in mem, 0x%"PRIx64, pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid,
@@ -858,9 +860,11 @@ static bool initTableMemIterator(STsdbQueryHandle* pHandle, STableCheckInfo* pCh

    if (ASCENDING_TRAVERSE(order)) {
      assert(pCheckInfo->lastKey <= key);
-    } else {
-      assert(pCheckInfo->lastKey >= key);
    }
+    // imem data tskey maybe large than pCheckInfo->lastKey
+    //} else {
+    //  assert(pCheckInfo->lastKey >= key);
+    //}
  } else {
    tsdbDebug("%p uid:%"PRId64", tid:%d no data in imem, 0x%"PRIx64, pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid,
        pHandle->qId);