Skip to content

Commit c91ee72

Browse files
committed
Merge branch 'master' into hanfei/remove-and-sync-snapshot-code
2 parents 3c35348 + 85a0661 commit c91ee72

File tree

302 files changed

+7252
-5047
lines changed

Some content is hidden

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

302 files changed

+7252
-5047
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,19 @@ Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
4747
You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
4848

4949
Upcoming meetups
50-
* [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
51-
* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
5250
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
5351
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
5452
* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
5553
* [Shenzhen Meetup](https://www.huodongxing.com/event/7803892350511) - May 17, 2025
54+
* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
55+
* [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/307622954/) - June 12, 2025
56+
* [Atlanta Meetup](https://www.meetup.com/clickhouse-atlanta-meetup-group/events/307627590/) - July 8, 2025
57+
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/307627675/) - July 15, 2025
58+
5659

5760
Recent meetups
61+
* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
62+
* [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
5863
* [Kuala Lumper Meetup with CNCF](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/306697678/) - April 16, 2025
5964
* [Tokyo Meetup with Confluent](https://www.meetup.com/clickhouse-tokyo-user-group/events/306832118/) - April 15, 2025
6065
* [Ho Chi Minh Meetup with AWS & Infinite Lambda](https://www.meetup.com/clickhouse-vietnam-meetup-group/events/306810105/) - April 12, 2025
@@ -73,12 +78,7 @@ Recent meetups
7378
* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/305916325) - March 5, 2025
7479
* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/305792997) - March 4, 2025
7580
* [Shanghai Meetup](https://www.huodongxing.com/event/3794544969111?td=3894807410019) - March 1, 2025
76-
* [Singapore Meetup](https://www.meetup.com/clickhouse-singapore-meetup-group/events/305917892/) - Feb 25, 2025
77-
* [Los Angeles Meetup (with DevOpsDays)](https://www.meetup.com/clickhouse-los-angeles-user-group/events/305952193) - Feb 20, 2025
78-
* [Wellington Meetup](https://www.meetup.com/clickhouse-wellington-user-group/events/305666164/) - Feb 20, 2025
79-
* [Auckland Meetup](https://www.meetup.com/clickhouse-auckland-meetup-group/events/305666103/) - Feb 19, 2025
80-
* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - Feb 10, 2025
81-
* [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/305497951/) - Feb 8, 2025
81+
8282

8383

8484

ci/jobs/docs_job.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
Result.from_commands_run(
7878
name=testname,
7979
command=[
80-
"yarn build-api-doc",
8180
"yarn build-swagger",
8281
"export DOCUSAURUS_IGNORE_SSG_WARNINGS=true && yarn build-docs",
8382
],

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,7 @@ aggthrow
12511251
aiochclient
12521252
alloc
12531253
allocator
1254+
allowlist
12541255
alphaTokens
12551256
amplab
12561257
analysisOfVariance
@@ -1687,6 +1688,7 @@ denormalize
16871688
denormalized
16881689
denormalizing
16891690
denormals
1691+
denylist
16901692
dequeued
16911693
dequeues
16921694
dereference

ci/jobs/scripts/workflow_hooks/trusted.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
e.lower()
88
for e in [
99
"amosbird",
10+
"azat",
1011
"den-crane", # Documentation contributor
1112
"taiyang-li",
1213
"ucasFL", # Amos Bird's friend
13-
"tonickkozlov", # Cloudflare
1414
"canhld94",
1515
]
1616
}

contrib/zlib-ng-cmake/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set (SOURCE_DIR ${PROJECT_SOURCE_DIR}/contrib/zlib-ng)
1+
set (SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/zlib-ng")
22

33
add_definitions(-DZLIB_COMPAT)
44
add_definitions(-DWITH_GZFILEOP)

docker/test/fuzzer/run-fuzzer.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,11 @@ EOF
379379
elif [ "$server_died" == 1 ]
380380
then
381381
# The server has died.
382-
if ! rg --text -o 'Received signal.*|Logical error.*|Assertion.*failed|Failed assertion.*|.*runtime error: .*|.*is located.*|(SUMMARY|ERROR): [a-zA-Z]+Sanitizer:.*|.*_LIBCPP_ASSERT.*|.*Child process was terminated by signal 9.*' server.log > description.txt
382+
if rg --text -o 'Received signal.*|Logical error.*|Assertion.*failed|Failed assertion.*|.*runtime error: .*|.*is located.*|(SUMMARY|ERROR): [a-zA-Z]+Sanitizer:.*|.*_LIBCPP_ASSERT.*|.*Child process was terminated by signal 9.*' server.log > description.txt
383383
then
384+
# Save the stack trace of the server to the description file and preserve in raw text output.
385+
rg --text '\s<Fatal>\s' server.log >> description.txt || :
386+
else
384387
echo "Lost connection to server. See the logs." > description.txt
385388
fi
386389

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ returns
394394
└────┴─────────┘
395395
```
396396

397-
# References {#references}
397+
## References {#references}
398398

399399
Blogs:
400400
- [Vector Search with ClickHouse - Part 1](https://clickhouse.com/blog/vector-search-clickhouse-p1)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ ENGINE = MergeTree
6060
ORDER BY key
6161
```
6262

63-
:::note
64-
In earlier versions of ClickHouse, the corresponding index type name was `inverted`.
65-
:::
66-
6763
where `N` specifies the tokenizer:
6864

6965
- `gin(0)` (or shorter: `gin()`) set the tokenizer to "tokens", i.e. split strings along spaces,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ title: 'SummingMergeTree'
99

1010
# SummingMergeTree
1111

12-
The engine inherits from [MergeTree](/engines/table-engines/mergetree-family/versionedcollapsingmergetree). The difference is that when merging data parts for `SummingMergeTree` tables ClickHouse replaces all the rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with one row which contains summarized values for the columns with the numeric data type. If the sorting key is composed in a way that a single key value corresponds to large number of rows, this significantly reduces storage volume and speeds up data selection.
12+
The engine inherits from [MergeTree](/engines/table-engines/mergetree-family/versionedcollapsingmergetree). The difference is that when merging data parts for `SummingMergeTree` tables ClickHouse replaces all the rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with one row which contains summed values for the columns with the numeric data type. If the sorting key is composed in a way that a single key value corresponds to large number of rows, this significantly reduces storage volume and speeds up data selection.
1313

1414
We recommend using the engine together with `MergeTree`. Store complete data in `MergeTree` table, and use `SummingMergeTree` for aggregated data storing, for example, when preparing reports. Such an approach will prevent you from losing valuable data due to an incorrectly composed primary key.
1515

@@ -34,7 +34,7 @@ For a description of request parameters, see [request description](../../../sql-
3434

3535
#### columns {#columns}
3636

37-
`columns` - a tuple with the names of columns where values will be summarized. Optional parameter.
37+
`columns` - a tuple with the names of columns where values will be summed. Optional parameter.
3838
The columns must be of a numeric type and must not be in the partition or sorting key.
3939

4040
If `columns` is not specified, ClickHouse summarizes the values in all columns with a numeric data type that are not in the sorting key.
@@ -62,7 +62,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
6262

6363
All of the parameters excepting `columns` have the same meaning as in `MergeTree`.
6464

65-
- `columns` — tuple with names of columns values of which will be summarized. Optional parameter. For a description, see the text above.
65+
- `columns` — tuple with names of columns values of which will be summed. Optional parameter. For a description, see the text above.
6666

6767
</details>
6868

@@ -107,13 +107,13 @@ ClickHouse can merge the data parts so that different resulting parts of data ca
107107

108108
### Common Rules for Summation {#common-rules-for-summation}
109109

110-
The values in the columns with the numeric data type are summarized. The set of columns is defined by the parameter `columns`.
110+
The values in the columns with the numeric data type are summed. The set of columns is defined by the parameter `columns`.
111111

112112
If the values were 0 in all of the columns for summation, the row is deleted.
113113

114-
If column is not in the primary key and is not summarized, an arbitrary value is selected from the existing ones.
114+
If column is not in the primary key and is not summed, an arbitrary value is selected from the existing ones.
115115

116-
The values are not summarized for columns in the primary key.
116+
The values are not summed for columns in the primary key.
117117

118118
### The Summation in the Aggregatefunction Columns {#the-summation-in-the-aggregatefunction-columns}
119119

docs/en/interfaces/formats/Null.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
alias: []
33
description: 'Documentation for the Null format'
44
input_format: false
5-
keywords: ['Null']
5+
keywords: ['Null', 'format']
66
output_format: true
77
slug: /interfaces/formats/Null
88
title: 'Null'
@@ -24,4 +24,26 @@ The `Null` format can be useful for performance testing.
2424

2525
## Example Usage {#example-usage}
2626

27-
## Format Settings {#format-settings}
27+
Connect to `play.clickhouse.com` with clickhouse client:
28+
29+
```bash
30+
clickhouse client --secure --host play.clickhouse.com --user explorer
31+
```
32+
33+
Run the following the query:
34+
35+
```sql title="Query"
36+
SELECT town
37+
FROM uk_price_paid
38+
LIMIT 1000
39+
FORMAT `Null`
40+
```
41+
42+
```response title="Response"
43+
0 rows in set. Elapsed: 0.002 sec. Processed 1.00 thousand rows, 2.00 KB (506.97 thousand rows/s., 1.01 MB/s.)
44+
Peak memory usage: 297.74 KiB.
45+
```
46+
47+
Note how 1000 rows were processed, but 0 rows were output in the result set.
48+
49+
## Format Settings {#format-settings}

0 commit comments

Comments
 (0)