Skip to content

Commit af5e195

Browse files
Merge branch 'master' of github.com:ClickHouse/ClickHouse into add-test-65690
2 parents 503789e + d58d87d commit af5e195

File tree

257 files changed

+6697
-4279
lines changed

Some content is hidden

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

257 files changed

+6697
-4279
lines changed

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
}

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/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}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Columns:
2020
- `arguments`, ([String](../../sql-reference/data-types/string.md)) - What arguments does the function take.
2121
- `returned_value`, ([String](../../sql-reference/data-types/string.md)) - What does the function return.
2222
- `examples`, ([String](../../sql-reference/data-types/string.md)) - Example usage of the function.
23+
- `introduced_in`, ([String](../../sql-reference/data-types/string.md)) - ClickHouse version in which the function was first introduced.
2324
- `categories`, ([String](../../sql-reference/data-types/string.md)) - The category of the function.
2425

2526
**Example**

docs/en/sql-reference/formats.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ sidebar_position: 50
44
sidebar_label: 'Input and Output Formats'
55
title: 'Formats for Input and Output Data'
66
description: 'Supported input and output formats'
7+
hide_title: true
78
---
89

910
import Content from '../interfaces/formats.md';

docs/en/sql-reference/functions/geo/s2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description: 'Documentation for functions for working with S2 indexes'
99

1010
## S2Index {#s2index}
1111

12-
[S2](https://s2geometry.io/) is a geographical indexing system where all geographical data is represented on a three-dimensional sphere (similar to a globe).
12+
[S2](https://s2geometry.io/) is a geographical indexing system where all geographical data is represented on a sphere (similar to a globe).
1313

1414
In the S2 library points are represented as the S2 Index - a specific number which encodes internally a point on the surface of a unit sphere, unlike traditional (latitude, longitude) pairs. To get the S2 point index for a given point specified in the format (latitude, longitude) use the [geoToS2](#geotos2) function. Also, you can use the [s2ToGeo](#s2togeo) function for getting geographical coordinates corresponding to the specified S2 point index.
1515

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)

0 commit comments

Comments
 (0)