Merge branch 'master' into hotfix/slguan

src/system/detail/src/vnodeQueryImpl.c

@@ -4239,8 +4239,8 @@ static int32_t moveToNextBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t step, __bl
 
         return DISK_DATA_LOADED;
       } else {
-        pQuery->pos = (step == QUERY_ASC_FORWARD_STEP) ? 0 : pQuery->pBlock[pQuery->slot].numOfPoints - 1;
         pQuery->slot = (step == QUERY_ASC_FORWARD_STEP) ? 0 : pQuery->numOfBlocks - 1;
+        pQuery->pos = (step == QUERY_ASC_FORWARD_STEP) ? 0 : pQuery->pBlock[pQuery->slot].numOfPoints - 1;
       }
     } else {  // next block in the same file
       int32_t fid = pQuery->fileId;