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 #12089 to 20.5: Fix result_rows and result_bytes metrics for selects. #12239

Merged
merged 719 commits into from
Jul 7, 2020

Conversation

robot-clickhouse
Copy link
Member

Original pull-request #12089
Cherry-pick pull-request #12209

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 04:15
Extend word break config to all non-alphanumeric chars
Better diagnostics of "Replica {} appears to be already active" message
Fix bad log message at server startup
ISSUES-3985 Support MySQL engine reading Enums type
xeus-clickhouse is a Jupyter kernal for ClickHouse
Vitaly Baranov and others added 25 commits July 3, 2020 17:17
…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
target_compile_definitions may only set INTERFACE properties on IMPORTED targets
* Add unbundled mode flag

* Move skip lists to clickhouse-test

* More verbose message about skip

* Make skip-list optional

* Update clickhouse-test
By default IMPORTED target has a scope in the directory in which it is created
and below. This leads to the following issues when building UNBUNDLED:

Target "clickhouse" links to target "Poco::Data::ODBC" but the target was not
found.  Perhaps a find_package() call is missing for an IMPORTED target, or an
ALIAS target is missing?
* simplify reading in order of sorting key

* add perf test for reading many parts

* Revert "simplify reading in order of sorting key"

This reverts commit 7267d7c.

* add threshold for preliminary merge for reading in order

* better threshold

* limit threads in test
Added a showcase of minimal Docker image
Minor cmake fixes for UNBUNDLED build
Fix Parquet for LowCardinality
Fix result_rows and result_bytes metrics for selects.
…54a9a46e70b6f166b1666f821a415

Cherry pick #12089 to 20.5: Fix result_rows and result_bytes metrics for selects.
@robot-clickhouse robot-clickhouse added the pr-backport Changes, backported to release branch. Do not use manually - automated use only! label Jul 7, 2020
@alexey-milovidov alexey-milovidov merged commit aa308dc into 20.5 Jul 7, 2020
@alexey-milovidov alexey-milovidov deleted the backport/20.5/12089 branch July 7, 2020 21:11
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