diff --git a/docs/changelogs/v24.8.1.2684-lts.md b/docs/changelogs/v24.8.1.2684-lts.md index 8171bb3d719..b4c6e3870d8 100644 --- a/docs/changelogs/v24.8.1.2684-lts.md +++ b/docs/changelogs/v24.8.1.2684-lts.md @@ -522,4 +522,3 @@ sidebar_label: 2024 * Backported in [#68518](https://github.com/ClickHouse/ClickHouse/issues/68518): Minor update in Dynamic/JSON serializations. [#68459](https://github.com/ClickHouse/ClickHouse/pull/68459) ([Kruglov Pavel](https://github.com/Avogar)). * Backported in [#68558](https://github.com/ClickHouse/ClickHouse/issues/68558): CI: Minor release workflow fix. [#68536](https://github.com/ClickHouse/ClickHouse/pull/68536) ([Max K.](https://github.com/maxknv)). * Backported in [#68576](https://github.com/ClickHouse/ClickHouse/issues/68576): CI: Tidy build timeout from 2h to 3h. [#68567](https://github.com/ClickHouse/ClickHouse/pull/68567) ([Max K.](https://github.com/maxknv)). - diff --git a/docs/changelogs/v24.9.1.3278-stable.md b/docs/changelogs/v24.9.1.3278-stable.md index 0489f5ae454..9f221dcae94 100644 --- a/docs/changelogs/v24.9.1.3278-stable.md +++ b/docs/changelogs/v24.9.1.3278-stable.md @@ -497,4 +497,3 @@ sidebar_label: 2024 * Backported in [#69899](https://github.com/ClickHouse/ClickHouse/issues/69899): Revert "Merge pull request [#69032](https://github.com/ClickHouse/ClickHouse/issues/69032) from alexon1234/include_real_time_execution_in_http_header". [#69885](https://github.com/ClickHouse/ClickHouse/pull/69885) ([Alexey Milovidov](https://github.com/alexey-milovidov)). * Backported in [#69931](https://github.com/ClickHouse/ClickHouse/issues/69931): RIPE is an acronym and thus should be capital. RIPE stands for **R**ACE **I**ntegrity **P**rimitives **E**valuation and RACE stands for **R**esearch and Development in **A**dvanced **C**ommunications **T**echnologies in **E**urope. [#69901](https://github.com/ClickHouse/ClickHouse/pull/69901) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)). * Backported in [#70034](https://github.com/ClickHouse/ClickHouse/issues/70034): Revert "Add RIPEMD160 function". [#70005](https://github.com/ClickHouse/ClickHouse/pull/70005) ([Robert Schulze](https://github.com/rschu1ze)). - diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md index d670ed42a2a..4100f9bb928 100644 --- a/docs/en/sql-reference/functions/tuple-map-functions.md +++ b/docs/en/sql-reference/functions/tuple-map-functions.md @@ -936,4 +936,4 @@ SELECT mapPartialReverseSort((k, v) -> v, 2, map('k1', 3, 'k2', 1, 'k3', 2)); ┌─mapPartialReverseSort(lambda(tuple(k, v), v), 2, map('k1', 3, 'k2', 1, 'k3', 2))─┐ │ {'k1':3,'k3':2,'k2':1} │ └──────────────────────────────────────────────────────────────────────────────────┘ -``` \ No newline at end of file +``` diff --git a/src/Analyzer/Resolve/IdentifierResolver.cpp b/src/Analyzer/Resolve/IdentifierResolver.cpp index 15a90c52a2a..317a02a60f2 100644 --- a/src/Analyzer/Resolve/IdentifierResolver.cpp +++ b/src/Analyzer/Resolve/IdentifierResolver.cpp @@ -528,7 +528,7 @@ QueryTreeNodePtr IdentifierResolver::tryResolveIdentifierFromCompoundExpression( * * Resolve strategy: * 1. Try to bind identifier to scope argument name to node map. - * 2. If identifier is binded but expression context and node type are incompatible return nullptr. + * 2. If identifier is bound but expression context and node type are incompatible return nullptr. * * It is important to support edge cases, where we lookup for table or function node, but argument has same name. * Example: WITH (x -> x + 1) AS func, (func -> func(1) + func) AS lambda SELECT lambda(1); diff --git a/src/Client/ReplxxLineReader.cpp b/src/Client/ReplxxLineReader.cpp index ee90a6cc7b7..e818bcded96 100644 --- a/src/Client/ReplxxLineReader.cpp +++ b/src/Client/ReplxxLineReader.cpp @@ -362,7 +362,7 @@ ReplxxLineReader::ReplxxLineReader( if (highlighter) rx.set_highlighter_callback(highlighter); - /// By default C-p/C-n binded to COMPLETE_NEXT/COMPLETE_PREV, + /// By default C-p/C-n bound to COMPLETE_NEXT/COMPLETE_PREV, /// bind C-p/C-n to history-previous/history-next like readline. rx.bind_key(Replxx::KEY::control('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_NEXT, code); }); rx.bind_key(Replxx::KEY::control('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_PREVIOUS, code); }); @@ -384,9 +384,9 @@ ReplxxLineReader::ReplxxLineReader( rx.bind_key(Replxx::KEY::control('J'), commit_action); rx.bind_key(Replxx::KEY::ENTER, commit_action); - /// By default COMPLETE_NEXT/COMPLETE_PREV was binded to C-p/C-n, re-bind + /// By default COMPLETE_NEXT/COMPLETE_PREV was bound to C-p/C-n, re-bind /// to M-P/M-N (that was used for HISTORY_COMMON_PREFIX_SEARCH before, but - /// it also binded to M-p/M-n). + /// it also bound to M-p/M-n). rx.bind_key(Replxx::KEY::meta('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_NEXT, code); }); rx.bind_key(Replxx::KEY::meta('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_PREVIOUS, code); }); /// By default M-BACKSPACE is KILL_TO_WHITESPACE_ON_LEFT, while in readline it is backward-kill-word diff --git a/tests/integration/test_server_reload/test.py b/tests/integration/test_server_reload/test.py index 36c62c85d03..511bf767386 100644 --- a/tests/integration/test_server_reload/test.py +++ b/tests/integration/test_server_reload/test.py @@ -378,7 +378,7 @@ def test_reload_via_client(cluster, zk): configure_from_zk(zk) break except QueryRuntimeException: - logging.exception("The new socket is not binded yet") + logging.exception("The new socket is not bound yet") time.sleep(0.1) if exception: