update

apache · Nov 28, 2024 · 72625c2 · 72625c2
1 parent b7fa249
commit 72625c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/be/src/pipeline/exec/nested_loop_join_build_operator.cpp b/be/src/pipeline/exec/nested_loop_join_build_operator.cpp
@@ -84,7 +84,7 @@ Status NestedLoopJoinBuildSinkLocalState::init(RuntimeState* state, LocalSinkSta
         }
     }
 
-    profile()->add_info_string("ShareCollectedEnabled",
+    profile()->add_info_string("SharedCollectedEnabled",
                                std::to_string(state->enable_share_hash_table_for_broadcast_join()));
     profile()->add_info_string("ShouldCollectedBlocks", std::to_string(_should_collected_blocks));
     if (!_should_collected_blocks) {
@@ -147,12 +147,12 @@ Status NestedLoopJoinBuildSinkOperatorX::sink(doris::RuntimeState* state, vector
 
     auto rows = block->rows();
     if (rows != 0) {
+        COUNTER_UPDATE(local_state.rows_input_counter(), (int64_t)rows);
         if (_match_all_build || _is_right_semi_anti) {
             local_state._shared_state->build_side_visited_flags.emplace_back(
                     vectorized::ColumnUInt8::create(rows, 0));
         }
         if (local_state._should_collected_blocks) {
-            COUNTER_UPDATE(local_state.rows_input_counter(), (int64_t)rows);
             auto mem_usage = block->allocated_bytes();
             local_state._build_rows += rows;
             local_state._total_mem_usage += mem_usage;
@@ -199,7 +199,6 @@ Status NestedLoopJoinBuildSinkOperatorX::sink(doris::RuntimeState* state, vector
                 print_id(_shared_collected_data_controller->get_builder_fragment_instance_id(
                         node_id())));
     }
-
     if (eos) {
         // optimize `in bitmap`, see https://github.com/apache/doris/issues/14338
         if (_is_output_left_side_only && ((_join_op == TJoinOp::type::LEFT_SEMI_JOIN &&

diff --git a/be/src/pipeline/exec/nested_loop_join_build_operator.h b/be/src/pipeline/exec/nested_loop_join_build_operator.h
@@ -78,6 +78,12 @@ class NestedLoopJoinBuildSinkOperatorX final
 
     Status sink(RuntimeState* state, vectorized::Block* in_block, bool eos) override;
 
+    bool should_dry_run(RuntimeState* state) override {
+        return !state->get_sink_local_state()
+                        ->cast<NestedLoopJoinBuildSinkLocalState>()
+                        ._should_collected_blocks;
+    }
+
     DataDistribution required_data_distribution() const override {
         if (_join_op == TJoinOp::NULL_AWARE_LEFT_ANTI_JOIN) {
             return {ExchangeType::NOOP};

diff --git a/...e-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java b/...e-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
@@ -1658,6 +1658,10 @@ public PlanFragment visitPhysicalNestedLoopJoin(
         if (nestedLoopJoin.getStats() != null) {
             nestedLoopJoinNode.setCardinality((long) nestedLoopJoin.getStats().getRowCount());
         }
+        PlanNode rightPlanRoot = rightFragment.getPlanRoot();
+        Preconditions.checkState(rightPlanRoot instanceof ExchangeNode,
+                "right child of nested loop join must be ExchangeNode but it is " + rightPlanRoot);
+        ((ExchangeNode) rightPlanRoot).setRightChildOfBroadcastHashJoin(true);
         nestedLoopJoinNode.setChild(0, leftFragment.getPlanRoot());
         nestedLoopJoinNode.setChild(1, rightFragment.getPlanRoot());
         setPlanRoot(leftFragment, nestedLoopJoinNode, nestedLoopJoin);