diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index e7c7b9614e422e5cfa3d38e3ba252998cb4fc002..980caea1f3378c570b692a2dc037f6a8a1893c11 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -1159,6 +1159,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)); @@ -1225,22 +1227,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; } } diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index ebaa732e104a2a00a8632e43629348435bd3e0d9..332a8388ef046e192a6a4e621f4c1407e9bbb798 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -97,7 +97,7 @@ 47,,script,./test.sh -f unique/dnode/reason.sim 46,,script,./test.sh -f unique/mnode/mgmt22.sim 46,,pytest,python3 ./test.py -f stream/cqSupportBefore1970.py -# 45,,script,./test.sh -f general/parser/col_arithmetic_operation.sim +45,,script,./test.sh -f general/parser/col_arithmetic_operation.sim 44,,script,./test.sh -f unique/big/tcp.sim 44,,script,./test.sh -f general/parser/topbot.sim 44,,pytest,python3 ./test.py -f stream/metric_n.py