FIX COMPILE

zhiqiang-hhhh · Oct 28, 2024 · 217e8c3 · 217e8c3
1 parent 989b380
commit 217e8c3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/be/src/vec/exec/scan/pip_scanner_context.h b/be/src/vec/exec/scan/pip_scanner_context.h
@@ -32,8 +32,20 @@ class PipScannerContext final : public vectorized::ScannerContext {
                       const RowDescriptor* output_row_descriptor,
                       const std::list<std::shared_ptr<vectorized::ScannerDelegate>>& scanners,
                       int64_t limit_, bool ignore_data_distribution)
-            : vectorized::ScannerContext(state, parent, output_tuple_desc, output_row_descriptor,
-                                         scanners, limit_, ignore_data_distribution) {}
+            : vectorized::ScannerContext(
+                      state, parent, output_tuple_desc, output_row_descriptor, scanners, limit_,
+                      ignore_data_distribution,
+                      /*non-pipeine & old pipeine does not process file scan operator seperatyly*/
+                      /*they use state->query_parallel_instance_num() as num_parallel_instances, see:
+                        _max_thread_num = _state->num_scanner_threads() > 0
+                              ? _state->num_scanner_threads()
+                              : config::doris_scanner_thread_pool_thread_num /
+                                        (_local_state ? num_parallel_instances
+                                                      : state->query_parallel_instance_num());
+                                            */
+                      // so we set is_file_scan_operator to true
+                      // so that _max_thread_num will be same like before for engine except for pipelineX
+                      true) {}
 };
 
 class PipXScannerContext final : public vectorized::ScannerContext {
@@ -45,9 +57,10 @@ class PipXScannerContext final : public vectorized::ScannerContext {
                        const RowDescriptor* output_row_descriptor,
                        const std::list<std::shared_ptr<vectorized::ScannerDelegate>>& scanners,
                        int64_t limit_, std::shared_ptr<pipeline::Dependency> dependency,
-                       bool ignore_data_distribution)
+                       bool ignore_data_distribution, bool is_file_scan_operator)
             : vectorized::ScannerContext(state, output_tuple_desc, output_row_descriptor, scanners,
-                                         limit_, ignore_data_distribution, local_state) {
+                                         limit_, ignore_data_distribution, is_file_scan_operator,
+                                         local_state) {
         _dependency = dependency;
     }
 

diff --git a/be/src/vec/exec/scan/scanner_context.h b/be/src/vec/exec/scan/scanner_context.h
@@ -183,7 +183,8 @@ class ScannerContext : public std::enable_shared_from_this<ScannerContext>,
     ScannerContext(RuntimeState* state_, const TupleDescriptor* output_tuple_desc,
                    const RowDescriptor* output_row_descriptor,
                    const std::list<std::shared_ptr<ScannerDelegate>>& scanners_, int64_t limit_,
-                   bool ignore_data_distribution, pipeline::ScanLocalStateBase* local_state);
+                   bool ignore_data_distribution, bool is_file_scan_operator,
+                   pipeline::ScanLocalStateBase* local_state);
 
     /// Four criteria to determine whether to increase the parallelism of the scanners
     /// 1. It ran for at least `SCALE_UP_DURATION` ms after last scale up