Skip to content

Commit 266fa9d

Browse files
BayoNetSergei ShtykovemironyukElizaveta Mironyuk
authored
DOCS-627: Fixed language and markup in EN version and translated to RU. (ClickHouse#11001)
* DOCSUP-1063 (ClickHouse#114) * added first draft * added translation for force_optimize_skip_unused_shards and fixed anchors * fixes * fixes * fixed alter.md Co-authored-by: Elizaveta Mironyuk <[email protected]> * CLICKHOUSEDOCS-627: Updated templated. * Fixed markup. * CLICKHOUSEDOCS-627: Fixed links. Co-authored-by: Sergei Shtykov <[email protected]> Co-authored-by: emironyuk <[email protected]> Co-authored-by: Elizaveta Mironyuk <[email protected]>
1 parent 4c15950 commit 266fa9d

File tree

14 files changed

+142
-69
lines changed

14 files changed

+142
-69
lines changed

docs/_description_templates/template-system-table.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## system.table\_name {#system-tables_table-name}
1+
## system.table_name {#system-tables_table-name}
22

33
Description.
44

55
Columns:
66

7-
- `column_name` ([data\_type\_name](path/to/data_type.md)) — Description.
7+
- `column_name` ([data_type_name](path/to/data_type.md)) — Description.
88

99
**Example**
1010

docs/en/development/build-osx.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ toc_title: How to Build ClickHouse on Mac OS X
55

66
# How to Build ClickHouse on Mac OS X {#how-to-build-clickhouse-on-mac-os-x}
77

8-
Build should work on Mac OS X 10.15 (Catalina)
8+
Build should work on Mac OS X 10.15 (Catalina).
99

1010
## Install Homebrew {#install-homebrew}
1111

docs/en/getting-started/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
5050
sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
5151
```
5252

53-
If you want to use the most recent version, replace `stable` with `testing` (this is recommended for your testing environments). The `prestable` tag is sometimes available too.
53+
If you want to use the most recent version, replace `stable` with `testing` (this is recommended for your testing environments). `prestable` is sometimes also available.
5454

5555
Then run these commands to install packages:
5656

docs/en/operations/server-configuration-parameters/settings.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ Example
733733
<mysql_port>9004</mysql_port>
734734
```
735735

736-
## tmp\_path {#server-settings-tmp_path}
736+
## tmp_path {#tmp-path}
737737

738738
Path to temporary data for processing large queries.
739739

@@ -746,16 +746,17 @@ Path to temporary data for processing large queries.
746746
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
747747
```
748748

749-
## tmp\_policy {#server-settings-tmp-policy}
749+
## tmp_policy {#tmp-policy}
750750

751-
Policy from [`storage_configuration`](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) to store temporary files.
752-
If not set [`tmp_path`](#server-settings-tmp_path) is used, otherwise it is ignored.
751+
Policy from [storage_configuration](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) to store temporary files.
752+
753+
If not set, [tmp_path](#tmp-path) is used, otherwise it is ignored.
753754

754755
!!! note "Note"
755-
- `move_factor` is ignored
756-
- `keep_free_space_bytes` is ignored
757-
- `max_data_part_size_bytes` is ignored
758-
- you must have exactly one volume in that policy
756+
- `move_factor` is ignored.
757+
- `keep_free_space_bytes` is ignored.
758+
- `max_data_part_size_bytes` is ignored.
759+
- Уou must have exactly one volume in that policy.
759760

760761
## uncompressed\_cache\_size {#server-settings-uncompressed_cache_size}
761762

docs/en/operations/settings/settings.md

+13-8
Original file line numberDiff line numberDiff line change
@@ -1026,27 +1026,32 @@ Possible values:
10261026

10271027
Default value: 0.
10281028

1029-
## optimize\_skip\_unused\_shards {#settings-optimize_skip_unused_shards}
1029+
## optimize_skip_unused_shards {#optimize-skip-unused-shards}
10301030

1031-
Enables or disables skipping of unused shards for SELECT queries that have sharding key condition in PREWHERE/WHERE (assumes that the data is distributed by sharding key, otherwise do nothing).
1031+
Enables or disables skipping of unused shards for [SELECT](../../sql-reference/statements/select/index.md) queries that have sharding key condition in `WHERE/PREWHERE` (assuming that the data is distributed by sharding key, otherwise does nothing).
1032+
1033+
Possible values:
1034+
1035+
- 0 — Disabled.
1036+
- 1 — Enabled.
10321037

10331038
Default value: 0
10341039

1035-
## force\_optimize\_skip\_unused\_shards {#settings-force_optimize_skip_unused_shards}
1040+
## force_optimize_skip_unused_shards {#force-optimize-skip-unused-shards}
10361041

1037-
Enables or disables query execution if [`optimize_skip_unused_shards`](#settings-optimize_skip_unused_shards) enabled and skipping of unused shards is not possible. If the skipping is not possible and the setting is enabled exception will be thrown.
1042+
Enables or disables query execution if [optimize_skip_unused_shards](#optimize-skip-unused-shards) is enabled and skipping of unused shards is not possible. If the skipping is not possible and the setting is enabled, an exception will be thrown.
10381043

10391044
Possible values:
10401045

1041-
- 0 - Disabled (do not throws)
1042-
- 1 - Disable query execution only if the table has sharding key
1043-
- 2 - Disable query execution regardless sharding key is defined for the table
1046+
- 0 Disabled. ClickHouse doesn't throw an exception.
1047+
- 1 — Enabled. Query execution is disabled only if the table has a sharding key.
1048+
- 2 — Enabled. Query execution is disabled regardless of whether a sharding key is defined for the table.
10441049

10451050
Default value: 0
10461051

10471052
## force\_optimize\_skip\_unused\_shards\_no\_nested {#settings-force_optimize_skip_unused_shards_no_nested}
10481053

1049-
Reset [`optimize_skip_unused_shards`](#settings-force_optimize_skip_unused_shards) for nested `Distributed` table
1054+
Reset [`optimize_skip_unused_shards`](#optimize-skip-unused-shards) for nested `Distributed` table
10501055

10511056
Possible values:
10521057

docs/en/operations/system-tables.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -536,26 +536,26 @@ Contains logging entries. Logging level which goes to this table can be limited
536536

537537
Columns:
538538

539-
- `event_date` (`Date`) - Date of the entry.
540-
- `event_time` (`DateTime`) - Time of the entry.
541-
- `microseconds` (`UInt32`) - Microseconds of the entry.
539+
- `event_date` (Date) — Date of the entry.
540+
- `event_time` (DateTime) — Time of the entry.
541+
- `microseconds` (UInt32) — Microseconds of the entry.
542542
- `thread_name` (String) — Name of the thread from which the logging was done.
543543
- `thread_id` (UInt64) — OS thread ID.
544-
- `level` (`Enum8`) - Entry level.
545-
- `'Fatal' = 1`
546-
- `'Critical' = 2`
547-
- `'Error' = 3`
548-
- `'Warning' = 4`
549-
- `'Notice' = 5`
550-
- `'Information' = 6`
551-
- `'Debug' = 7`
552-
- `'Trace' = 8`
553-
- `query_id` (`String`) - ID of the query.
554-
- `logger_name` (`LowCardinality(String)`) - Name of the logger (i.e. `DDLWorker`)
555-
- `message` (`String`) - The message itself.
556-
- `revision` (`UInt32`) - ClickHouse revision.
557-
- `source_file` (`LowCardinality(String)`) - Source file from which the logging was done.
558-
- `source_line` (`UInt64`) - Source line from which the logging was done.
544+
- `level` (`Enum8`) Entry level. Possible values:
545+
- `1` or `'Fatal'`.
546+
- `2` or `'Critical'`.
547+
- `3` or `'Error'`.
548+
- `4` or `'Warning'`.
549+
- `5` or `'Notice'`.
550+
- `6` or `'Information'`.
551+
- `7` or `'Debug'`.
552+
- `8` or `'Trace'`.
553+
- `query_id` (String) — ID of the query.
554+
- `logger_name` (LowCardinality(String)) — Name of the logger (i.e. `DDLWorker`).
555+
- `message` (String) — The message itself.
556+
- `revision` (UInt32) — ClickHouse revision.
557+
- `source_file` (LowCardinality(String)) — Source file from which the logging was done.
558+
- `source_line` (UInt64) — Source line from which the logging was done.
559559

560560
## system.query\_log {#system_tables-query_log}
561561

docs/en/sql-reference/functions/arithmetic-functions.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ An exception is thrown when dividing by zero or when dividing a minimal negative
5353

5454
Differs from ‘intDiv’ in that it returns zero when dividing by zero or when dividing a minimal negative number by minus one.
5555

56-
## modulo(a, b), a % b operator {#moduloa-b-a-b-operator}
56+
## modulo(a, b), a % b operator {#modulo}
5757

5858
Calculates the remainder after division.
5959
If arguments are floating-point numbers, they are pre-converted to integers by dropping the decimal portion.
6060
The remainder is taken in the same sense as in C++. Truncated division is used for negative numbers.
6161
An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
6262

63-
## moduloOrZero(a, b) {#moduloorzeroa-b}
63+
## moduloOrZero(a, b) {#modulo-or-zero}
6464

65-
Differs from modulo in that it returns zero when the divisor is zero.
65+
Differs from [modulo](#modulo) in that it returns zero when the divisor is zero.
6666

6767
## negate(a), -a operator {#negatea-a-operator}
6868

docs/en/sql-reference/statements/alter.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -201,17 +201,17 @@ All changes on replicated tables are broadcasting to ZooKeeper so will be applie
201201

202202
The following operations with [partitions](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) are available:
203203

204-
- [DETACH PARTITION](#alter_detach-partition) Moves a partition to the `detached` directory and forget it.
205-
- [DROP PARTITION](#alter_drop-partition) Deletes a partition.
206-
- [ATTACH PART\|PARTITION](#alter_attach-partition) Adds a part or partition from the `detached` directory to the table.
207-
- [ATTACH PARTITION FROM](#alter_attach-partition-from) Copies the data partition from one table to another and adds.
208-
- [REPLACE PARTITION](#alter_replace-partition) - Copies the data partition from one table to another and replaces.
209-
- [MOVE PARTITION TO TABLE](#alter_move_to_table-partition)(#alter_move_to_table-partition) - Move the data partition from one table to another.
210-
- [CLEAR COLUMN IN PARTITION](#alter_clear-column-partition) - Resets the value of a specified column in a partition.
211-
- [CLEAR INDEX IN PARTITION](#alter_clear-index-partition) - Resets the specified secondary index in a partition.
212-
- [FREEZE PARTITION](#alter_freeze-partition) Creates a backup of a partition.
213-
- [FETCH PARTITION](#alter_fetch-partition) Downloads a partition from another server.
214-
- [MOVE PARTITION\|PART](#alter_move-partition) Move partition/data part to another disk or volume.
204+
- [DETACH PARTITION](#alter_detach-partition) Moves a partition to the `detached` directory and forget it.
205+
- [DROP PARTITION](#alter_drop-partition) Deletes a partition.
206+
- [ATTACH PART\|PARTITION](#alter_attach-partition) Adds a part or partition from the `detached` directory to the table.
207+
- [ATTACH PARTITION FROM](#alter_attach-partition-from) Copies the data partition from one table to another and adds.
208+
- [REPLACE PARTITION](#alter_replace-partition) Copies the data partition from one table to another and replaces.
209+
- [MOVE PARTITION TO TABLE](#alter_move_to_table-partition) — Moves the data partition from one table to another.
210+
- [CLEAR COLUMN IN PARTITION](#alter_clear-column-partition) Resets the value of a specified column in a partition.
211+
- [CLEAR INDEX IN PARTITION](#alter_clear-index-partition) Resets the specified secondary index in a partition.
212+
- [FREEZE PARTITION](#alter_freeze-partition) Creates a backup of a partition.
213+
- [FETCH PARTITION](#alter_fetch-partition) Downloads a partition from another server.
214+
- [MOVE PARTITION\|PART](#alter_move-partition) Move partition/data part to another disk or volume.
215215

216216
<!-- -->
217217

@@ -307,13 +307,13 @@ For the query to run successfully, the following conditions must be met:
307307
ALTER TABLE table_source MOVE PARTITION partition_expr TO TABLE table_dest
308308
```
309309

310-
This query move the data partition from the `table_source` to `table_dest` with deleting the data from `table_source`.
310+
This query moves the data partition from the `table_source` to `table_dest` with deleting the data from `table_source`.
311311

312312
For the query to run successfully, the following conditions must be met:
313313

314314
- Both tables must have the same structure.
315315
- Both tables must have the same partition key.
316-
- Both tables must be the same engine family. (replicated or non-replicated)
316+
- Both tables must be the same engine family (replicated or non-replicated).
317317
- Both tables must have the same storage policy.
318318

319319
#### CLEAR COLUMN IN PARTITION {#alter_clear-column-partition}

docs/ru/getting-started/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ sudo rpm --import https://repo.yandex.ru/clickhouse/CLICKHOUSE-KEY.GPG
3838
sudo yum-config-manager --add-repo https://repo.yandex.ru/clickhouse/rpm/stable/x86_64
3939
```
4040

41-
Для использования наиболее свежих версий нужно заменить `stable` на `testing` (рекомендуется для тестовых окружений).
41+
Для использования наиболее свежих версий нужно заменить `stable` на `testing` (рекомендуется для тестовых окружений). Также иногда доступен `prestable`.
4242

4343
Для, собственно, установки пакетов необходимо выполнить следующие команды:
4444

docs/ru/operations/server-configuration-parameters/settings.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ TCP порт для защищённого обмена данными с кли
686686
<mysql_port>9004</mysql_port>
687687
```
688688

689-
## tmp\_path {#tmp-path}
689+
## tmp_path {#tmp-path}
690690

691691
Путь ко временным данным для обработки больших запросов.
692692

@@ -698,6 +698,17 @@ TCP порт для защищённого обмена данными с кли
698698
``` xml
699699
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
700700
```
701+
## tmp_policy {#tmp-policy}
702+
703+
Политика из [storage_configuration](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) для хранения временных файлов.
704+
705+
Если политика не задана, используется [tmp_path](#tmp-path). В противном случае `tmp_path` игнорируется.
706+
707+
!!! note "Примечание"
708+
- `move_factor` игнорируется.
709+
- `keep_free_space_bytes` игнорируется.
710+
- `max_data_part_size_bytes` игнорируется.
711+
- В данной политике у вас должен быть ровно один том.
701712

702713
## uncompressed\_cache\_size {#server-settings-uncompressed_cache_size}
703714

docs/ru/operations/settings/settings.md

+23
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,29 @@ ClickHouse генерирует исключение
10251025

10261026
Значение по умолчанию: 0.
10271027

1028+
## optimize_skip_unused_shards {#optimize-skip-unused-shards}
1029+
1030+
Включает или отключает пропуск неиспользуемых шардов для запросов [SELECT](../../sql-reference/statements/select/index.md) , в которых условие ключа шардирования задано в секции `WHERE/PREWHERE`. Предполагается, что данные распределены с помощью ключа шардирования, в противном случае настройка ничего не делает.
1031+
1032+
Возможные значения:
1033+
1034+
- 0 — Выключена.
1035+
- 1 — Включена.
1036+
1037+
Значение по умолчанию: 0
1038+
1039+
## force_optimize_skip_unused_shards {#force-optimize-skip-unused-shards}
1040+
1041+
Разрешает или запрещает выполнение запроса, если настройка [optimize_skip_unused_shards](#optimize-skip-unused-shards) включена, а пропуск неиспользуемых шардов невозможен. Если данная настройка включена и пропуск невозможен, ClickHouse генерирует исключение.
1042+
1043+
Возможные значения:
1044+
1045+
- 0 — Выключена. ClickHouse не генерирует исключение.
1046+
- 1 — Включена. Выполнение запроса запрещается, только если у таблицы есть ключ шардирования.
1047+
- 2 — Включена. Выполнение запроса запрещается, даже если для таблицы не определен ключ шардирования.
1048+
1049+
Значение по умолчанию: 0
1050+
10281051
## optimize\_throw\_if\_noop {#setting-optimize_throw_if_noop}
10291052

10301053
Включает или отключает генерирование исключения в в случаях, когда запрос [OPTIMIZE](../../sql-reference/statements/misc.md#misc_operations-optimize) не выполняет мёрж.

docs/ru/operations/system-tables.md

+27
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,33 @@ CurrentMetric_ReplicatedChecks: 0
517517
- `query` (String) – текст запроса. Для запросов `INSERT` не содержит встаявляемые данные.
518518
- `query_id` (String) – идентификатор запроса, если был задан.
519519

520+
## system.text\_log {#system-tables-text-log}
521+
522+
Содержит записи логов. Уровень логирования для таблицы может быть ограничен параметром сервера `text_log.level`.
523+
524+
Столбцы:
525+
526+
- `event_date` (Date) — Дата создания записи.
527+
- `event_time` (DateTime) — Время создания записи.
528+
- `microseconds` (UInt32) — Время создания записи в микросекундах.
529+
- `thread_name` (String) — Название потока, из которого была сделана запись.
530+
- `thread_id` (UInt64) — Идентификатор потока ОС.
531+
- `level` (Enum8) — Уровень логирования записи. Возможные значения:
532+
- `1` или `'Fatal'`.
533+
- `2` или `'Critical'`.
534+
- `3` или `'Error'`.
535+
- `4` или `'Warning'`.
536+
- `5` или `'Notice'`.
537+
- `6` или `'Information'`.
538+
- `7` или `'Debug'`.
539+
- `8` или `'Trace'`.
540+
- `query_id` (String) — Идентификатор запроса.
541+
- `logger_name` (LowCardinality(String)) — Название логгера (`DDLWorker`).
542+
- `message` (String) — Само тело записи.
543+
- `revision` (UInt32) — Ревизия ClickHouse.
544+
- `source_file` (LowCardinality(String)) — Исходный файл, из которого была сделана запись.
545+
- `source_line` (UInt64) — Исходная строка, из которой была сделана запись.
546+
520547
## system.query\_log {#system_tables-query_log}
521548

522549
Содержит информацию о выполнении запросов. Для каждого запроса вы можете увидеть время начала обработки, продолжительность обработки, сообщения об ошибках и другую информацию.

docs/ru/sql-reference/functions/arithmetic-functions.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,17 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
4848

4949
Отличается от intDiv тем, что при делении на ноль или при делении минимального отрицательного числа на минус единицу, возвращается ноль.
5050

51-
## modulo(a, b), оператор a % b {#moduloa-b-operator-a-b}
51+
## modulo(a, b), оператор a % b {#modulo}
5252

5353
Вычисляет остаток от деления.
5454
Если аргументы - числа с плавающей запятой, то они предварительно преобразуются в целые числа, путём отбрасывания дробной части.
5555
Берётся остаток в том же смысле, как это делается в C++. По факту, для отрицательных чисел, используется truncated division.
5656
При делении на ноль или при делении минимального отрицательного числа на минус единицу, кидается исключение.
5757

58+
## moduloOrZero(a, b) {#modulo-or-zero}
59+
60+
В отличие от [modulo](#modulo), возвращает ноль при делении на ноль.
61+
5862
## negate(a), оператор -a {#negatea-operator-a}
5963

6064
Вычисляет число, обратное по знаку. Результат всегда имеет знаковый тип.

0 commit comments

Comments
 (0)