Skip to content

Commit

Permalink
[fix](spill join) fix coredump of debug_string (#36715)
Browse files Browse the repository at this point in the history
## Proposed changes

Issue Number: close #xxx

<!--Describe your changes.-->
  • Loading branch information
jacktengg authored Jun 24, 2024
1 parent 49a72b1 commit c1ef016
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,12 @@ Status PartitionedHashJoinProbeLocalState::recovery_build_blocks_from_disk(Runti
return spill_io_pool->submit_func(exception_catch_func);
}

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);
}

Expand Down
4 changes: 2 additions & 2 deletions be/src/pipeline/exec/partitioned_hash_join_probe_operator.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ class PartitionedHashJoinProbeLocalState final
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:
Expand Down Expand Up @@ -153,8 +155,6 @@ class PartitionedHashJoinProbeOperatorX final
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) {
Expand Down

0 comments on commit c1ef016

Please sign in to comment.