Skip to content

Commit de03958

Browse files
committed
Merge 'master' into ncb/fix-flake-02935
2 parents 259a06c + 57b66b8 commit de03958

39 files changed

+780
-379
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/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

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)

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/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}
Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
---
2-
description: 'Documentation for ALTER TABLE ... MODIFY COMMENT'
3-
sidebar_label: 'COMMENT'
2+
description: 'Documentation for ALTER TABLE ... MODIFY COMMENT which allow
3+
adding, modifying, or removing table comments'
4+
sidebar_label: 'ALTER TABLE ... MODIFY COMMENT'
45
sidebar_position: 51
56
slug: /sql-reference/statements/alter/comment
67
title: 'ALTER TABLE ... MODIFY COMMENT'
8+
keywords: ['ALTER TABLE', 'MODIFY COMMENT']
79
---
810

911
# ALTER TABLE ... MODIFY COMMENT
1012

11-
Adds, modifies, or removes comment to the table, regardless if it was set before or not. Comment change is reflected in both [system.tables](../../../operations/system-tables/tables.md) and `SHOW CREATE TABLE` query.
13+
Adds, modifies, or removes a table comment, regardless of whether it was set
14+
before or not. The comment change is reflected in both [`system.tables`](../../../operations/system-tables/tables.md)
15+
and in the `SHOW CREATE TABLE` query.
1216

13-
**Syntax**
17+
## Syntax {#syntax}
1418

1519
```sql
1620
ALTER TABLE [db].name [ON CLUSTER cluster] MODIFY COMMENT 'Comment'
1721
```
1822

19-
**Examples**
23+
## Examples {#examples}
2024

21-
Creating a table with comment (for more information, see the [COMMENT](/sql-reference/statements/create/table#comment-clause) clause):
25+
To create a table with a comment:
2226

2327
```sql
2428
CREATE TABLE table_with_comment
@@ -30,38 +34,56 @@ ENGINE = Memory()
3034
COMMENT 'The temporary table';
3135
```
3236

33-
Modifying the table comment:
37+
To modify the table comment:
3438

3539
```sql
36-
ALTER TABLE table_with_comment MODIFY COMMENT 'new comment on a table';
37-
SELECT comment FROM system.tables WHERE database = currentDatabase() AND name = 'table_with_comment';
40+
ALTER TABLE table_with_comment
41+
MODIFY COMMENT 'new comment on a table';
3842
```
3943

40-
Output of a new comment:
44+
To view the modified comment:
4145

42-
```text
46+
```sql title="Query"
47+
SELECT comment
48+
FROM system.tables
49+
WHERE database = currentDatabase() AND name = 'table_with_comment';
50+
```
51+
52+
```text title="Response"
4353
┌─comment────────────────┐
4454
│ new comment on a table │
4555
└────────────────────────┘
4656
```
4757

48-
Removing the table comment:
58+
To remove the table comment:
4959

5060
```sql
5161
ALTER TABLE table_with_comment MODIFY COMMENT '';
52-
SELECT comment FROM system.tables WHERE database = currentDatabase() AND name = 'table_with_comment';
5362
```
5463

55-
Output of a removed comment:
64+
To verify that the comment was removed:
65+
66+
```sql title="Query"
67+
SELECT comment
68+
FROM system.tables
69+
WHERE database = currentDatabase() AND name = 'table_with_comment';
70+
```
5671

57-
```text
72+
```text title="Response"
5873
┌─comment─┐
5974
│ │
6075
└─────────┘
6176
```
6277

63-
**Caveats**
78+
## Caveats {#caveats}
79+
80+
For Replicated tables, the comment can be different on different replicas.
81+
Modifying the comment applies to a single replica.
82+
83+
The feature is available since version 23.9. It does not work in previous
84+
ClickHouse versions.
6485

65-
For Replicated tables, the comment can be different on different replicas. Modifying the comment applies to a single replica.
86+
## Related content {#related-content}
6687

67-
The feature is available since version 23.9. It does not work in previous ClickHouse versions.
88+
- [`COMMENT`](/sql-reference/statements/create/table#comment-clause) clause
89+
- [`ALTER DATABASE ... MODIFY COMMENT`](./database-comment.md)
Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,76 @@
11
---
2-
description: 'Documentation for ALTER DATABASE ... MODIFY COMMENT Statements'
2+
description: 'Documentation for ALTER DATABASE ... MODIFY COMMENT statements
3+
which allow adding, modifying, or removing database comments.'
34
slug: /sql-reference/statements/alter/database-comment
45
sidebar_position: 51
5-
sidebar_label: 'UPDATE'
6+
sidebar_label: 'ALTER DATABASE ... MODIFY COMMENT'
67
title: 'ALTER DATABASE ... MODIFY COMMENT Statements'
8+
keywords: ['ALTER DATABASE', 'MODIFY COMMENT']
79
---
810

911
# ALTER DATABASE ... MODIFY COMMENT
1012

11-
Adds, modifies, or removes comment to the database, regardless of whether it was set before. Comment change is reflected in both [system.databases](/operations/system-tables/databases.md) and `SHOW CREATE DATABASE` query.
13+
Adds, modifies, or removes a database comment, regardless of whether it was set
14+
before or not. The comment change is reflected in both [`system.databases`](/operations/system-tables/databases.md)
15+
and the `SHOW CREATE DATABASE` query.
1216

13-
**Syntax**
17+
## Syntax {#syntax}
1418

1519
``` sql
1620
ALTER DATABASE [db].name [ON CLUSTER cluster] MODIFY COMMENT 'Comment'
1721
```
1822

19-
**Examples**
23+
## Examples {#examples}
2024

21-
Creating a DATABASE with comment (for more information, see the [COMMENT](/sql-reference/statements/create/table#comment-clause) clause):
25+
To create a `DATABASE` with a comment:
2226

2327
``` sql
2428
CREATE DATABASE database_with_comment ENGINE = Memory COMMENT 'The temporary database';
2529
```
2630

27-
Modifying the table comment:
31+
To modify the comment:
2832

2933
``` sql
30-
ALTER DATABASE database_with_comment MODIFY COMMENT 'new comment on a database';
31-
SELECT comment FROM system.databases WHERE name = 'database_with_comment';
34+
ALTER DATABASE database_with_comment
35+
MODIFY COMMENT 'new comment on a database';
3236
```
3337

34-
Output of a new comment:
38+
To view the modified comment:
39+
40+
```sql
41+
SELECT comment
42+
FROM system.databases
43+
WHERE name = 'database_with_comment';
44+
```
3545

3646
```text
3747
┌─comment─────────────────┐
3848
│ new comment on database │
3949
└─────────────────────────┘
4050
```
4151

42-
Removing the database comment:
52+
To remove the database comment:
4353

4454
``` sql
45-
ALTER DATABASE database_with_comment MODIFY COMMENT '';
46-
SELECT comment FROM system.databases WHERE name = 'database_with_comment';
55+
ALTER DATABASE database_with_comment
56+
MODIFY COMMENT '';
4757
```
4858

49-
Output of a removed comment:
59+
To verify that the comment was removed:
5060

51-
```text
61+
```sql title="Query"
62+
SELECT comment
63+
FROM system.databases
64+
WHERE name = 'database_with_comment';
65+
```
66+
67+
```text title="Response"
5268
┌─comment─┐
5369
│ │
5470
└─────────┘
5571
```
72+
73+
## Related content {#related-content}
74+
75+
- [`COMMENT`](/sql-reference/statements/create/table#comment-clause) clause
76+
- [`ALTER TABLE ... MODIFY COMMENT`](./comment.md)

docs/en/sql-reference/statements/select/all.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ title: 'ALL Clause'
77

88
# ALL Clause
99

10-
If there are multiple matching rows in the table, then `ALL` returns all of them. `SELECT ALL` is identical to `SELECT` without `DISTINCT`. If both `ALL` and `DISTINCT` specified, exception will be thrown.
10+
If there are multiple matching rows in a table, then `ALL` returns all of them. `SELECT ALL` is identical to `SELECT` without `DISTINCT`. If both `ALL` and `DISTINCT` are specified, then an exception will be thrown.
1111

12+
`ALL` can be specified inside aggregate functions, although it has no practical effect on the query's result.
1213

13-
`ALL` can also be specified inside aggregate function with the same effect(noop), for instance:
14+
For example:
1415

1516
```sql
1617
SELECT sum(ALL number) FROM numbers(10);
1718
```
18-
equals to
19+
20+
Is equivalent to:
1921

2022
```sql
2123
SELECT sum(number) FROM numbers(10);

0 commit comments

Comments
 (0)