add some code

hubgeter · Jan 15, 2025 · 67c3141 · 67c3141
1 parent fce72db
commit 67c3141
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/be/src/vec/exec/scan/scanner_scheduler.cpp b/be/src/vec/exec/scan/scanner_scheduler.cpp
@@ -263,11 +263,17 @@ void ScannerScheduler::_scanner_scan(std::shared_ptr<ScannerContext> ctx,
             eos = true;
             break;
         }
+        if (state->is_cancelled()) {
+            LOG(INFO) << fmt::format("[Limit Debug] QueryId = {} _scanner_scan is_cancelled",
+                                     print_id(state->query_id()));
+            eos = true;
+        }
         BlockUPtr free_block = ctx->get_free_block(first_read);
         if (free_block == nullptr) {
             break;
         }
         status = scanner->get_block_after_projects(state, free_block.get(), &eos);
+        auto free_block_rows = free_block->rows();
         first_read = false;
         if (!status.ok()) {
             LOG(WARNING) << "Scan thread read VScanner failed: " << status.to_string();
@@ -293,7 +299,7 @@ void ScannerScheduler::_scanner_scan(std::shared_ptr<ScannerContext> ctx,
             scan_task->cached_blocks.push_back(std::move(free_block));
         }
 
-        if (limit > 0 && limit < ctx->batch_size()) {
+        if (limit > 0 && limit < ctx->batch_size() && free_block_rows > 0) {
             break;
         }
     } // end for while

diff --git a/be/src/vec/exec/scan/vscanner.cpp b/be/src/vec/exec/scan/vscanner.cpp
@@ -147,7 +147,7 @@ Status VScanner::get_block(RuntimeState* state, Block* block, bool* eof) {
 
             LOG(INFO) << fmt::format(
                     "[Limit Debug] QueryId = {}  Cancelled = {}, block Rows = {}, should_stop = {}",
-                    print_id(_state->query_id()), state->is_cancelled(), block->rows(),
+                    print_id(state->query_id()), state->is_cancelled(), block->rows(),
                     _should_stop);
             // record rows return (after filter) for _limit check
             _num_rows_return += block->rows();