Merge pull request #10136 from taosdata/TD-13349-D

[TD-13349]<fix>(query): offset no calc read rows

src/tsdb/src/tsdbRead.c

@@ -1171,6 +1171,8 @@ static int32_t offsetSkipBlock(STsdbQueryHandle* q, SBlockInfo* pBlockInfo, int6
             q->frows += pBlock->numOfRows; // maybe have some row in memroy
           }
         } else {
+          // already read rows belong to forbid skip rows -> frows
+          q->frows += pBlock->numOfRows;
           // the remainder be put to pArray
           if(pArray == NULL)
               pArray = taosArrayInit(1, sizeof(SRange));
@@ -1237,22 +1239,24 @@ static int32_t offsetSkipBlock(STsdbQueryHandle* q, SBlockInfo* pBlockInfo, int6
           q->frows += pBlock->numOfRows; // maybe have some row in memroy
         }
       } else {
-          // the remainder be put to pArray
-          if(pArray == NULL)
-              pArray = taosArrayInit(1, sizeof(SRange));
-          if(range.from == -1) {
+        // already read rows belong to forbid skip rows -> frows
+        q->frows += pBlock->numOfRows;
+        // the remainder be put to pArray
+        if(pArray == NULL)
+            pArray = taosArrayInit(1, sizeof(SRange));
+        if(range.from == -1) {
+          range.from = i;
+        } else {
+          if(range.to - 1 != i) {
+            // add the previous
+            taosArrayPush(pArray, &range);
             range.from = i;
-          } else {
-            if(range.to - 1 != i) {
-              // add the previous
-              taosArrayPush(pArray, &range);
-              range.from = i;
-            }
           }
-          range.to = 0;
-          taosArrayPush(pArray, &range);
-          range.from = -1;
-          break;
+        }
+        range.to = 0;
+        taosArrayPush(pArray, &range);
+        range.from = -1;
+        break;
       }
     }
 

tests/parallel_test/cases.task

@@ -155,7 +155,7 @@
 48,,script,./test.sh -f unique/dnode/datatrans_3node.sim 
 48,,script,./test.sh -f unique/big/tcp.sim 
 48,,script,./test.sh -f general/parser/nestquery.sim 
-# 48,,script,./test.sh -f general/parser/col_arithmetic_operation.sim 
+48,,script,./test.sh -f general/parser/col_arithmetic_operation.sim 
 48,,pytest,python3 test.py -f query/queryStateWindow.py 
 47,,system-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-illegalData.py 
 47,,script,./test.sh -f unique/stable/balance_replica1.sim