Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #12315 to 20.5: Fix race condition in ReplicatedMergeTreeQueue #12385

Merged
merged 1,158 commits into from
Jul 10, 2020

Conversation

robot-clickhouse
Copy link
Member

Original pull-request #12315
Cherry-pick pull-request #12380

This pull-request is a last step of an automated backporting.
Treat it as a standard pull-request: look at the checks and resolve conflicts.
Merge it only if you intend to backport changes to the target branch, otherwise just close it.

alexey-milovidov and others added 30 commits July 5, 2020 19:10
…-modificators-for-formatDateTime

New ISO8601 year modificators for formatDateTime() function
* add function parseDateTimeBestEffortUS
* add test
* add doc

Co-authored-by: alexey-milovidov <milovidov@yandex-team.ru>
Rewrite curl dependency in a more ch compatible way
Fix segfault with -StateResample combinators
azat and others added 26 commits July 9, 2020 10:25
* DOCSUP-1377 (netloc function) (#135)

* add EN description

* changes in query

* changes after review

* add RU description

* CLICKHOUSEDOCS-679: Text fixes.

Co-authored-by: Sergei Shtykov <bayonet@yandex-team.ru>
Co-authored-by: emironyuk <em@don.ru>
Co-authored-by: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
* base refactoring

* adjust links

* Update index.md
* Implemented single part uploads for DiskS3.
* Added `min_multi_part_upload_size` to disk configuration.
…arate-thread

Log sanitizer trap messages from separate thread
…12328)

* normalize

* split & adjust links

* re-normalize

* adjust ru links

* adjust ja/tr links

* partially apply e0d19d2

* reset contribs
Fix order of columns in WITH FILL modifier
…in-test

Fix obvious race condition in test
…ed-merge-tree-queue

Fix race condition in ReplicatedMergeTreeQueue
…2476d25087712f2e672122c6caf5b

Cherry pick #12315 to 20.5: Fix race condition in ReplicatedMergeTreeQueue
@robot-clickhouse robot-clickhouse added the pr-backport Changes, backported to release branch. Do not use manually - automated use only! label Jul 10, 2020
@alexey-milovidov alexey-milovidov merged commit f953b5d into 20.5 Jul 10, 2020
@alexey-milovidov alexey-milovidov deleted the backport/20.5/12315 branch July 10, 2020 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-backport Changes, backported to release branch. Do not use manually - automated use only!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet