aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2025-04-24 13:01:50 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2025-04-24 13:12:15 +0300
commitcc1add0c1ca513213dc8ecaaed41a3f328c353ef (patch)
treea23a5945dbd4d82ec421e67d4733f6717e16cf0a
parentff506a248dded6b0309406ff3892cd07e80e51c6 (diff)
downloadydb-cc1add0c1ca513213dc8ecaaed41a3f328c353ef.tar.gz
Intermediate changes
commit_hash:dc3193604b8e3f1c1a2e012318f542b2497d7638
-rw-r--r--yql/essentials/docs/en/syntax/insert_into.md17
-rw-r--r--yql/essentials/docs/ru/syntax/insert_into.md22
-rw-r--r--yql/essentials/minikql/benchmark/pack_num/metrics/ya.make1
-rw-r--r--yql/essentials/minikql/benchmark/pack_num/ya.make1
-rw-r--r--yql/essentials/parser/pg_wrapper/test/ya.make1
-rw-r--r--yql/essentials/tests/s-expressions/minirun/pure.make1
-rw-r--r--yql/essentials/tests/sql/minirun/pure.make1
-rw-r--r--yql/essentials/tests/sql/sql2yql/ya.make1
-rw-r--r--yql/essentials/types/binary_json/ut_benchmark/ya.make1
9 files changed, 24 insertions, 22 deletions
diff --git a/yql/essentials/docs/en/syntax/insert_into.md b/yql/essentials/docs/en/syntax/insert_into.md
index 36b1287cdd7..c99f77e6795 100644
--- a/yql/essentials/docs/en/syntax/insert_into.md
+++ b/yql/essentials/docs/en/syntax/insert_into.md
@@ -9,13 +9,13 @@ The table is searched by name in the database specified by the [USE](use.md) ope
* Adding constant values using [`VALUES`](values.md).
```yql
- INSERT INTO my_table (Key1, Key2, Value1, Value2)
+ INSERT INTO my_table (Column1, Column2, Column3, Column4)
VALUES (345987,'ydb', 'Pied piper', 1414);
COMMIT;
```
```yql
- INSERT INTO my_table (key, value)
+ INSERT INTO my_table (Column1, Column2)
VALUES ("foo", 1), ("bar", 2);
```
@@ -23,11 +23,16 @@ The table is searched by name in the database specified by the [USE](use.md) ope
```yql
INSERT INTO my_table
- SELECT Key AS Key1, "Empty" AS Key2, Value AS Value1
- FROM my_table1;
+ SELECT SourceTableColumn1 AS MyTableColumn1, "Empty" AS MyTableColumn2, SourceTableColumn2 AS MyTableColumn3
+ FROM source_table;
```
+## Using modifiers
+
Inserts can be made with one or more modifiers. A modifier is specified after the `WITH` keyword following the table name: `INSERT INTO ... WITH SOME_HINT`.
-If a modifier has a value, it's indicated after the `=` sign: `INSERT INTO ... WITH SOME_HINT=value`.
-If necessary, specify multiple modifiers, they should be enclosed in parentheses: `INSERT INTO ... WITH (SOME_HINT1=value, SOME_HINT2, SOME_HINT3=value)`.
+
+The following rules apply when working with modifiers:
+
+- If a modifier has a value, it's indicated after the `=` sign: `INSERT INTO ... WITH SOME_HINT=value`.
+- If necessary, specify multiple modifiers, they should be enclosed in parentheses: `INSERT INTO ... WITH (SOME_HINT1=value, SOME_HINT2, SOME_HINT3=value)`.
diff --git a/yql/essentials/docs/ru/syntax/insert_into.md b/yql/essentials/docs/ru/syntax/insert_into.md
index 717bc051f98..d9dbc479c06 100644
--- a/yql/essentials/docs/ru/syntax/insert_into.md
+++ b/yql/essentials/docs/ru/syntax/insert_into.md
@@ -3,31 +3,35 @@
Добавляет строки в таблицу.
-Таблица по имени ищется в базе данных, заданной оператором [USE](use.md).
+Таблица ищется по имени в базе данных, заданной оператором [USE](use.md).
`INSERT INTO` позволяет выполнять следующие операции:
-* Добавление константных значений с помощью [`VALUES`](values.md).
+* Добавлять константные значения с помощью [`VALUES`](values.md).
```yql
- INSERT INTO my_table (Key1, Key2, Value1, Value2)
+ INSERT INTO my_table (Column1, Column2, Column3, Column4)
VALUES (345987,'ydb', 'Яблочный край', 1414);
COMMIT;
```
```yql
- INSERT INTO my_table (key, value)
+ INSERT INTO my_table (Column1, Column2)
VALUES ("foo", 1), ("bar", 2);
```
-* Сохранение результата выборки `SELECT`.
+* Сохранять результаты выборки `SELECT`.
```yql
INSERT INTO my_table
- SELECT Key AS Key1, "Empty" AS Key2, Value AS Value1
- FROM my_table1;
+ SELECT SourceTableColumn1 AS MyTableColumn1, "Empty" AS MyTableColumn2, SourceTableColumn2 AS MyTableColumn3
+ FROM source_table;
```
+## Использование модификаторов
+
Запись может выполняться с одним или несколькими модификаторами. Модификатор указывается после ключевого слова `WITH` после имени таблицы: `INSERT INTO ... WITH SOME_HINT`.
-Если у модификатора есть значение, то оно указывается после знака `=`: `INSERT INTO ... WITH SOME_HINT=value`.
-Если необходимо указать несколько модификаторов, то они заключаются в круглые скобки: `INSERT INTO ... WITH (SOME_HINT1=value, SOME_HINT2, SOME_HINT3=value)`.
+
+Действуют следующие правила:
+- Если у модификатора есть значение, то оно указывается после знака `=`: `INSERT INTO ... WITH SOME_HINT=value`.
+- Если необходимо указать несколько модификаторов, то они заключаются в круглые скобки: `INSERT INTO ... WITH (SOME_HINT1=value, SOME_HINT2, SOME_HINT3=value)`.
diff --git a/yql/essentials/minikql/benchmark/pack_num/metrics/ya.make b/yql/essentials/minikql/benchmark/pack_num/metrics/ya.make
index 2573d870dd0..6b0630785c3 100644
--- a/yql/essentials/minikql/benchmark/pack_num/metrics/ya.make
+++ b/yql/essentials/minikql/benchmark/pack_num/metrics/ya.make
@@ -16,6 +16,5 @@ DEPENDS(
yql/essentials/minikql/benchmark/pack_num
)
-INCLUDE(${ARCADIA_ROOT}/devtools/large_on_multi_slots.inc)
END()
diff --git a/yql/essentials/minikql/benchmark/pack_num/ya.make b/yql/essentials/minikql/benchmark/pack_num/ya.make
index 32397ee8e13..d0247fd9db9 100644
--- a/yql/essentials/minikql/benchmark/pack_num/ya.make
+++ b/yql/essentials/minikql/benchmark/pack_num/ya.make
@@ -16,6 +16,5 @@ SRCS(
pack_num_bench.cpp
)
-INCLUDE(${ARCADIA_ROOT}/devtools/large_on_multi_slots.inc)
END()
diff --git a/yql/essentials/parser/pg_wrapper/test/ya.make b/yql/essentials/parser/pg_wrapper/test/ya.make
index 22ee755f7c3..01a9249fd90 100644
--- a/yql/essentials/parser/pg_wrapper/test/ya.make
+++ b/yql/essentials/parser/pg_wrapper/test/ya.make
@@ -10,7 +10,6 @@ IF (SANITIZER_TYPE OR WITH_VALGRIND)
TIMEOUT(1800)
SIZE(LARGE)
TAG(ya:fat sb:ttl=2)
- INCLUDE(${ARCADIA_ROOT}/devtools/large_on_multi_slots.inc)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
diff --git a/yql/essentials/tests/s-expressions/minirun/pure.make b/yql/essentials/tests/s-expressions/minirun/pure.make
index 64002f529d1..591583714cb 100644
--- a/yql/essentials/tests/s-expressions/minirun/pure.make
+++ b/yql/essentials/tests/s-expressions/minirun/pure.make
@@ -16,7 +16,6 @@ IF (SANITIZER_TYPE OR WITH_VALGRIND)
TAG(
ya:fat
sb:ttl=2
- ya:large_tests_on_multi_slots
)
ELSE()
TIMEOUT(600)
diff --git a/yql/essentials/tests/sql/minirun/pure.make b/yql/essentials/tests/sql/minirun/pure.make
index 9045ab914a8..e76272da52d 100644
--- a/yql/essentials/tests/sql/minirun/pure.make
+++ b/yql/essentials/tests/sql/minirun/pure.make
@@ -14,7 +14,6 @@ IF (SANITIZER_TYPE OR WITH_VALGRIND)
TIMEOUT(1800)
SIZE(LARGE)
TAG(ya:fat sb:ttl=2)
- INCLUDE(${ARCADIA_ROOT}/devtools/large_on_multi_slots.inc)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
diff --git a/yql/essentials/tests/sql/sql2yql/ya.make b/yql/essentials/tests/sql/sql2yql/ya.make
index fd234dd8219..cff97cecd9e 100644
--- a/yql/essentials/tests/sql/sql2yql/ya.make
+++ b/yql/essentials/tests/sql/sql2yql/ya.make
@@ -15,7 +15,6 @@ IF (SANITIZER_TYPE)
TIMEOUT(1800)
SIZE(LARGE)
TAG(ya:fat sb:ttl=2)
- INCLUDE(${ARCADIA_ROOT}/devtools/large_on_multi_slots.inc)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
diff --git a/yql/essentials/types/binary_json/ut_benchmark/ya.make b/yql/essentials/types/binary_json/ut_benchmark/ya.make
index 01e22c5ac05..b4b94af4ecd 100644
--- a/yql/essentials/types/binary_json/ut_benchmark/ya.make
+++ b/yql/essentials/types/binary_json/ut_benchmark/ya.make
@@ -27,6 +27,5 @@ PEERDIR(
YQL_LAST_ABI_VERSION()
-INCLUDE(${ARCADIA_ROOT}/devtools/large_on_multi_slots.inc)
END()