Replacing Block with Columns in HashJoin state.#82358
Merged
KochetovNicolai merged 9 commits intomasterfrom Jun 25, 2025
Merged
Replacing Block with Columns in HashJoin state.#82358KochetovNicolai merged 9 commits intomasterfrom
KochetovNicolai merged 9 commits intomasterfrom
Conversation
Contributor
clickhouse-gh
bot
added
the
pr-not-for-changelog
vdimir
approved these changes
Jun 23, 2025
alexey-milovidov
changed the title
nickitat
reviewed
Jun 23, 2025
| size_t debug_allocated_size = 0; | ||
| for (const auto & columns : data->columns) | ||
| for (const auto & column : columns.columns) | ||
| debug_allocated_size += column->allocatedBytes(); |
Member
There was a problem hiding this comment.
I think here we should adjust the column bytes according to how many rows are in the selector:
| data->blocks_allocated_size += block_to_save.allocatedBytes(); | ||
| data->blocks.emplace_back(std::move(block_to_save)); | ||
| const auto * stored_block = &data->blocks.back(); | ||
| size_t data_allocated_bytes = block_to_save.allocatedBytes(); |
Member
There was a problem hiding this comment.
here we seem to use the specialised ScatteredBlock::allocatedBytes() too
Member
Author
There was a problem hiding this comment.
yes, I think it was intended to calculate only scattered data. Also, it looks like block_to_save did not have selector, so maybe it would change the behavior. Let's try :)
|
|
||
| for (auto & column : stored_columns.columns) | ||
| { | ||
| old_size += column->allocatedBytes(); |
nickitat
reviewed
Jun 23, 2025
| } | ||
| const Block & sample_right_block = *((*selected_rows.begin())->block); | ||
| if (!sample_right_block || !added_columns.additional_filter_expression) | ||
| //const Block & sample_right_block = *((*selected_rows.begin())->block); |
Co-authored-by: Nikita Taranov <[email protected]>
robot-ch-test-poll2
added
the
pr-synced-to-cloud
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jun 27, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 27, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 27, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jun 27, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 27, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jun 28, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 28, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jun 29, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 29, 2025
baibaichen
pushed a commit
to apache/gluten
that referenced
this pull request
Jun 29, 2025
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250629) * Fix Build due to ClickHouse/ClickHouse#80931 * Fix Build due to ClickHouse/ClickHouse#81976 * Fix Build due to ClickHouse/ClickHouse#82508 * Try to Fix issue caused by ClickHouse/ClickHouse#81754 see ClickHouse/ClickHouse#82379 * Fix UT due to ClickHouse/ClickHouse#82358 --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang chen <[email protected]>
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jun 29, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 3, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 4, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 5, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 6, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 7, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 7, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 8, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 9, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 10, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 11, 2025
baibaichen
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 14, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 14, 2025
kyligence-git
pushed a commit
to Kyligence/ClickHouse
that referenced
this pull request
Jul 15, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category (leave one):
Documentation entry for user-facing changes