Skip to content

Commit a10e1bb

Browse files
devcrafterdevcrafter
authored
Merge branch 'master' into fix-pr-distinct-in-order
2 parents d985df3 + a895b59 commit a10e1bb

88 files changed

Lines changed: 216 additions & 380 deletions

File tree

Some content is hidden

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

‎ci/jobs/scripts/functional_tests_results.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
BROKEN_TESTS_ANALYZER_TECH_DEBT = [
3030
"01624_soft_constraints",
31-
# Check after ConstantNode refactoring
32-
"02944_variant_as_common_type",
3331
]
3432

3533

‎ci/jobs/scripts/workflow_hooks/trusted.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
e.lower()
88
for e in [
99
"amosbird",
10-
"azat", # SEMRush
11-
"bharatnc", # Many contributions.
1210
"den-crane", # Documentation contributor
1311
"taiyang-li",
1412
"ucasFL", # Amos Bird's friend
1513
"tonickkozlov", # Cloudflare
14+
"canhld94",
1615
]
1716
}
1817

‎docs/en/operations/storing-data.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ configuration file.
744744
:::
745745

746746
:::tip
747-
A [demo dataset](https://github.com/ClickHouse/web-tables-demo) is hosted in GitHub. To prepare your own tables for web storage see the tool [clickhouse-static-files-uploader](/operations/storing-data.md/#storing-data-on-webserver)
747+
A [demo dataset](https://github.com/ClickHouse/web-tables-demo) is hosted in GitHub. To prepare your own tables for web storage see the tool [clickhouse-static-files-uploader](/operations/utilities/static-files-disk-uploader)
748748
:::
749749

750750
In this `ATTACH TABLE` query the `UUID` provided matches the directory name of the data, and the endpoint is the URL for the raw GitHub content.

‎docs/en/operations/system-tables/asynchronous_insert_log.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Contains information about async inserts. Each entry represents an insert query
1212

1313
To start logging configure parameters in the [asynchronous_insert_log](../../operations/server-configuration-parameters/settings.md#asynchronous_insert_log) section.
1414

15-
The flushing period of data is set in `flush_interval_milliseconds` parameter of the [asynchronous_insert_log](../../operations/server-configuration-parameters/settings.md#asynchronous_insert_log) server settings section. To force flushing, use the [SYSTEM FLUSH LOGS](/sql-reference/statements/system#query_language-system-flush_logs) query.
15+
The flushing period of data is set in `flush_interval_milliseconds` parameter of the [asynchronous_insert_log](../../operations/server-configuration-parameters/settings.md#asynchronous_insert_log) server settings section. To force flushing, use the [SYSTEM FLUSH LOGS](/sql-reference/statements/system#flush-logs) query.
1616

1717
ClickHouse does not delete data from the table automatically. See [Introduction](/operations/system-tables/overview#system-tables-introduction) for more details.
1818

‎docs/en/operations/system-tables/dictionaries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Columns:
2727
- `key.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of [key names](/operations/system-tables/dictionaries) provided by the dictionary.
2828
- `key.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [key types](/sql-reference/dictionaries#dictionary-key-and-fields) provided by the dictionary.
2929
- `attribute.names` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Array of [attribute names](/sql-reference/dictionaries#dictionary-key-and-fields) provided by the dictionary.
30-
- `attribute.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [attribute types](../../sql-reference/dictionaries/index.md#dictionary-key-and-fields#ext_dict_structure-attributes) provided by the dictionary.
30+
- `attribute.types` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — Corresponding array of [attribute types](/sql-reference/dictionaries#attributes) provided by the dictionary.
3131
- `bytes_allocated` ([UInt64](/sql-reference/data-types/int-uint#integer-ranges)) — Amount of RAM allocated for the dictionary.
3232
- `query_count` ([UInt64](/sql-reference/data-types/int-uint#integer-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
3333
- `hit_rate` ([Float64](../../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.

‎docs/en/operations/system-tables/query_log.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This table does not contain the ingested data for `INSERT` queries.
1616

1717
You can change settings of queries logging in the [query_log](../../operations/server-configuration-parameters/settings.md#query-log) section of the server configuration.
1818

19-
You can disable queries logging by setting [log_queries = 0](/sql-reference/functions/hash-functions#siphash128/operations/settings/settings#log_queries). We do not recommend to turn off logging because information in this table is important for solving issues.
19+
You can disable queries logging by setting [log_queries = 0](/operations/settings/settings#log_queries). We do not recommend to turn off logging because information in this table is important for solving issues.
2020

2121
The flushing period of data is set in `flush_interval_milliseconds` parameter of the [query_log](../../operations/server-configuration-parameters/settings.md#query-log) server settings section. To force flushing, use the [SYSTEM FLUSH LOGS](/sql-reference/statements/system#flush-logs) query.
2222

‎docs/en/operations/system-tables/quotas.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ Columns:
2727

2828
## See Also {#see-also}
2929

30-
- [SHOW QUOTAS](../../sql-reference/statements/show.md#show-quotas-statement)
30+
- [SHOW QUOTAS](/sql-reference/statements/show#show-quotas)

‎docs/en/operations/system-tables/settings.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,6 @@ SELECT * FROM system.settings WHERE changed AND name='load_balancing'
141141
**See also**
142142

143143
- [Settings](/operations/system-tables/overview#system-tables-introduction)
144-
- [Permissions for Queries](../../operations/settings/permissions-for-queries.md#settings_readonly)
144+
- [Permissions for Queries](/operations/settings/permissions-for-queries)
145145
- [Constraints on Settings](../../operations/settings/constraints-on-settings.md)
146146
- [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings) statement

‎docs/en/sql-reference/aggregate-functions/combinators.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Result:
9595

9696
## -State {#-state}
9797

98-
If you apply this combinator, the aggregate function does not return the resulting value (such as the number of unique values for the [uniq](../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function), but an intermediate state of the aggregation (for `uniq`, this is the hash table for calculating the number of unique values). This is an `AggregateFunction(...)` that can be used for further processing or stored in a table to finish aggregating later.
98+
If you apply this combinator, the aggregate function does not return the resulting value (such as the number of unique values for the [uniq](/sql-reference/aggregate-functions/reference/uniq) function), but an intermediate state of the aggregation (for `uniq`, this is the hash table for calculating the number of unique values). This is an `AggregateFunction(...)` that can be used for further processing or stored in a table to finish aggregating later.
9999

100100
:::note
101101
Please notice, that -MapState is not an invariant for the same data due to the fact that order of data in intermediate state can change, though it doesn't impact ingestion of this data.
@@ -104,7 +104,7 @@ Please notice, that -MapState is not an invariant for the same data due to the f
104104
To work with these states, use:
105105

106106
- [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) table engine.
107-
- [finalizeAggregation](../../sql-reference/functions/other-functions.md#function-finalizeaggregation) function.
107+
- [finalizeAggregation](/sql-reference/functions/other-functions#finalizeaggregation) function.
108108
- [runningAccumulate](../../sql-reference/functions/other-functions.md#runningaccumulate) function.
109109
- [-Merge](#-merge) combinator.
110110
- [-MergeState](#-mergestate) combinator.
@@ -286,7 +286,7 @@ Consider the `people` table with the following data:
286286

287287
Let's get the names of the people whose age lies in the intervals of `[30,60)` and `[60,75)`. Since we use integer representation for age, we get ages in the `[30, 59]` and `[60,74]` intervals.
288288

289-
To aggregate names in an array, we use the [groupArray](../../sql-reference/aggregate-functions/reference/grouparray.md#agg_function-grouparray) aggregate function. It takes one argument. In our case, it's the `name` column. The `groupArrayResample` function should use the `age` column to aggregate names by age. To define the required intervals, we pass the `30, 75, 30` arguments into the `groupArrayResample` function.
289+
To aggregate names in an array, we use the [groupArray](/sql-reference/aggregate-functions/reference/grouparray) aggregate function. It takes one argument. In our case, it's the `name` column. The `groupArrayResample` function should use the `age` column to aggregate names by age. To define the required intervals, we pass the `30, 75, 30` arguments into the `groupArrayResample` function.
290290

291291
``` sql
292292
SELECT groupArrayResample(30, 75, 30)(name, age) FROM people

‎docs/en/sql-reference/aggregate-functions/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Aggregate functions work in the [normal](http://www.sql-tutorial.com/sql-aggrega
1010

1111
ClickHouse also supports:
1212

13-
- [Parametric aggregate functions](../../sql-reference/aggregate-functions/parametric-functions.md#aggregate_functions_parametric), which accept other parameters in addition to columns.
14-
- [Combinators](../../sql-reference/aggregate-functions/combinators.md#aggregate_functions_combinators), which change the behavior of aggregate functions.
13+
- [Parametric aggregate functions](/sql-reference/aggregate-functions/parametric-functions), which accept other parameters in addition to columns.
14+
- [Combinators](/sql-reference/aggregate-functions/combinators), which change the behavior of aggregate functions.
1515

1616

1717
## NULL Processing {#null-processing}

0 commit comments

Comments
 (0)