Skip to content

Commit 7b8b813

Browse files
Merge branch 'master' into async-metrics-sockets
2 parents 44feb3a + b2971a5 commit 7b8b813

File tree

115 files changed

+3459
-474
lines changed

Some content is hidden

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

115 files changed

+3459
-474
lines changed

.github/ISSUE_TEMPLATE/30_unexpected-behaviour.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ body:
1515
- type: textarea
1616
attributes:
1717
label: Describe the unexpected behaviour
18-
description: A clear and concise description of what works not as it is supposed to.
18+
description: A clear and concise description of what doesn't work as it is supposed to.
19+
validations:
20+
required: true
21+
- type: textarea
22+
attributes:
23+
label: Which ClickHouse versions are affected?
1924
validations:
2025
required: true
2126
- type: textarea
@@ -26,7 +31,7 @@ body:
2631
* Which interface to use, if matters
2732
* Non-default settings, if any
2833
* `CREATE TABLE` statements for all tables involved
29-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
34+
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
3035
* Queries to run that lead to unexpected result
3136
validations:
3237
required: true

.github/ISSUE_TEMPLATE/35_incomplete_implementation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ body:
2626
* Which interface to use, if matters
2727
* Non-default settings, if any
2828
* `CREATE TABLE` statements for all tables involved
29-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
29+
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
3030
* Queries to run that lead to unexpected result
3131
validations:
3232
required: true

.github/ISSUE_TEMPLATE/45_usability-issue.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Usability issue
1+
name: Usability improvement request
22
description: Report something can be made more convenient to use
33
labels: ["usability"]
44
body:
@@ -14,28 +14,26 @@ body:
1414
required: false
1515
- type: textarea
1616
attributes:
17-
label: Describe the unexpected behaviour
18-
description: A clear and concise description of what works not as it is supposed to.
17+
label: Describe the improvement
18+
description: A clear and concise description of what you want to happen
19+
validations:
20+
required: true
21+
- type: textarea
22+
attributes:
23+
label: Which ClickHouse versions are affected?
1924
validations:
2025
required: true
2126
- type: textarea
2227
attributes:
2328
label: How to reproduce
2429
description: |
25-
* Which ClickHouse server version to use
2630
* Which interface to use, if matters
2731
* Non-default settings, if any
2832
* `CREATE TABLE` statements for all tables involved
29-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
33+
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
3034
* Queries to run that lead to unexpected result
3135
validations:
3236
required: true
33-
- type: textarea
34-
attributes:
35-
label: Expected behavior
36-
description: A clear and concise description of what you expected to happen.
37-
validations:
38-
required: false
3937
- type: textarea
4038
attributes:
4139
label: Error message and/or stacktrace

.github/ISSUE_TEMPLATE/50_build-issue.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,39 @@ body:
1212
description: Put your company name or project description here.
1313
validations:
1414
required: false
15+
- type: textarea
16+
attributes:
17+
label: Describe the problem
18+
description: A clear and concise description of what doesn't work as it is supposed to.
19+
validations:
20+
required: true
1521
- type: textarea
1622
attributes:
1723
label: Operating system
1824
description: OS kind or distribution, specific version/release, non-standard kernel if any. If you are trying to build inside virtual machine, please mention it too.
1925
validations:
20-
required: true
26+
required: false
2127
- type: textarea
2228
attributes:
2329
label: CMake version
2430
description: The output of `cmake --version`.
2531
validations:
26-
required: true
32+
required: false
2733
- type: textarea
2834
attributes:
2935
label: Ninja version
3036
description: The output of `ninja --version`.
3137
validations:
32-
required: true
38+
required: false
3339
- type: textarea
3440
attributes:
3541
label: Compiler name and version
3642
description: We recommend to use clang. The version can be obtained via `clang --version`.
3743
validations:
38-
required: true
44+
required: false
3945
- type: textarea
4046
attributes:
41-
label: Full cmake and/or ninja output
42-
description: Please include everything!
47+
label: Full cmake and/or ninja output with the error
48+
description: Please include everything (use https://pastila.nl/ for large output)!
4349
validations:
4450
required: true

.github/ISSUE_TEMPLATE/70_performance-issue.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@ body:
1818
description: What exactly works slower than expected?
1919
validations:
2020
required: true
21+
- type: textarea
22+
attributes:
23+
label: Which ClickHouse versions are affected?
24+
validations:
25+
required: true
2126
- type: textarea
2227
attributes:
2328
label: How to reproduce
2429
description: |
25-
* Which ClickHouse server version to use
2630
* Which interface to use, if matters
2731
* Non-default settings, if any
2832
* `CREATE TABLE` statements for all tables involved
29-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
33+
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
3034
* Queries to run that lead to unexpected result
3135
validations:
3236
required: true

.github/ISSUE_TEMPLATE/80_backward-compatibility.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@ body:
1818
description: A clear and concise description of what works not as it is supposed to.
1919
validations:
2020
required: true
21+
- type: textarea
22+
attributes:
23+
label: Which ClickHouse versions are affected?
24+
validations:
25+
required: true
2126
- type: textarea
2227
attributes:
2328
label: How to reproduce
2429
description: |
25-
* Which ClickHouse server version to use
2630
* Which interface to use, if matters
2731
* Non-default settings, if any
2832
* `CREATE TABLE` statements for all tables involved
29-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
33+
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
3034
* Queries to run that lead to unexpected result
3135
validations:
3236
required: true

.github/ISSUE_TEMPLATE/85_bug-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ body:
5252
* Which interface to use, if matters
5353
* Non-default settings, if any
5454
* `CREATE TABLE` statements for all tables involved
55-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
55+
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/c81bec37a58757be1e2b1ac6f20a62b3f14a31f1/programs/obfuscator/Obfuscator.cpp#L55-L95) if necessary
5656
* Queries to run that lead to unexpected result
5757
validations:
5858
required: true

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 3238
1+
personal_ws-1.1 en 3238
22
AArch
33
ACLs
44
ALTERs
@@ -1850,7 +1850,6 @@ formatter
18501850
formatters
18511851
fqdn
18521852
frac
1853-
freezed
18541853
frictionless
18551854
fromDaysSinceYearZero
18561855
fromModifiedJulianDay

docs/en/development/continuous-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ mkdir build_tidy
143143
Runs [stateless functional tests](tests.md#functional-tests) for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc.
144144
Look at the report to see which tests fail, then reproduce the failure locally as described [here](/development/tests#functional-tests).
145145
Note that you have to use the correct build configuration to reproduce -- a test might fail under AddressSanitizer but pass in Debug.
146-
Download the binary from [CI build checks page](/install#install-a-ci-generated-binary), or build it locally.
146+
Download the binary from [CI build checks page](/install/advanced), or build it locally.
147147

148148
## Functional Stateful Tests {#functional-stateful-tests}
149149

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,34 @@ CREATE TABLE tab
5454
(
5555
`key` UInt64,
5656
`str` String,
57-
INDEX inv_idx(str) TYPE gin(0) GRANULARITY 1
57+
INDEX inv_idx(str) TYPE gin(tokenizer = 'default|ngram|noop' [, ngram_size = N] [, max_rows_per_postings_list = M]) GRANULARITY 1
5858
)
5959
ENGINE = MergeTree
6060
ORDER BY key
6161
```
6262

63-
where `N` specifies the tokenizer:
63+
where `tokenizer` specifies the tokenizer:
6464

65-
- `gin(0)` (or shorter: `gin()`) set the tokenizer to "tokens", i.e. split strings along spaces,
66-
- `gin(N)` with `N` between 2 and 8 sets the tokenizer to "ngrams(N)"
65+
- `default` set the tokenizer to "tokens('default')", i.e. split strings along non-alphanumeric characters.
66+
- `ngram` set the tokenizer to "tokens('ngram')". i.e. splits strings to equal size terms.
67+
- `noop` set the tokenizer to "tokens('noop')", i.e. every value itself is a term.
6768

68-
The maximum rows per postings list can be specified as the second parameter. This parameter can be used to control postings list sizes to avoid generating huge postings list files. The following variants exist:
69+
The ngram size can be specified via the `ngram_size` parameter. This is an optional parameter. The following variants exist:
6970

70-
- `gin(ngrams, max_rows_per_postings_list)`: Use given max_rows_per_postings_list (assuming it is not 0)
71-
- `gin(ngrams, 0)`: No limitation of maximum rows per postings list
72-
- `gin(ngrams)`: Use a default maximum rows which is 64K.
71+
- `ngram_size = N`: with `N` between 2 and 8 sets the tokenizer to "tokens('ngram', N)".
72+
- If not specified: Use a default ngram size which is 3.
73+
74+
The maximum rows per postings list can be specified via an optional `max_rows_per_postings_list`. This parameter can be used to control postings list sizes to avoid generating huge postings list files. The following variants exist:
75+
76+
- `max_rows_per_postings_list = 0`: No limitation of maximum rows per postings list.
77+
- `max_rows_per_postings_list = M`: with `M` should be at least 8192.
78+
- If not specified: Use a default maximum rows which is 64K.
7379

7480
Being a type of skipping index, full-text indexes can be dropped or added to a column after table creation:
7581

7682
```sql
7783
ALTER TABLE tab DROP INDEX inv_idx;
78-
ALTER TABLE tab ADD INDEX inv_idx(s) TYPE gin(2);
84+
ALTER TABLE tab ADD INDEX inv_idx(s) TYPE gin(tokenizer = 'default');
7985
```
8086

8187
To use the index, no special functions or syntax are required. Typical string search predicates automatically leverage the index. As

0 commit comments

Comments
 (0)