Skip to content

Fix another Context-related segfault#12401

Merged
alexey-milovidov merged 1 commit intomasterfrom
fix_segfault_in_storage_merge
Jul 10, 2020
Merged

Fix another Context-related segfault#12401
alexey-milovidov merged 1 commit intomasterfrom
fix_segfault_in_storage_merge

Conversation

@tavplubix
Copy link
Copy Markdown
Member

@tavplubix tavplubix commented Jul 10, 2020

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Bug Fix

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fixed possible segfault if StorageMerge. Closes #12054

@robot-clickhouse robot-clickhouse added the pr-bugfix Pull request with bugfix, not backported by default label Jul 10, 2020
@nikitamikhaylov nikitamikhaylov self-assigned this Jul 10, 2020
max_parallel_streams += pipe.max_parallel_streams;
processors.insert(processors.end(), pipe.processors.begin(), pipe.processors.end());

std::move(pipe.table_locks.begin(), pipe.table_locks.end(), std::back_inserter(table_locks));
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The context of this code is not clear for me. Maybe add some comments?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment is here. These shared pointers were lost when creating a Pipe from other Pipes.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok.

@alexey-milovidov alexey-milovidov merged commit 7c2bd32 into master Jul 10, 2020
@alexey-milovidov alexey-milovidov deleted the fix_segfault_in_storage_merge branch July 10, 2020 21:19
CurtizJ pushed a commit that referenced this pull request Jul 17, 2020
Fix another Context-related segfault

(cherry picked from commit 7c2bd32)
CurtizJ pushed a commit that referenced this pull request Jul 19, 2020
Fix another Context-related segfault

(cherry picked from commit 7c2bd32)
alexey-milovidov added a commit that referenced this pull request Jul 21, 2020
Fix another Context-related segfault

(cherry picked from commit 7c2bd32)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-bugfix Pull request with bugfix, not backported by default

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Segfault in StorageMerge

5 participants