Skip to content

Backport #12121 to 20.5: Fix version column in replicated version collapsing merge tree#12392

Merged
alesapin merged 67 commits into20.5from
backport/20.5/12121
Jul 13, 2020
Merged

Backport #12121 to 20.5: Fix version column in replicated version collapsing merge tree#12392
alesapin merged 67 commits into20.5from
backport/20.5/12121

Conversation

@robot-clickhouse
Copy link
Member

Original pull-request #12121
Cherry-pick pull-request #12215

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.

akuzm and others added 30 commits June 27, 2020 03:45
…unused_shards

This will avoid supperior log message in case of
*optimize_skip_unused_shards_nesting already disables it.
And also it is logical.
Possible approach for fixing #10574

The problem is that prepared sets are built correctly, it is a hash map of key -> set
where key is a hash of AST and list of data types (when we a list of
tuples of literals).

However, when the key is built from the index to try and find if there
exists a prepared set that would match it looks for data types of the
primary key (see how data_types is populated) because the primary key
has only one field (v in my example) it can not find the prepared set.

The patch looks for any prepared indexes where data types match for the
subset of fields found in primary key, we are not interested in other
fields anyway for the purpose of primary key pruning.
Remove a note about read limits applied on threads level.
alexey-milovidov and others added 25 commits July 2, 2020 17:02
Tiny fixes for distributed queries
perf test: report queries with new functions separately
)

* [docker] install ca-certificates before first apt-get update

* Update Dockerfile
* asiana21-DOCSUP-925-max_parser_depth (#132)

* docs(max_parser_depth): added the setting description

* docs(max_parser_depth): some changes

* Update docs/en/operations/settings/settings.md

Co-authored-by: BayoNet <[email protected]>

* Update docs/en/operations/settings/settings.md

Co-authored-by: BayoNet <[email protected]>

* Update docs/en/operations/settings/settings.md

Co-authored-by: BayoNet <[email protected]>

* docs(max_parser_depth): added ru translation

* docs(max_parser_depth): removed quotation marks

Co-authored-by: asiana21 <[email protected]>
Co-authored-by: BayoNet <[email protected]>

* CLICKHOUSEDOCS-522: Fixed the link.

Co-authored-by: AsiaKorushkina <[email protected]>
Co-authored-by: asiana21 <[email protected]>
Co-authored-by: Sergei Shtykov <[email protected]>
Fix limiting the number of threads for VIEW.
Dockerfile security check for `clickhouse-server`
…threads

max_rows_to_read remove note about 'applied on each thread separately'
Test for input_format_allow_errors_num in CSV
…column

ISSUES-4006 support first for ALTER ADD|MODIFY COLUMN
…89a4a104bd6c3e0eb999dee84d229

Cherry pick #12121 to 20.5: Fix version column in replicated version collapsing merge tree
@robot-clickhouse robot-clickhouse requested a review from a team as a code owner July 10, 2020 09:57
@robot-clickhouse robot-clickhouse added the pr-backport Changes, backported to release branch. Do not use manually - automated use only! label Jul 10, 2020
@alesapin alesapin merged commit 5a1bea7 into 20.5 Jul 13, 2020
@alesapin alesapin deleted the backport/20.5/12121 branch July 13, 2020 15:20
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.