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 #12020 to 20.5: Fix ORDER BY tuple with COLLATE on const column #12272

Merged
merged 533 commits into from
Jul 7, 2020

Conversation

robot-clickhouse
Copy link
Member

Original pull-request #12020
Cherry-pick pull-request #12203

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 June 24, 2020 12:54
…fixes

Control nesting level for shards skipping and disallow non-deterministic functions
Signed-off-by: Slach <bloodjazman@gmail.com>
* more content for F.A.Q.

* more content

* normalize

* more content

* maybe fix the docs check

* absolute img urls

* fix tests
max_thread_pool_size setting for changing max Threads in Global Thread Pool
They keep removing the old image every couple of weeks, and the entire
docker update fails.
In case of OSX jemalloc register itself as a default zone allocator.

But when you link statically then zone_register() will not be called,
and even will be optimized out:

  $ nm clickhouse.patched  | grep -c zone_register
  0

Fix this, by manually calling it.

v2: extern C
akuzm and others added 26 commits June 29, 2020 17:09
Update query plan traits for DISTINCT. Add more comments.
* Update browse-code.md

纠正了一些翻译错误。

* Update browse-code.md

Co-authored-by: Ivan Blinkov <github@blinkov.ru>
Bumps [python-slugify](https://github.com/un33k/python-slugify) from 1.2.6 to 4.0.1.
- [Release notes](https://github.com/un33k/python-slugify/releases)
- [Changelog](https://github.com/un33k/python-slugify/blob/master/CHANGELOG.md)
- [Commits](un33k/python-slugify@1.2.6...4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…ython-slugify-4.0.1

Bump python-slugify from 1.2.6 to 4.0.1 in /docs/tools
Make topK return Enum for Enum types
…column (#12203)

* Fix ORDER BY tuple with COLLATE on const column

* Remove test that is not supported by "Arcadia" build system

Co-authored-by: Alexey Milovidov <milovidov@yandex-team.ru>
@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 64b062e into 20.5 Jul 7, 2020
@alexey-milovidov alexey-milovidov deleted the backport/20.5/12020 branch July 7, 2020 21:24
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