aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralextarazanov <alextarazanov@yandex-team.ru>2022-05-16 14:27:56 +0300
committeralextarazanov <alextarazanov@yandex-team.ru>2022-05-16 14:27:56 +0300
commita5a552eb6498ddae3005cc469e9c7427735050b4 (patch)
tree6092e8b4bd22b8f3f351e122dd85324c008bde40
parenta0fd66430ea4a99f79d23d01afe216145200de87 (diff)
downloadydb-a5a552eb6498ddae3005cc469e9c7427735050b4.tar.gz
[ARC] Проверяем перевод YDB Core 20220422
ref:9145c66ed6fdfbd1228885bb1cbb87aae89bf78b
-rw-r--r--ydb/docs/en/core/downloads/_includes/server/linux.md2
-rw-r--r--ydb/docs/en/core/faq/_includes/index.md2
-rw-r--r--ydb/docs/en/core/getting_started/_includes/auth.md6
-rw-r--r--ydb/docs/en/core/getting_started/_includes/cli.md4
-rw-r--r--ydb/docs/en/core/getting_started/_includes/create_db.md4
-rw-r--r--ydb/docs/en/core/getting_started/_includes/yql.md5
-rw-r--r--ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_docker/03_start.md2
-rw-r--r--ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md2
-rw-r--r--ydb/docs/en/core/index.yaml20
-rw-r--r--ydb/docs/en/core/reference/ydb-cli/_includes/commands.md4
-rw-r--r--ydb/docs/en/core/reference/ydb-cli/export_import/_includes/import-file.md134
-rw-r--r--ydb/docs/en/core/reference/ydb-cli/export_import/import-file.md1
-rw-r--r--ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml4
-rw-r--r--ydb/docs/en/core/reference/ydb-sdk/recipes/debug/_includes/jaeger/go.md3
-rw-r--r--ydb/docs/en/core/reference/ydb-sdk/recipes/retry/_includes/go.md2
-rw-r--r--ydb/docs/en/core/toc_i.yaml21
-rw-r--r--ydb/docs/en/core/troubleshooting/_includes/monitoring_sensors.md6
-rw-r--r--ydb/docs/en/core/yql/reference/yql-core/syntax/_includes/Readme.txt2
-rw-r--r--ydb/docs/en/core/yql/reference/yql-core/types/_includes/datatypes_primitive_string.md2
-rw-r--r--ydb/docs/en/core/yql/reference/yql-core/types/_includes/json.md2
-rw-r--r--ydb/docs/en/core/yql/reference/yql-core/udf/list/_includes/url.md10
21 files changed, 186 insertions, 52 deletions
diff --git a/ydb/docs/en/core/downloads/_includes/server/linux.md b/ydb/docs/en/core/downloads/_includes/server/linux.md
index 1c23fd84a0..928930cb2e 100644
--- a/ydb/docs/en/core/downloads/_includes/server/linux.md
+++ b/ydb/docs/en/core/downloads/_includes/server/linux.md
@@ -1,4 +1,4 @@
Version | Release date | Download
:--- | :--- | :---
v.22.2.22 | 18.04.22 | [Binary file](https://binaries.ydb.tech/release/22.2.22/ydbd-22.2.22-linux-amd64.tar.gz)
-v.22.2.5 | 14.02.22 | [Binary file](https://binaries.ydb.tech/ydbd-22.2.5-linux-amd64.tar.gz)
+v.22.2.5 | 14.02.22 | [Binary file](https://binaries.ydb.tech/release/22.2.5/ydbd-22.2.5-linux-amd64.tar.gz)
diff --git a/ydb/docs/en/core/faq/_includes/index.md b/ydb/docs/en/core/faq/_includes/index.md
index 71594dd041..ef38acaf1b 100644
--- a/ydb/docs/en/core/faq/_includes/index.md
+++ b/ydb/docs/en/core/faq/_includes/index.md
@@ -1,4 +1,4 @@
-# Frequently Asked Questions
+# Questions and answers about {{ ydb-short-name }}
* [General](../common.md)
{% if oss %}
diff --git a/ydb/docs/en/core/getting_started/_includes/auth.md b/ydb/docs/en/core/getting_started/_includes/auth.md
index 3f2ada3c87..4dba70099c 100644
--- a/ydb/docs/en/core/getting_started/_includes/auth.md
+++ b/ydb/docs/en/core/getting_started/_includes/auth.md
@@ -1,10 +1,10 @@
# Authentication - Getting started
-A local YDB database deployed with one of the self-hosted 'Getting started' scenarios does not require authentication, that is, runs in [anonymous mode](../../concepts/connect.md#auth-modes).
+A local YDB database with self-deployment does not require authentication, that is, runs in [anonymous mode](../../concepts/connect.md#auth-modes).
Full information about all available authentication methods is given in the [DB connection](../../concepts/connect.md) article under "Concepts".
-## Next step {#next}
+## Learn more about YDB {#next}
-Go to [YDB CLI: Getting started](../cli.md) to proceed with the 'Getting started' scenario.
+Go to [YDB CLI: Getting started](../cli.md) to learn more about YDB.
diff --git a/ydb/docs/en/core/getting_started/_includes/cli.md b/ydb/docs/en/core/getting_started/_includes/cli.md
index 60757a1bb3..1b247c8a05 100644
--- a/ydb/docs/en/core/getting_started/_includes/cli.md
+++ b/ydb/docs/en/core/getting_started/_includes/cli.md
@@ -102,7 +102,7 @@ Executing commands via `ydb yql` is a nice and easy way to get started. However,
The YDB CLI supports individual commands with complete sets of options for any existing YDB API. For a full list of commands, see the [YDB CLI reference](../../reference/ydb-cli/index.md).
-## Next step {#next}
+## Learn more about YDB {#next}
-Go to [YQL - Getting started](../yql.md) to proceed with the 'Getting started' scenario.
+Proceed to the [YQL - Getting started](../yql.md) article to learn more about YDB.
diff --git a/ydb/docs/en/core/getting_started/_includes/create_db.md b/ydb/docs/en/core/getting_started/_includes/create_db.md
index 0e45be06e6..4a2403a1b0 100644
--- a/ydb/docs/en/core/getting_started/_includes/create_db.md
+++ b/ydb/docs/en/core/getting_started/_includes/create_db.md
@@ -12,7 +12,7 @@ There are three methods you can use to deploy {{ ydb-short-name }}:
* [In Kubernetes](../../deploy/orchestrated/concepts.md).
* [Locally, from a downloaded executable file](../self_hosted/ydb_local.md).
-## Next step {#next}
+## Learn more about YDB {#next}
-After creating your database, proceed to the [Authentication - Getting started](../auth.md) article.
+After creating your database, proceed to the [Authentication - Getting started](../auth.md) article to learn more about YDB.
diff --git a/ydb/docs/en/core/getting_started/_includes/yql.md b/ydb/docs/en/core/getting_started/_includes/yql.md
index 20fb083bb5..b38f904fc1 100644
--- a/ydb/docs/en/core/getting_started/_includes/yql.md
+++ b/ydb/docs/en/core/getting_started/_includes/yql.md
@@ -210,8 +210,7 @@ For a full description of the ways to pass parameters, see [the {{ ydb-short-nam
You can learn more about YQL use cases by completing tasks from the [YQL tutorial](../../yql/tutorial/index.md).
-## Next step {#next}
-
-Go to [YDB SDK - Getting started](../sdk.md) to proceed with the 'Getting started' scenario.
+## Learn more about YDB {#next}
+Proceed to the [YDB SDK - Getting started](../sdk.md) article to learn more about YDB.
diff --git a/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_docker/03_start.md b/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_docker/03_start.md
index c7ab478419..54225d8460 100644
--- a/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_docker/03_start.md
+++ b/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_docker/03_start.md
@@ -30,7 +30,7 @@ If started successfully, you'll see the ID of the created container.
- `/ydb_data` for storing data. If this directory is not mounted, the container will be started without saving data to the host system disk.
- `/ydb_certs` for storing certificates to establish a TLS connection. The started container will write to this directory the certificates to be used for a TLS client connection. If this directory is not mounted, you won't be able to connect via TLS due to having no certificate information.
-`-e` means setting environment variables in `<name>=<value>`. The YDB container uses the following environment variables:
+`-e`: means setting environment variables in `<name>=<value>` format. The YDB container uses the following environment variables:
- `YDB_DEFAULT_LOG_LEVEL`: The logging level. Acceptable values: `CRIT`, `ERROR`, `WARN`, `NOTICE`, and `INFO`. Defaults to `NOTICE`.
- `GRPC_PORT`: The port for unencrypted connections. Defaults to 2136.
diff --git a/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md b/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md
index 018f4ece5b..5ad3fc9d3a 100644
--- a/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md
+++ b/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md
@@ -22,7 +22,7 @@ curl https://binaries.ydb.tech/local_scripts/install.sh | bash
## Starting {#start}
-The local YDB server can be started in two modes:
+The local YDB server can be started in disk or in-memory mode:
{% list tabs %}
diff --git a/ydb/docs/en/core/index.yaml b/ydb/docs/en/core/index.yaml
index d0812c7fba..f36a1b2147 100644
--- a/ydb/docs/en/core/index.yaml
+++ b/ydb/docs/en/core/index.yaml
@@ -16,20 +16,20 @@ links:
- title: Recommendations
description: A set of recommendations for practical service use
href: best_practices/
- - title: YQL Reference
- description: YDB Query Language reference, syntax and built-in functions
+ - title: YQL reference guide
+ description: Description of YQL syntax and built-in functions
href: yql/reference/
- - title: CLI Reference
- description: YDB Command-Line Interface reference
+ - title: Working with the CLI
+ description: YDB CLI reference
href: reference/ydb-cli/
- - title: SDK Reference
- description: YDB Software Development Kits reference
+ - title: Working with the SDK
+ description: YDB SDK reference
href: reference/ydb-sdk/
- - title: Manage databases
- description: Configuration, maintenance, monitoring and troubleshooting of the YDB databases
+ - title: Managing databases
+ description: Configuring, maintaining, monitoring, and performing diagnostics of YDB databases
href: db/
- - title: Cluster management
- description: Configuration, maintenance, monitoring and troubleshooting of the YDB clusters
+ - title: Managing a cluster
+ description: Configuring, maintaining, monitoring, and performing diagnostics of YDB clusters
href: cluster/
- title: Useful links
description: Links to various resources related to YDB
diff --git a/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md b/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md
index 674808ddc8..8482dcee73 100644
--- a/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md
+++ b/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md
@@ -31,8 +31,8 @@ Any command can be run from the command line with the `--help` option to get hel
| [discovery list](../commands/discovery-list.md) | List of endpoints |
| [discovery whoami](../commands/discovery-whoami.md) | Authentication |
| [export s3](../export_import/s3_export.md) | Exporting data to S3 storage |
-| import file csv | Importing data from a CSV file |
-| import file tsv | Importing data from a TSV file |
+| [import file csv](../export_import/import-file.md) | Importing data from a CSV file |
+| [import file tsv](../export_import/import-file.md) | Importing data from a TSV file |
| [import s3](../export_import/s3_import.md) | Importing data from S3 storage |
| [init](../profile/create.md) | Initializing the CLI, creating a [profile](../profile/index.md) |
| operation cancel | Aborting a background operation |
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/import-file.md b/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/import-file.md
new file mode 100644
index 0000000000..ce975b3272
--- /dev/null
+++ b/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/import-file.md
@@ -0,0 +1,134 @@
+# Importing data from a file to an existing table
+
+Using the `import file` subcommand, you can import data from [CSV]{% if lang == "ru" %}(https://ru.wikipedia.org/wiki/CSV){% endif %}{% if lang == "en" %}(https://en.wikipedia.org/wiki/Comma-separated_values){% endif %} or [TSV]{% if lang == "ru" %}(https://ru.wikipedia.org/wiki/TSV){% endif %}{% if lang == "en" %}(https://en.wikipedia.org/wiki/Tab-separated_values){% endif %} files to an existing table.
+
+Data is imported by the `BulkUpsert` method that doesn't guarantee transactionality. In case the table already contains data, it will be replaced with imported data if the primary key matches.
+
+The imported file must be encoded in [UTF-8]{% if lang == "ru" %}(https://ru.wikipedia.org/wiki/UTF-8){% endif %}{% if lang == "en" %}(https://en.wikipedia.org/wiki/UTF-8){% endif %}. Processing a line break inside a data field is not supported.
+
+General command format:
+
+```bash
+{{ ydb-cli }} [connection options] import file csv|tsv [options]
+```
+
+{% include [conn_options_ref.md](../../commands/_includes/conn_options_ref.md) %}
+
+## Subcommand parameters {#options}
+
+### Required parameters {#required}
+
+* `-p, --path STRING`: Path to the DB table.
+* `--input-file STRING`: Path to the file in the local file system, whose data needs to be imported.
+
+### Additional parameters {#optional}
+
+* `--skip-rows NUM`: Number of rows from the beginning of the file to be skipped during import. Default value: `0`.
+* `--header`: Specify this parameter if the first row (excluding the rows skipped when using the `--skip-rows` parameter) contains the names of data columns to be mapped to the corresponding table columns. If no header row is specified, the data will be mapped in the order of columns in the table schema.
+* `--delimiter STRING`: Data column delimiter character. You can't specify a tab character as a delimiter in this parameter. To import a file with this delimiter, use the `import file tsv` subcommand. Default value: `,`.
+* `--null-value STRING`: Value to be imported as `NULL`. Default value: `""`.
+* `--batch-bytes VAL`: Split the uploaded file into batches of the specified size. If a row does not fit into the whole batch, it will be discarded and passed in the next batch. For any size value, a batch consists of at least one row. Default value: `1 Mib`.
+* `--max-in-flight VAL`: Number of simultaneously uploaded data batches. To speed up the import of large files, you can increase the value of this parameter. Default value: `100`.
+
+## Examples {#examples}
+
+{% include [example_db1.md](../../_includes/example_db1.md) %}
+
+Before running the examples, [create a table](../../../../getting_started/yql.md#create-table) `series`.
+
+### Importing a file {#simple}
+
+The file contains data without additional information. The `,` is used as a delimiter:
+
+```text
+1,The IT Crowd,The IT Crowd is a British sitcom.,13182
+2,Silicon Valley,Silicon Valley is an American comedy television series.,16166
+```
+
+{% note info %}
+
+The `release_date` column of the `series` table is of the [Date](../../../../yql/reference/types/primitive.md#datetime) type, so the release date in the imported file is represented as a number. To import values in [timestamp]{% if lang == "ru" %}(https://ru.wikipedia.org/wiki/ISO_8601){% endif %}{% if lang == "en" %}(https://en.wikipedia.org/wiki/ISO_8601){% endif %} format, use string type table columns or import them to a temporary table and then convert them to the desired type.
+
+{% endnote %}
+
+To import this file, run the command:
+
+```bash
+ydb import file csv -p series --input-file series.csv
+```
+
+As a result, the following data is imported:
+
+```text
+┌──────────────┬───────────┬───────────────────────────────────────────────────────────┬──────────────────┐
+| release_date | series_id | series_info | title |
+├──────────────┼───────────┼───────────────────────────────────────────────────────────┼──────────────────┤
+| "2006-02-03" | 1 | "The IT Crowd is a British sitcom." | "The IT Crowd" |
+├──────────────┼───────────┼───────────────────────────────────────────────────────────┼──────────────────┤
+| "2014-04-06" | 2 | "Silicon Valley is an American comedy television series." | "Silicon Valley" |
+└──────────────┴───────────┴───────────────────────────────────────────────────────────┴──────────────────┘
+```
+
+### Importing a file with the `|` delimiter {#custom-delimiter}
+
+The file contains data without additional information. The `|` character is used as a delimiter:
+
+```text
+1|IT Crowd|The IT Crowd is a British sitcom.|13182
+2|Silicon Valley|Silicon Valley is an American comedy television series.|16166
+```
+
+To import this file, specify the `--delimiter` parameter set to `|`:
+
+```bash
+ydb import file csv -p series --input-file series.csv --delimiter "|"
+```
+
+### Skipping rows and counting column headers {#skip}
+
+The file contains additional information in the first and second rows and column headers in the third row. The order of data in the file rows does not correspond to the order of table columns:
+
+```text
+#The file contains data about the series.
+#
+series_id,title,release_date,series_info
+1,The IT Crowd,13182,The IT Crowd is a British sitcom.
+2,Silicon Valley,16166,Silicon Valley is an American comedy television series.
+```
+
+To skip comments in the first and second rows, specify the `--skip-rows 2` parameter. To process the third row as a header and map the file data to the appropriate table columns, specify the `--header` parameter:
+
+```bash
+ydb import file csv -p series --input-file series.csv --skip-rows 2 --header
+```
+
+### Replacing values with `NULL` {#replace-with-null}
+
+The file contains `\N`, a designation that is frequently used for `NULL`, and an empty string.
+
+```text
+1,The IT Crowd,The IT Crowd is a British sitcom.,13182
+2,Silicon Valley,"",\N
+3,Lost,,\N
+```
+
+Specify the `--null-value "\N"` parameter to make sure `\N` is interpreted as `NULL`:
+
+```bash
+ydb import file csv -p series --input-file series.csv --null-value "\N"
+```
+
+As a result, the following data is imported:
+
+```text
+┌──────────────┬───────────┬─────────────────────────────────────┬──────────────────┐
+| release_date | series_id | series_info | title |
+├──────────────┼───────────┼─────────────────────────────────────┼──────────────────┤
+| "2006-02-03" | 1 | "The IT Crowd is a British sitcom." | "The IT Crowd" |
+├──────────────┼───────────┼─────────────────────────────────────┼──────────────────┤
+| null | 2 | "" | "Silicon Valley" |
+├──────────────┼───────────┼─────────────────────────────────────┼──────────────────┤
+| null | 3 | "" | "Lost" |
+└──────────────┴───────────┴─────────────────────────────────────┴──────────────────┘
+```
+
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/import-file.md b/ydb/docs/en/core/reference/ydb-cli/export_import/import-file.md
new file mode 100644
index 0000000000..49e7eb5a64
--- /dev/null
+++ b/ydb/docs/en/core/reference/ydb-cli/export_import/import-file.md
@@ -0,0 +1 @@
+{% include [file_structure.md](_includes/import-file.md) %}
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml b/ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml
index b14caf2943..d12d1af46d 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml
+++ b/ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml
@@ -10,4 +10,6 @@ items:
- name: Exporting data to S3
href: s3_export.md
- name: Importing data from S3
- href: s3_import.md \ No newline at end of file
+ href: s3_import.md
+- name: Importing data from a file to an existing table
+ href: import-file.md \ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-sdk/recipes/debug/_includes/jaeger/go.md b/ydb/docs/en/core/reference/ydb-sdk/recipes/debug/_includes/jaeger/go.md
index 82cb22e2af..668ba6ba04 100644
--- a/ydb/docs/en/core/reference/ydb-sdk/recipes/debug/_includes/jaeger/go.md
+++ b/ydb/docs/en/core/reference/ydb-sdk/recipes/debug/_includes/jaeger/go.md
@@ -49,9 +49,6 @@ func main() {
os.Getenv("YDB_CONNECTION_STRING"),
tracing.WithTraces(
tracing.WithDetails(trace.DetailsAll),
- ),
- ydb.WithTraceTable(tracing.Table(
- tracing.WithDetails(trace.DetailsAll),
)),
)
if err != nil {
diff --git a/ydb/docs/en/core/reference/ydb-sdk/recipes/retry/_includes/go.md b/ydb/docs/en/core/reference/ydb-sdk/recipes/retry/_includes/go.md
index a9e8e22c60..a0ea32db03 100644
--- a/ydb/docs/en/core/reference/ydb-sdk/recipes/retry/_includes/go.md
+++ b/ydb/docs/en/core/reference/ydb-sdk/recipes/retry/_includes/go.md
@@ -46,7 +46,7 @@ If the custom function returns an error, the {{ ydb-short-name }} Go SDK tries t
}
fmt.Println(whoAmI)
},
- retry.WithIdempotent(),
+ retry.WithIdempotent(true),
)
if err != nil {
panic(err)
diff --git a/ydb/docs/en/core/toc_i.yaml b/ydb/docs/en/core/toc_i.yaml
index 318ba17ac4..38c058da46 100644
--- a/ydb/docs/en/core/toc_i.yaml
+++ b/ydb/docs/en/core/toc_i.yaml
@@ -7,20 +7,21 @@ items:
# Main
- { name: Concepts, include: { mode: link, path: concepts/toc_p.yaml } }
-- { name: Step-by-step instructions, include: { mode: link, path: operations/toc_p.yaml } }
+- { name: Step-by-step instructions, include: { mode: link, path: operations/toc_p.yaml } }
-- { name: Recommendations, include: { mode: link, path: best_practices/toc_p.yaml } }
+- { name: Recommendations, include: { mode: link, path: best_practices/toc_p.yaml } }
+# - { name: Diagnostics, include: { mode: link, path: troubleshooting/toc_p.yaml } } moved into maintenance!
+# - { name: Deployment, include: { mode: link, path: deploy/toc_p.yaml } }
+# - { name: Maintenance, include: { mode: link, path: maintenance/toc_p.yaml } }
-- { name: Manage databases, include: { mode: link, path: db/toc_p.yaml } }
-- { name: Cluster management, include: { mode: link, path: cluster/toc_p.yaml } }
+- { name: Managing databases, include: { mode: link, path: db/toc_p.yaml } }
+- { name: Managing a cluster, include: { mode: link, path: cluster/toc_p.yaml } }
# References
-- name: Reference
- items:
- - { name: YQL, include: { mode: link, path: yql/toc_p.yaml } }
- - { name: CLI, include: { mode: link, path: reference/ydb-cli/toc_p.yaml } }
- - { name: SDK, include: { mode: link, path: reference/ydb-sdk/toc_p.yaml } }
+- { name: YQL, include: { mode: link, path: yql/toc_p.yaml } }
+- { name: Working with the YDB CLI, include: { mode: link, path: reference/ydb-cli/toc_p.yaml } }
+- { name: Working with the YDB SDK, include: { mode: link, path: reference/ydb-sdk/toc_p.yaml } }
# Footer
-- { name: FAQ, include: { mode: link, path: faq/toc_p.yaml } }
+- { name: Questions and answers, include: { mode: link, path: faq/toc_p.yaml } }
- include: { mode: link, path: downloads/toc_p.yaml }
diff --git a/ydb/docs/en/core/troubleshooting/_includes/monitoring_sensors.md b/ydb/docs/en/core/troubleshooting/_includes/monitoring_sensors.md
index 62626f4c30..3dada00ae2 100644
--- a/ydb/docs/en/core/troubleshooting/_includes/monitoring_sensors.md
+++ b/ydb/docs/en/core/troubleshooting/_includes/monitoring_sensors.md
@@ -84,7 +84,7 @@ You can analyze a transaction's execution time using a histogram counter. The in
| Metric name<br/>Type<br/>units of measurement | Description<br/>Labels |
| ----- | ----- |
-| `table.query.compilation.cache_evictions`<br/>`RATE`, pieces | The number of queries evicted from the cache of [prepared queries](../oss/public/reference/ydb-sdk/#param-prepared-queries) in a certain period of time. |
-| `table.query.compilation.cache_size_bytes`<br/>`IGAUGE`, bytes | The size of the cache of [prepared queries](../oss/public/reference/ydb-sdk/#param-prepared-queries). |
-| `table.query.compilation.cached_query_count`<br/>`IGAUGE`, pieces | The size of the cache of [prepared queries](../oss/public/reference/ydb-sdk/#param-prepared-queries). |
+| `table.query.compilation.cache_evictions`<br/>`RATE`, pieces | The number of queries evicted from the cache of [prepared queries](../../reference/ydb-sdk/example/index.md#param-queries) in a certain period of time. |
+| `table.query.compilation.cache_size_bytes`<br/>`IGAUGE`, bytes | The size of the cache of [prepared queries](../../reference/ydb-sdk/example/index.md#param-queries). |
+| `table.query.compilation.cached_query_count`<br/>`IGAUGE`, pieces | The size of the cache of [prepared queries](../../reference/ydb-sdk/example/index.md#param-queries). |
diff --git a/ydb/docs/en/core/yql/reference/yql-core/syntax/_includes/Readme.txt b/ydb/docs/en/core/yql/reference/yql-core/syntax/_includes/Readme.txt
index 968a215b7f..163838f91a 100644
--- a/ydb/docs/en/core/yql/reference/yql-core/syntax/_includes/Readme.txt
+++ b/ydb/docs/en/core/yql/reference/yql-core/syntax/_includes/Readme.txt
@@ -1 +1 @@
-Files inside this folder represent YQL base blocks, and may NOT contain product-conditional or corporate content.
+Files inside this folder represent YQL base blocks, and may NOT contain product-conditional or corporate content.
diff --git a/ydb/docs/en/core/yql/reference/yql-core/types/_includes/datatypes_primitive_string.md b/ydb/docs/en/core/yql/reference/yql-core/types/_includes/datatypes_primitive_string.md
index 912be28dac..d99b7b3fbf 100644
--- a/ydb/docs/en/core/yql/reference/yql-core/types/_includes/datatypes_primitive_string.md
+++ b/ydb/docs/en/core/yql/reference/yql-core/types/_includes/datatypes_primitive_string.md
@@ -1,7 +1,7 @@
| Type | Description | Notes |
| ----- | ----- | ----- |
| `String` | A string that can contain any binary data |
-| `Utf8` | Text encoded in [UTF-8](https://en.wikipedia.org/wiki/UTF-8) |
+| `Utf8` | Text encoded in [UTF-8](https://en.wikipedia.org/wiki/UTF-8) |
| `Json` | [JSON](https://en.wikipedia.org/wiki/JSON) represented as text | Doesn't support matching{% if feature_map_tables %}, can't be used in the primary key{% endif %} |
| `JsonDocument` | [JSON](https://en.wikipedia.org/wiki/JSON) in an indexed binary representation | Doesn't support matching{% if feature_map_tables %}, can't be used in the primary key{% endif %} |
| `Yson` | [YSON](../../udf/list/yson.md) in a textual or binary representation. | Doesn't support matching{% if feature_map_tables %}, can't be used in the primary key{% endif %} |
diff --git a/ydb/docs/en/core/yql/reference/yql-core/types/_includes/json.md b/ydb/docs/en/core/yql/reference/yql-core/types/_includes/json.md
index e0be51a469..c449e86bb0 100644
--- a/ydb/docs/en/core/yql/reference/yql-core/types/_includes/json.md
+++ b/ydb/docs/en/core/yql/reference/yql-core/types/_includes/json.md
@@ -28,7 +28,7 @@ Unsigned integer types.
Real 4-byte number.
-* Type in JSON — `number`.
+* Type in JSON: `number`.
* Sample {{ backend_name }} value: `0.12345679`.
* Sample JSON value: `0.12345679`.
diff --git a/ydb/docs/en/core/yql/reference/yql-core/udf/list/_includes/url.md b/ydb/docs/en/core/yql/reference/yql-core/udf/list/_includes/url.md
index 5a6d674e04..4a23a73bcc 100644
--- a/ydb/docs/en/core/yql/reference/yql-core/udf/list/_includes/url.md
+++ b/ydb/docs/en/core/yql/reference/yql-core/udf/list/_includes/url.md
@@ -51,7 +51,7 @@ Encode a UTF-8 string to the urlencoded format (`Url::Encode`) and back (`Url::D
```sql
SELECT Url::Decode("http://ydb.tech/%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0");
-- "http://ydb.tech/page"
-SELECT Url::Encode("http://ydb.tech/page");
+SELECT Url::Encode("http://ydb.tech/page");
-- "http://ydb.tech/%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0"
```
@@ -126,7 +126,7 @@ Get a component of the URL.
**Examples**
```sql
-SELECT Url::GetScheme("https://ydb.tech"); -- "https://"
+SELECT Url::GetScheme("https://ydb.tech"); -- "https://"
SELECT Url::GetDomain("http://www.ydb.tech", 2); -- "ydb.tech"
```
@@ -139,7 +139,7 @@ SELECT Url::GetDomain("http://www.ydb.tech", 2); -- "ydb.tech"
Returns the passed domain without the "www." prefix (if any).
* ```Url::CutWWW2(String?) -> String?```
- Returns the passed domain without the prefixes like " www.", " www2.", " wwww777." (if any).
+ Returns the passed domain without the prefixes like "www.", "www2.", "wwww777." (if any).
* ```Url::CutQueryStringA­ndFragment(String{Flags:AutoMap}) -> String```
Returns a copy of the passed URL, stripping out all the CGI parameters and fragments ("?foo=bar" and/or "#baz").
@@ -148,7 +148,7 @@ SELECT Url::GetDomain("http://www.ydb.tech", 2); -- "ydb.tech"
```sql
SELECT Url::CutScheme("http://www.ydb.tech"); -- "www.ydb.tech"
-SELECT Url::CutWWW("www.ydb.tech"); -- "yydb.tech"
+SELECT Url::CutWWW("www.ydb.tech"); -- "ydb.tech"
```
## ...Punycode... {#punycode}
@@ -166,7 +166,7 @@ SELECT Url::CutWWW("www.ydb.tech"); -- "yydb.tech"
**Examples**
```sql
-SELECT Url::PunycodeToHostName("xn--80aniges7g.xn--j1aef"); -- "экзампл.ком"
+SELECT Url::PunycodeToHostName("xn--80aniges7g.xn--j1aef"); -- "example.com"
```
## ...Query... {#query}