From 3206c9f890e0cb91334272a4d2582d3fba426f00 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Wed, 19 Mar 2025 14:50:24 +0000 Subject: [PATCH 1/6] first draft --- .../federated_query/s3/_includes/format_settings.md | 9 +++++++++ .../concepts/federated_query/s3/external_data_source.md | 6 ++++++ .../core/concepts/federated_query/s3/external_table.md | 2 ++ .../federated_query/s3/_includes/format_settings.md | 9 +++++++++ .../concepts/federated_query/s3/external_data_source.md | 6 ++++++ .../core/concepts/federated_query/s3/external_table.md | 1 + 6 files changed, 33 insertions(+) create mode 100644 ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md create mode 100644 ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md new file mode 100644 index 000000000000..020da3bb85d4 --- /dev/null +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md @@ -0,0 +1,9 @@ +|Setting name|Description|Possible values| +|`file_pattern`|File name template|File name template string. Wildcards `*` are supported.| +|`data.interval.unit`|Unit for parsing `Interval` type|MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, WEEKS| +|`data.datetime.format_name`|The format in which `Datetime` data is stored|POSIX, ISO| +|`data.datetime.format`|The format in which `Datetime` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M`| +|`date.timestamp.format_name`|The format in which `Timestamp` data is stored|POSIX, ISO, UNIX_TIME_MILLISECONDS, UNIX_TIME_SECONDS, UNIX_TIME_MICROSECONDS| +|`data.timestamp.format`|The format in which `Timestamp` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M-%S`| +|`data.date.format`|The format in which `Date` data is stored|Formatting string, for example: `%Y-%m-%d`| +|`csv_delimiter`|Delimeter for `csv_with_names` format|Any character| \ No newline at end of file diff --git a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md index 2fb2fa26794c..9b5ff472846f 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md @@ -143,6 +143,12 @@ In {{ ydb-full-name }}, the following data paths are supported: {% include [!](_includes/path_format.md) %} +### Format settings {#format_settings} + +In {{ ydb-full-name }}, the following format settings are supported: + +{% include [!](_includes/format_settings.md) %} + ## Example {#read_example} Example query to read data from S3 ({{ objstorage-full-name }}): diff --git a/ydb/docs/en/core/concepts/federated_query/s3/external_table.md b/ydb/docs/en/core/concepts/federated_query/s3/external_table.md index f8456f2ef5d1..b3787c3500a3 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/external_table.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/external_table.md @@ -37,6 +37,8 @@ Where: - `csv_with_names` - one of the [permitted data storage formats](formats.md); - `gzip` - one of the [permitted compression algorithms](formats.md#compression). +You can also specify [format settings](external_data_source.md#format_settings). + ## Data model {#data-model} Reading data using external tables from S3 ({{ objstorage-name }}) is done with regular SQL queries as if querying a normal table. diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md new file mode 100644 index 000000000000..d6520ac6a3cd --- /dev/null +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md @@ -0,0 +1,9 @@ +|Имя параметра|Описание|Принимаемые значения| +|`file_pattern`|Шаблон имени файла|Строка шаблона имени. Поддерживаются wildcards `*`.| +|`data.interval.unit`|Единица измерения для парсинга типа `Interval`|MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, WEEKS| +|`data.datetime.format_name`|Формат, в котором записаны данные типа `Datetime`|POSIX, ISO| +|`data.datetime.format`|Формат, в котором записаны данные типа `Datetime`|Строка форматирования, например: `%Y-%m-%dT%H-%M`| +|`data.timestamp.format_name`|Формат, в котором записаны данные типа `Timestamp`|POSIX, ISO, UNIX_TIME_MILLISECONDS, UNIX_TIME_SECONDS, UNIX_TIME_MICROSECONDS| +|`data.timestamp.format`|Формат, в котором записаны данные типа `Timestamp`|Строка форматирования, например: `%Y-%m-%dT%H-%M-%S`| +|`data.date.format`|Формат, в котором записаны данные типа `Date`|Строка форматирования, например: `%Y-%m-%d`| +|`csv_delimiter`|Разделитель данных в формате `csv_with_names`|Любой символ| \ No newline at end of file diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md index 5645f21bb45d..650e851925b2 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md @@ -143,6 +143,12 @@ WHERE {% include [!](_includes/path_format.md) %} +### Параметры форматирования {#format_settings} + +В {{ ydb-full-name }} поддерживаются следующие параметры форматирования: + +{% include [!](_includes/format_settings.md) %} + ## Пример {#read_example} Пример запроса для чтения данных из S3 ({{ objstorage-full-name }}): diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md b/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md index c55250c4b06b..6d10592fbacf 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md @@ -37,6 +37,7 @@ CREATE EXTERNAL TABLE `s3_test_data` ( - `csv_with_names` - один из [допустимых типов хранения данных](formats.md); - `gzip` - один из [допустимых алгоритмов сжатия](formats.md#compression). +Так же при создании внешних таблиц поддерживаются [параметры форматирования](external_data_source.md#format_settings). ## Модель данных {#data-model} From fece1db7a4656180a517075ab25d36329e77bdc3 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Wed, 19 Mar 2025 15:03:16 +0000 Subject: [PATCH 2/6] type fix --- .../concepts/federated_query/s3/_includes/format_settings.md | 3 ++- .../concepts/federated_query/s3/_includes/format_settings.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md index 020da3bb85d4..90ead5c931dc 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md @@ -1,4 +1,5 @@ |Setting name|Description|Possible values| +|----|----|---| |`file_pattern`|File name template|File name template string. Wildcards `*` are supported.| |`data.interval.unit`|Unit for parsing `Interval` type|MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, WEEKS| |`data.datetime.format_name`|The format in which `Datetime` data is stored|POSIX, ISO| @@ -6,4 +7,4 @@ |`date.timestamp.format_name`|The format in which `Timestamp` data is stored|POSIX, ISO, UNIX_TIME_MILLISECONDS, UNIX_TIME_SECONDS, UNIX_TIME_MICROSECONDS| |`data.timestamp.format`|The format in which `Timestamp` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|The format in which `Date` data is stored|Formatting string, for example: `%Y-%m-%d`| -|`csv_delimiter`|Delimeter for `csv_with_names` format|Any character| \ No newline at end of file +|`csv_delimiter`|Delimeter for `csv_with_names` format|Any character| diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md index d6520ac6a3cd..89bd2a35968f 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md @@ -1,4 +1,5 @@ |Имя параметра|Описание|Принимаемые значения| +|----|----|---| |`file_pattern`|Шаблон имени файла|Строка шаблона имени. Поддерживаются wildcards `*`.| |`data.interval.unit`|Единица измерения для парсинга типа `Interval`|MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, WEEKS| |`data.datetime.format_name`|Формат, в котором записаны данные типа `Datetime`|POSIX, ISO| @@ -6,4 +7,4 @@ |`data.timestamp.format_name`|Формат, в котором записаны данные типа `Timestamp`|POSIX, ISO, UNIX_TIME_MILLISECONDS, UNIX_TIME_SECONDS, UNIX_TIME_MICROSECONDS| |`data.timestamp.format`|Формат, в котором записаны данные типа `Timestamp`|Строка форматирования, например: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|Формат, в котором записаны данные типа `Date`|Строка форматирования, например: `%Y-%m-%d`| -|`csv_delimiter`|Разделитель данных в формате `csv_with_names`|Любой символ| \ No newline at end of file +|`csv_delimiter`|Разделитель данных в формате `csv_with_names`|Любой символ| From 11ef9c4622cc453ecf7696d4621c37236df80f53 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Thu, 20 Mar 2025 10:23:57 +0000 Subject: [PATCH 3/6] fixed issues --- .../federated_query/s3/_includes/date_formats.md | 7 +++++++ .../federated_query/s3/_includes/format_settings.md | 10 +++++----- .../federated_query/s3/external_data_source.md | 4 ++++ .../federated_query/s3/_includes/date_formats.md | 7 +++++++ .../federated_query/s3/_includes/format_settings.md | 10 +++++----- .../federated_query/s3/external_data_source.md | 4 ++++ .../core/concepts/federated_query/s3/external_table.md | 2 +- 7 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md create mode 100644 ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md new file mode 100644 index 000000000000..66a43131f2a6 --- /dev/null +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md @@ -0,0 +1,7 @@ +|Name|Description|Example| +|---|---|---| +|`POSIX`|String in `%Y-%m-%d %H:%M:%S` format|2025-03-26 16:10:00| +|`ISO`|Format, corresponding to the Iso8601 standart|2025-03-26 16:10:00Z| +|`UNIX_TIME_SECONDS`|Number of seconds that have elapsed since the start of the epoch|1742994600| +|`UNIX_TIME_MILLISECONDS`|Number of milliseconds that have elapsed since the start of the epoch|1742994600000| +|`UNIX_TIME_MICROSECONDS`|Number of microseconds that have elapsed since the start of the epoch|1742994600000000| \ No newline at end of file diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md index 90ead5c931dc..aa2ce995b840 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md @@ -1,10 +1,10 @@ |Setting name|Description|Possible values| |----|----|---| |`file_pattern`|File name template|File name template string. Wildcards `*` are supported.| -|`data.interval.unit`|Unit for parsing `Interval` type|MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, WEEKS| -|`data.datetime.format_name`|The format in which `Datetime` data is stored|POSIX, ISO| -|`data.datetime.format`|The format in which `Datetime` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M`| -|`date.timestamp.format_name`|The format in which `Timestamp` data is stored|POSIX, ISO, UNIX_TIME_MILLISECONDS, UNIX_TIME_SECONDS, UNIX_TIME_MICROSECONDS| -|`data.timestamp.format`|The format in which `Timestamp` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M-%S`| +|`data.interval.unit`|Unit for parsing `Interval` type|`MICROSECONDS`, `MILLISECONDS`, `SECONDS`, `MINUTES`, `HOURS`, `DAYS`, `WEEKS`| +|`data.datetime.format_name`|Predefined format in which `Datetime` data is stored|`POSIX`, `ISO`| +|`data.datetime.format`|Strftime-like template which defines how `Datetime` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M`| +|`date.timestamp.format_name`|Predefined format in which `Timestamp` data is stored|`POSIX`, `ISO`, `UNIX_TIME_MILLISECONDS`, `UNIX_TIME_SECONDS`, `UNIX_TIME_MICROSECONDS`| +|`data.timestamp.format`|Strftime-like template which defines how `Timestamp` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|The format in which `Date` data is stored|Formatting string, for example: `%Y-%m-%d`| |`csv_delimiter`|Delimeter for `csv_with_names` format|Any character| diff --git a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md index 9b5ff472846f..f2f4d69f5c33 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md @@ -149,6 +149,10 @@ In {{ ydb-full-name }}, the following format settings are supported: {% include [!](_includes/format_settings.md) %} +Any conversion specifiers supported by `strftime`(C99) function can be used in formatting strings. In {{ ydb-full-name }}, the following `Datetime` and `Timestamp` formats are supported: + +{% include [!](_includes/date_formats.md) %} + ## Example {#read_example} Example query to read data from S3 ({{ objstorage-full-name }}): diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md new file mode 100644 index 000000000000..4eca14834f31 --- /dev/null +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md @@ -0,0 +1,7 @@ +|Имя|Описание|Пример| +|---|---|---| +|`POSIX`|Строка формата `%Y-%m-%d %H:%M:%S`|2025-03-26 16:10:00| +|`ISO`|Формат, соответствующий стандарту Iso8601|2025-03-26 16:10:00Z| +|`UNIX_TIME_SECONDS`|Количество секунд с начала эпохи|1742994600| +|`UNIX_TIME_MILLISECONDS`|Количество миллисекунд с начала эпохи|1742994600000| +|`UNIX_TIME_MICROSECONDS`|Количество микросекунд с начала эпохи|1742994600000000| \ No newline at end of file diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md index 89bd2a35968f..3f446d43e10c 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md @@ -1,10 +1,10 @@ |Имя параметра|Описание|Принимаемые значения| |----|----|---| |`file_pattern`|Шаблон имени файла|Строка шаблона имени. Поддерживаются wildcards `*`.| -|`data.interval.unit`|Единица измерения для парсинга типа `Interval`|MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, WEEKS| -|`data.datetime.format_name`|Формат, в котором записаны данные типа `Datetime`|POSIX, ISO| -|`data.datetime.format`|Формат, в котором записаны данные типа `Datetime`|Строка форматирования, например: `%Y-%m-%dT%H-%M`| -|`data.timestamp.format_name`|Формат, в котором записаны данные типа `Timestamp`|POSIX, ISO, UNIX_TIME_MILLISECONDS, UNIX_TIME_SECONDS, UNIX_TIME_MICROSECONDS| -|`data.timestamp.format`|Формат, в котором записаны данные типа `Timestamp`|Строка форматирования, например: `%Y-%m-%dT%H-%M-%S`| +|`data.interval.unit`|Единица измерения для парсинга типа `Interval`|`MICROSECONDS`, `MILLISECONDS`, `SECONDS`, `MINUTES`, `HOURS`, `DAYS`, `WEEKS`| +|`data.datetime.format_name`|Предопределенный формат, в котором записаны данные типа `Datetime`|`POSIX`, `ISO`| +|`data.datetime.format`|Шаблон, определяющий как записаны данные типа `Datetime`|Строка форматирования, например: `%Y-%m-%dT%H-%M`| +|`data.timestamp.format_name`|Предопределенный формат, в котором записаны данные типа `Timestamp`|`POSIX`, `ISO`, `UNIX_TIME_SECONDS`, `UNIX_TIME_MILLISECONDS`, `UNIX_TIME_MICROSECONDS`| +|`data.timestamp.format`|Шаблон, определяющий как записаны данные типа `Timestamp`|Строка форматирования, например: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|Формат, в котором записаны данные типа `Date`|Строка форматирования, например: `%Y-%m-%d`| |`csv_delimiter`|Разделитель данных в формате `csv_with_names`|Любой символ| diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md index 650e851925b2..0befed810d3f 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md @@ -149,6 +149,10 @@ WHERE {% include [!](_includes/format_settings.md) %} +В строках форматирования можно использовать любые шаблонные переменные, поддерживаемые функцией `strftime`(C99). В {{ ydb-full-name }} поддерживаются следующие форматы типов `Datetime` и `Timestamp`: + +{% include [!](_includes/date_formats.md) %} + ## Пример {#read_example} Пример запроса для чтения данных из S3 ({{ objstorage-full-name }}): diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md b/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md index 6d10592fbacf..bde27c24c296 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/external_table.md @@ -37,7 +37,7 @@ CREATE EXTERNAL TABLE `s3_test_data` ( - `csv_with_names` - один из [допустимых типов хранения данных](formats.md); - `gzip` - один из [допустимых алгоритмов сжатия](formats.md#compression). -Так же при создании внешних таблиц поддерживаются [параметры форматирования](external_data_source.md#format_settings). +Также при создании внешних таблиц поддерживаются [параметры форматирования](external_data_source.md#format_settings). ## Модель данных {#data-model} From 9b8514418b3a63f3afc74dc306860757a9d84fa1 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Thu, 20 Mar 2025 10:29:23 +0000 Subject: [PATCH 4/6] style fixes --- .../federated_query/s3/_includes/date_formats.md | 10 +++++----- .../federated_query/s3/_includes/format_settings.md | 2 +- .../federated_query/s3/_includes/date_formats.md | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md index 66a43131f2a6..7dff396edb83 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md @@ -1,7 +1,7 @@ |Name|Description|Example| |---|---|---| -|`POSIX`|String in `%Y-%m-%d %H:%M:%S` format|2025-03-26 16:10:00| -|`ISO`|Format, corresponding to the Iso8601 standart|2025-03-26 16:10:00Z| -|`UNIX_TIME_SECONDS`|Number of seconds that have elapsed since the start of the epoch|1742994600| -|`UNIX_TIME_MILLISECONDS`|Number of milliseconds that have elapsed since the start of the epoch|1742994600000| -|`UNIX_TIME_MICROSECONDS`|Number of microseconds that have elapsed since the start of the epoch|1742994600000000| \ No newline at end of file +|`POSIX`|String in `%Y-%m-%d %H:%M:%S` format|2001-03-26 16:10:00| +|`ISO`|Format, corresponding to the Iso8601 standart|2001-03-26 16:10:00Z| +|`UNIX_TIME_SECONDS`|Number of seconds that have elapsed since the start of the epoch|985623000| +|`UNIX_TIME_MILLISECONDS`|Number of milliseconds that have elapsed since the start of the epoch|985623000000| +|`UNIX_TIME_MICROSECONDS`|Number of microseconds that have elapsed since the start of the epoch|985623000000000| \ No newline at end of file diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md index aa2ce995b840..b3a2a4f683b7 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md @@ -4,7 +4,7 @@ |`data.interval.unit`|Unit for parsing `Interval` type|`MICROSECONDS`, `MILLISECONDS`, `SECONDS`, `MINUTES`, `HOURS`, `DAYS`, `WEEKS`| |`data.datetime.format_name`|Predefined format in which `Datetime` data is stored|`POSIX`, `ISO`| |`data.datetime.format`|Strftime-like template which defines how `Datetime` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M`| -|`date.timestamp.format_name`|Predefined format in which `Timestamp` data is stored|`POSIX`, `ISO`, `UNIX_TIME_MILLISECONDS`, `UNIX_TIME_SECONDS`, `UNIX_TIME_MICROSECONDS`| +|`date.timestamp.format_name`|Predefined format in which `Timestamp` data is stored|`POSIX`, `ISO`, `UNIX_TIME_SECONDS`, `UNIX_TIME_MILLISECONDS`, `UNIX_TIME_MICROSECONDS`| |`data.timestamp.format`|Strftime-like template which defines how `Timestamp` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|The format in which `Date` data is stored|Formatting string, for example: `%Y-%m-%d`| |`csv_delimiter`|Delimeter for `csv_with_names` format|Any character| diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md index 4eca14834f31..279c315fd932 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md @@ -1,7 +1,7 @@ |Имя|Описание|Пример| |---|---|---| -|`POSIX`|Строка формата `%Y-%m-%d %H:%M:%S`|2025-03-26 16:10:00| -|`ISO`|Формат, соответствующий стандарту Iso8601|2025-03-26 16:10:00Z| -|`UNIX_TIME_SECONDS`|Количество секунд с начала эпохи|1742994600| -|`UNIX_TIME_MILLISECONDS`|Количество миллисекунд с начала эпохи|1742994600000| -|`UNIX_TIME_MICROSECONDS`|Количество микросекунд с начала эпохи|1742994600000000| \ No newline at end of file +|`POSIX`|Строка формата `%Y-%m-%d %H:%M:%S`|2001-03-26 16:10:00| +|`ISO`|Формат, соответствующий стандарту Iso8601|2001-03-26 16:10:00Z| +|`UNIX_TIME_SECONDS`|Количество секунд с начала эпохи|985623000| +|`UNIX_TIME_MILLISECONDS`|Количество миллисекунд с начала эпохи|985623000000| +|`UNIX_TIME_MICROSECONDS`|Количество микросекунд с начала эпохи|985623000000000| \ No newline at end of file From eca0f3cede70e3c22478593338d06cd4633a284f Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Tue, 25 Mar 2025 13:28:37 +0000 Subject: [PATCH 5/6] fixed issues --- .../concepts/federated_query/s3/_includes/date_formats.md | 8 ++++---- .../federated_query/s3/_includes/format_settings.md | 2 +- .../concepts/federated_query/s3/external_data_source.md | 2 +- .../concepts/federated_query/s3/_includes/date_formats.md | 8 ++++---- .../federated_query/s3/_includes/format_settings.md | 2 +- .../concepts/federated_query/s3/external_data_source.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md index 7dff396edb83..a92a9db61ee8 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md @@ -1,7 +1,7 @@ |Name|Description|Example| |---|---|---| |`POSIX`|String in `%Y-%m-%d %H:%M:%S` format|2001-03-26 16:10:00| -|`ISO`|Format, corresponding to the Iso8601 standart|2001-03-26 16:10:00Z| -|`UNIX_TIME_SECONDS`|Number of seconds that have elapsed since the start of the epoch|985623000| -|`UNIX_TIME_MILLISECONDS`|Number of milliseconds that have elapsed since the start of the epoch|985623000000| -|`UNIX_TIME_MICROSECONDS`|Number of microseconds that have elapsed since the start of the epoch|985623000000000| \ No newline at end of file +|`ISO`|Format, corresponding to the [ISO 8601](https://ru.wikipedia.org/wiki/ISO_8601) standart|2001-03-26 16:10:00Z| +|`UNIX_TIME_SECONDS`|Number of seconds that have elapsed since the 1st of january 1970 (00:00:00 UTC)|985623000| +|`UNIX_TIME_MILLISECONDS`|Number of milliseconds that have elapsed since the 1st of january 1970 (00:00:00 UTC)|985623000000| +|`UNIX_TIME_MICROSECONDS`|Number of microseconds that have elapsed since the 1st of january 1970 (00:00:00 UTC)|985623000000000| \ No newline at end of file diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md index b3a2a4f683b7..60f2fd1ac1a1 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/format_settings.md @@ -7,4 +7,4 @@ |`date.timestamp.format_name`|Predefined format in which `Timestamp` data is stored|`POSIX`, `ISO`, `UNIX_TIME_SECONDS`, `UNIX_TIME_MILLISECONDS`, `UNIX_TIME_MICROSECONDS`| |`data.timestamp.format`|Strftime-like template which defines how `Timestamp` data is stored|Formatting string, for example: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|The format in which `Date` data is stored|Formatting string, for example: `%Y-%m-%d`| -|`csv_delimiter`|Delimeter for `csv_with_names` format|Any character| +|`csv_delimiter`|Delimeter for `csv_with_names` format|Any character (UTF-8)| diff --git a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md index f2f4d69f5c33..1bcba8f53a3d 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md @@ -149,7 +149,7 @@ In {{ ydb-full-name }}, the following format settings are supported: {% include [!](_includes/format_settings.md) %} -Any conversion specifiers supported by `strftime`(C99) function can be used in formatting strings. In {{ ydb-full-name }}, the following `Datetime` and `Timestamp` formats are supported: +Any conversion specifiers supported by [`strftime`(C99)](https://en.cppreference.com/w/c/chrono/strftime) function can be used in formatting strings. In {{ ydb-full-name }}, the following `Datetime` and `Timestamp` formats are supported: {% include [!](_includes/date_formats.md) %} diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md index 279c315fd932..8c80a207c09e 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/date_formats.md @@ -1,7 +1,7 @@ |Имя|Описание|Пример| |---|---|---| |`POSIX`|Строка формата `%Y-%m-%d %H:%M:%S`|2001-03-26 16:10:00| -|`ISO`|Формат, соответствующий стандарту Iso8601|2001-03-26 16:10:00Z| -|`UNIX_TIME_SECONDS`|Количество секунд с начала эпохи|985623000| -|`UNIX_TIME_MILLISECONDS`|Количество миллисекунд с начала эпохи|985623000000| -|`UNIX_TIME_MICROSECONDS`|Количество микросекунд с начала эпохи|985623000000000| \ No newline at end of file +|`ISO`|Формат, соответствующий стандарту [ISO 8601](https://ru.wikipedia.org/wiki/ISO_8601)|2001-03-26 16:10:00Z| +|`UNIX_TIME_SECONDS`|Количество секунд с 1 января 1970 года (00:00:00 UTC)|985623000| +|`UNIX_TIME_MILLISECONDS`|Количество миллисекунд с 1 января 1970 года (00:00:00 UTC)|985623000000| +|`UNIX_TIME_MICROSECONDS`|Количество микросекунд с 1 января 1970 года (00:00:00 UTC)|985623000000000| \ No newline at end of file diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md index 3f446d43e10c..0297de1fa73d 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/_includes/format_settings.md @@ -7,4 +7,4 @@ |`data.timestamp.format_name`|Предопределенный формат, в котором записаны данные типа `Timestamp`|`POSIX`, `ISO`, `UNIX_TIME_SECONDS`, `UNIX_TIME_MILLISECONDS`, `UNIX_TIME_MICROSECONDS`| |`data.timestamp.format`|Шаблон, определяющий как записаны данные типа `Timestamp`|Строка форматирования, например: `%Y-%m-%dT%H-%M-%S`| |`data.date.format`|Формат, в котором записаны данные типа `Date`|Строка форматирования, например: `%Y-%m-%d`| -|`csv_delimiter`|Разделитель данных в формате `csv_with_names`|Любой символ| +|`csv_delimiter`|Разделитель данных в формате `csv_with_names`|Любой символ (UTF-8)| diff --git a/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md index 0befed810d3f..2a78afd67047 100644 --- a/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md +++ b/ydb/docs/ru/core/concepts/federated_query/s3/external_data_source.md @@ -149,7 +149,7 @@ WHERE {% include [!](_includes/format_settings.md) %} -В строках форматирования можно использовать любые шаблонные переменные, поддерживаемые функцией `strftime`(C99). В {{ ydb-full-name }} поддерживаются следующие форматы типов `Datetime` и `Timestamp`: +В строках форматирования можно использовать любые шаблонные переменные, поддерживаемые функцией [`strftime`(C99)](https://en.cppreference.com/w/c/chrono/strftime). В {{ ydb-full-name }} поддерживаются следующие форматы типов `Datetime` и `Timestamp`: {% include [!](_includes/date_formats.md) %} From 043d84e41202fc71938784d88247c24d2bc45181 Mon Sep 17 00:00:00 2001 From: evanevanevanevannnn Date: Tue, 25 Mar 2025 13:30:01 +0000 Subject: [PATCH 6/6] fixed issues 2 --- .../core/concepts/federated_query/s3/_includes/date_formats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md index a92a9db61ee8..845e7f40685d 100644 --- a/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md +++ b/ydb/docs/en/core/concepts/federated_query/s3/_includes/date_formats.md @@ -1,7 +1,7 @@ |Name|Description|Example| |---|---|---| |`POSIX`|String in `%Y-%m-%d %H:%M:%S` format|2001-03-26 16:10:00| -|`ISO`|Format, corresponding to the [ISO 8601](https://ru.wikipedia.org/wiki/ISO_8601) standart|2001-03-26 16:10:00Z| +|`ISO`|Format, corresponding to the [ISO 8601](https://ru.wikipedia.org/wiki/ISO_8601) standard|2001-03-26 16:10:00Z| |`UNIX_TIME_SECONDS`|Number of seconds that have elapsed since the 1st of january 1970 (00:00:00 UTC)|985623000| |`UNIX_TIME_MILLISECONDS`|Number of milliseconds that have elapsed since the 1st of january 1970 (00:00:00 UTC)|985623000000| |`UNIX_TIME_MICROSECONDS`|Number of microseconds that have elapsed since the 1st of january 1970 (00:00:00 UTC)|985623000000000| \ No newline at end of file