fix(query): subscribe remove block check block window

00cd2471 · Alex Duan · 4a2ca48f · 00cd2471
隐藏空白更改
内联并排

Showing with 19 addition and 15 deletion

src/query/src/qExecutor.c src/query/src/qExecutor.c +19 -15

未找到文件。
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5433,21 +5433,25 @@ static SSDataBlock* doTableScanImpl(void* param, bool* newgroup) {
      }
      // check windows condition
-      int64_t skey = (*pTableQueryInfo)->win.skey;
+      if (pBlock->info.window.skey != INT64_MIN && pBlock->info.window.skey != INT64_MAX &&
-      if (QUERY_IS_ASC_QUERY(pQueryAttr)) {
+          pBlock->info.window.ekey != INT64_MIN && pBlock->info.window.ekey != INT64_MAX) {
-        // ASC
+            // normal block not specail block like last_row
-        if ( skey > pBlock->info.window.ekey ) {
+            int64_t skey = (*pTableQueryInfo)->win.skey;
-          qWarn(" pTableQueryInfo skey(%" PRId64 ") > pBlock ekey(%" PRId64 "), so remove this block. pBlock skey=%" PRId64 " tid=%d",
+            if (QUERY_IS_ASC_QUERY(pQueryAttr)) {
-                  skey, pBlock->info.window.ekey, pBlock->info.window.skey, pBlock->info.tid);
+              // ASC
-          continue;
+              if ( skey > pBlock->info.window.ekey ) {
-        }
+                qWarn(" pTableQueryInfo skey(%" PRId64 ") > pBlock ekey(%" PRId64 "), so remove this block. pBlock skey=%" PRId64 " tid=%d",
-      } else {
+                        skey, pBlock->info.window.ekey, pBlock->info.window.skey, pBlock->info.tid);
-        // DESC
+                continue;
-        if ( skey < pBlock->info.window.skey ) {
+              }
-          qWarn(" pTableQueryInfo skey(%" PRId64 ") < pBlock skey(%" PRId64 "), so remove this block. pBlock ekey=%" PRId64 "tid=%d",
+            } else {
-                skey, pBlock->info.window.skey, pBlock->info.window.ekey, pBlock->info.tid);
+              // DESC
-          continue;
+              if ( skey < pBlock->info.window.skey ) {
-        }
+                qWarn(" pTableQueryInfo skey(%" PRId64 ") < pBlock skey(%" PRId64 "), so remove this block. pBlock ekey=%" PRId64 "tid=%d",
+                      skey, pBlock->info.window.skey, pBlock->info.window.ekey, pBlock->info.tid);
+                continue;
+              }
+            }
      }
      pRuntimeEnv->current = *pTableQueryInfo;