Skip to content

Commit 6924554

Browse files
authored
Merge branch 'master' into rust_vendor
2 parents aa09876 + 5576cb7 commit 6924554

File tree

180 files changed

+2060
-1393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+2060
-1393
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
8484
RCSK
8585
FastTest:
86-
needs: [RunConfig, StyleCheck]
86+
needs: [RunConfig, BuildDockers]
8787
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Fast test') }}
8888
uses: ./.github/workflows/reusable_test.yml
8989
with:

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
[submodule "contrib/capnproto"]
2323
path = contrib/capnproto
2424
url = https://github.com/ClickHouse/capnproto
25-
[submodule "contrib/double-conversion"]
26-
path = contrib/double-conversion
27-
url = https://github.com/google/double-conversion
2825
[submodule "contrib/re2"]
2926
path = contrib/re2
3027
url = https://github.com/google/re2
@@ -372,3 +369,6 @@
372369
[submodule "contrib/rust_vendor"]
373370
path = contrib/rust_vendor
374371
url = https://github.com/ClickHouse/rust_vendor.git
372+
[submodule "contrib/double-conversion"]
373+
path = contrib/double-conversion
374+
url = https://github.com/ClickHouse/double-conversion.git

contrib/double-conversion

Submodule double-conversion updated 48 files

contrib/double-conversion-cmake/CMakeLists.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/double-conversion")
22

33
add_library(_double-conversion
4-
"${LIBRARY_DIR}/double-conversion/bignum.cc"
5-
"${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc"
6-
"${LIBRARY_DIR}/double-conversion/cached-powers.cc"
7-
"${LIBRARY_DIR}/double-conversion/diy-fp.cc"
8-
"${LIBRARY_DIR}/double-conversion/double-conversion.cc"
9-
"${LIBRARY_DIR}/double-conversion/fast-dtoa.cc"
10-
"${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc"
11-
"${LIBRARY_DIR}/double-conversion/strtod.cc")
4+
"${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc"
5+
"${LIBRARY_DIR}/double-conversion/bignum.cc"
6+
"${LIBRARY_DIR}/double-conversion/cached-powers.cc"
7+
"${LIBRARY_DIR}/double-conversion/double-to-string.cc"
8+
"${LIBRARY_DIR}/double-conversion/fast-dtoa.cc"
9+
"${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc"
10+
"${LIBRARY_DIR}/double-conversion/string-to-double.cc"
11+
"${LIBRARY_DIR}/double-conversion/strtod.cc"
12+
)
1213

1314
target_include_directories(_double-conversion SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}")
1415

docker/test/stateless/run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
1616

1717
dpkg -i package_folder/clickhouse-common-static_*.deb
1818
dpkg -i package_folder/clickhouse-common-static-dbg_*.deb
19-
dpkg -i package_folder/clickhouse-odbc-bridge_*.deb
20-
dpkg -i package_folder/clickhouse-library-bridge_*.deb
19+
# Accept failure in the next two commands until 24.4 is released (for compatibility and Bugfix validation run)
20+
dpkg -i package_folder/clickhouse-odbc-bridge_*.deb || true
21+
dpkg -i package_folder/clickhouse-library-bridge_*.deb || true
2122
dpkg -i package_folder/clickhouse-server_*.deb
2223
dpkg -i package_folder/clickhouse-client_*.deb
2324

docker/test/stress/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ stop_server
215215
export USE_S3_STORAGE_FOR_MERGE_TREE=1
216216
export RANDOMIZE_OBJECT_KEY_TYPE=1
217217
export ZOOKEEPER_FAULT_INJECTION=1
218+
export THREAD_POOL_FAULT_INJECTION=1
218219
configure
219220

220221
# But we still need default disk because some tables loaded only into it

docs/en/development/developer-instruction.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,17 @@ ClickHouse uses CMake and Ninja for building.
8383

8484
- Ninja - a smaller build system with a focus on the speed used to execute those cmake generated tasks.
8585

86-
To install on Ubuntu, Debian or Mint run `sudo apt install cmake ninja-build`.
86+
- ccache - a compiler cache. It speeds up recompilation by caching previous compilations and detecting when the same compilation is being done again.
8787

88-
On CentOS, RedHat run `sudo yum install cmake ninja-build`.
88+
:::tip
89+
As an alternative for ccache a distributed [sccache](https://github.com/mozilla/sccache) could be used. To prefer it, `-DCOMPILER_CACHE=sccache` CMake flag should be used.
90+
:::
91+
92+
To install on Ubuntu, Debian or Mint run `sudo apt install cmake ninja-build ccache`.
93+
94+
On CentOS, RedHat run `sudo yum install cmake ninja-build ccache`.
8995

90-
If you use Arch or Gentoo, you probably know it yourself how to install CMake.
96+
If you use Arch or Gentoo, you probably know it yourself how to install CMake and others.
9197

9298
## C++ Compiler {#c-compiler}
9399

docs/en/engines/table-engines/mergetree-family/replacingmergetree.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
2525
[ORDER BY expr]
2626
[PRIMARY KEY expr]
2727
[SAMPLE BY expr]
28-
[SETTINGS name=value, clean_deleted_rows=value, ...]
28+
[SETTINGS name=value, ...]
2929
```
3030

3131
For a description of request parameters, see [statement description](../../../sql-reference/statements/create/table.md).
@@ -97,7 +97,7 @@ SELECT * FROM mySecondReplacingMT FINAL;
9797
:::note
9898
`is_deleted` can only be enabled when `ver` is used.
9999

100-
The row is deleted when `OPTIMIZE ... FINAL CLEANUP` or `OPTIMIZE ... FINAL` is used, or if the engine setting `clean_deleted_rows` has been set to `Always`.
100+
The row is deleted when `OPTIMIZE ... FINAL CLEANUP` or `OPTIMIZE ... FINAL` is used.
101101

102102
No matter the operation on the data, the version must be increased. If two inserted rows have the same version number, the last inserted row is the one kept.
103103

docs/en/operations/settings/merge-tree-settings.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -852,16 +852,6 @@ If the file name for column is too long (more than `max_file_name_length` bytes)
852852

853853
The maximal length of the file name to keep it as is without hashing. Takes effect only if setting `replace_long_file_name_to_hash` is enabled. The value of this setting does not include the length of file extension. So, it is recommended to set it below the maximum filename length (usually 255 bytes) with some gap to avoid filesystem errors. Default value: 127.
854854

855-
## clean_deleted_rows
856-
857-
Enable/disable automatic deletion of rows flagged as `is_deleted` when perform `OPTIMIZE ... FINAL` on a table using the ReplacingMergeTree engine. When disabled, the `CLEANUP` keyword has to be added to the `OPTIMIZE ... FINAL` to have the same behaviour.
858-
859-
Possible values:
860-
861-
- `Always` or `Never`.
862-
863-
Default value: `Never`
864-
865855
## allow_experimental_block_number_column
866856

867857
Persists virtual column `_block_number` on merges.

docs/en/operations/system-tables/asynchronous_metric_log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ slug: /en/operations/system-tables/asynchronous_metric_log
33
---
44
# asynchronous_metric_log
55

6-
Contains the historical values for `system.asynchronous_metrics`, which are saved once per minute. Enabled by default.
6+
Contains the historical values for `system.asynchronous_metrics`, which are saved once per time interval (one second by default). Enabled by default.
77

88
Columns:
99

0 commit comments

Comments
 (0)