update

apache · Dec 12, 2024 · fe5e99e · fe5e99e
1 parent afdd975
commit fe5e99e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/be/src/pipeline/exec/hashjoin_build_sink.cpp b/be/src/pipeline/exec/hashjoin_build_sink.cpp
@@ -139,11 +139,6 @@ Status HashJoinBuildSinkLocalState::close(RuntimeState* state, Status exec_statu
         !p.get_local_state(state)._eos) {
         return Base::close(state, exec_status);
     }
-    bool blocked_by_complete_build_stage =
-            p._shared_hashtable_controller && !p._shared_hash_table_context->complete_build_stage;
-    bool blocked_by_shared_hash_table_signal = !_should_build_hash_table &&
-                                               p._shared_hashtable_controller &&
-                                               !p._shared_hash_table_context->signaled;
 
     try {
         if (state->get_task()->wake_up_early()) {
@@ -162,14 +157,17 @@ Status HashJoinBuildSinkLocalState::close(RuntimeState* state, Status exec_statu
                 SCOPED_TIMER(_runtime_filter_compute_timer);
                 _runtime_filter_slots->insert(block);
             }
-        } else {
-            RETURN_IF_ERROR(
-                    _runtime_filter_slots->copy_from_shared_context(p._shared_hash_table_context));
         }
 
         SCOPED_TIMER(_publish_runtime_filter_timer);
         RETURN_IF_ERROR(_runtime_filter_slots->publish(state, !_should_build_hash_table));
     } catch (Exception& e) {
+        bool blocked_by_complete_build_stage = p._shared_hashtable_controller &&
+                                               !p._shared_hash_table_context->complete_build_stage;
+        bool blocked_by_shared_hash_table_signal = !_should_build_hash_table &&
+                                                   p._shared_hashtable_controller &&
+                                                   !p._shared_hash_table_context->signaled;
+
         return Status::InternalError(
                 "rf process meet error: {}, wake_up_early: {}, should_build_hash_table: "
                 "{}, _finish_dependency: {}, blocked_by_complete_build_stage: {}, "
@@ -471,7 +469,6 @@ Status HashJoinBuildSinkOperatorX::sink(RuntimeState* state, vectorized::Block*
     SCOPED_TIMER(local_state.exec_time_counter());
     COUNTER_UPDATE(local_state.rows_input_counter(), (int64_t)in_block->rows());
 
-    local_state._eos = eos;
     if (local_state._should_build_hash_table) {
         // If eos or have already met a null value using short-circuit strategy, we do not need to pull
         // data from probe side.
@@ -548,6 +545,9 @@ Status HashJoinBuildSinkOperatorX::sink(RuntimeState* state, vectorized::Block*
             return _shared_hash_table_context->status;
         }
 
+        RETURN_IF_ERROR(local_state._runtime_filter_slots->copy_from_shared_context(
+                _shared_hash_table_context));
+
         local_state.profile()->add_info_string(
                 "SharedHashTableFrom",
                 print_id(
@@ -573,6 +573,7 @@ Status HashJoinBuildSinkOperatorX::sink(RuntimeState* state, vectorized::Block*
     }
 
     if (eos) {
+        local_state._eos = true;
         local_state.init_short_circuit_for_probe();
         // Since the comparison of null values is meaningless, null aware left anti/semi join should not output null
         // when the build side is not empty.

diff --git a/be/src/pipeline/task_scheduler.cpp b/be/src/pipeline/task_scheduler.cpp
@@ -135,7 +135,6 @@ void TaskScheduler::_do_work(int index) {
 #else
         uint32_t core_id = sched_getcpu();
 #endif
-
         ASSIGN_STATUS_IF_CATCH_EXCEPTION(
                 //TODO: use a better enclose to abstracting these
                 if (ExecEnv::GetInstance()->pipeline_tracer_context()->enabled()) {