This is an automated email from the ASF dual-hosted git repository.
lihaopeng pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 11201feae53 [fix](spill join) fix coredump of debug_string (#36723)
11201feae53 is described below
commit 11201feae539950d5eca45d64f9b87e7994beb5b
Author: TengJianPing <[email protected]>
AuthorDate: Tue Jun 25 16:33:33 2024 +0800
[fix](spill join) fix coredump of debug_string (#36723)
## Proposed changes
Pick #36715
<!--Describe your changes.-->
---
be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp | 11 +++++------
be/src/pipeline/exec/partitioned_hash_join_probe_operator.h | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
b/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
index 0576ae91dd6..628be711b41 100644
--- a/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
+++ b/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
@@ -437,13 +437,12 @@ Status
PartitionedHashJoinProbeLocalState::recovery_build_blocks_from_disk(Runti
return st;
}
-std::string PartitionedHashJoinProbeOperatorX::debug_string(RuntimeState*
state,
- int
indentation_level) const {
+std::string PartitionedHashJoinProbeLocalState::debug_string(int
indentation_level) const {
fmt::memory_buffer debug_string_buffer;
- fmt::format_to(debug_string_buffer, "{}, in mem join probe: {}",
-
JoinProbeOperatorX<PartitionedHashJoinProbeLocalState>::debug_string(
- state, indentation_level),
- _inner_probe_operator ?
_inner_probe_operator->debug_string(state, 0) : "NULL");
+ fmt::format_to(debug_string_buffer, "{}, short_circuit_for_probe: {}",
+
PipelineXSpillLocalState<PartitionedHashJoinSharedState>::debug_string(
+ indentation_level),
+ _shared_state ?
std::to_string(_shared_state->short_circuit_for_probe) : "NULL");
return fmt::to_string(debug_string_buffer);
}
diff --git a/be/src/pipeline/exec/partitioned_hash_join_probe_operator.h
b/be/src/pipeline/exec/partitioned_hash_join_probe_operator.h
index d56a57ae428..6be6c5a865b 100644
--- a/be/src/pipeline/exec/partitioned_hash_join_probe_operator.h
+++ b/be/src/pipeline/exec/partitioned_hash_join_probe_operator.h
@@ -61,6 +61,8 @@ public:
void update_build_profile(RuntimeProfile* child_profile);
void update_probe_profile(RuntimeProfile* child_profile);
+ std::string debug_string(int indentation_level = 0) const override;
+
friend class PartitionedHashJoinProbeOperatorX;
private:
@@ -155,8 +157,6 @@ public:
Status pull(doris::RuntimeState* state, vectorized::Block* output_block,
bool* eos) const override;
- std::string debug_string(RuntimeState* state, int indentation_level = 0)
const override;
-
bool need_more_input_data(RuntimeState* state) const override;
DataDistribution required_data_distribution() const override {
if (_join_op == TJoinOp::NULL_AWARE_LEFT_ANTI_JOIN) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
