Skip to content

Commit d15e94b

Browse files
nikvas0nikvas0
committed
fix
1 parent b1af6be commit d15e94b

File tree

19 files changed

+323
-132
lines changed

19 files changed

+323
-132
lines changed

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_from_table.sql-plan_/dynumber_insert_from_table.sql.plan

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,21 @@
2121
},
2222
{
2323
"name": "/local/base_dynumber_insert_from_table_sql_plan/ResultTableDyNumber",
24+
"reads": [
25+
{
26+
"lookup_by": [
27+
"Key"
28+
],
29+
"type": "Lookup"
30+
}
31+
],
2432
"writes": [
2533
{
2634
"columns": [
2735
"Key",
2836
"Value"
2937
],
30-
"type": "MultiInsert"
38+
"type": "MultiUpsert"
3139
}
3240
]
3341
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_literal.sql-plan_/dynumber_insert_literal.sql.plan

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66
"tables": [
77
{
88
"name": "/local/base_dynumber_insert_literal_sql_plan/ResultLiteralDyNumber",
9+
"reads": [
10+
{
11+
"lookup_by": [
12+
"Key"
13+
],
14+
"type": "Lookup"
15+
}
16+
],
917
"writes": [
1018
{
1119
"columns": [
1220
"Key",
1321
"Value"
1422
],
15-
"type": "MultiInsert"
23+
"type": "MultiUpsert"
1624
}
1725
]
1826
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_params.sql-plan_/dynumber_insert_params.sql.plan

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66
"tables": [
77
{
88
"name": "/local/base_dynumber_insert_params_sql_plan/ResultParamsDyNumber",
9+
"reads": [
10+
{
11+
"lookup_by": [
12+
"Key"
13+
],
14+
"type": "Lookup"
15+
}
16+
],
917
"writes": [
1018
{
1119
"columns": [
1220
"Key",
1321
"Value"
1422
],
15-
"type": "MultiInsert"
23+
"type": "MultiUpsert"
1624
}
1725
]
1826
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -519,23 +519,27 @@
519519
"PlanNodeType": "Query",
520520
"Plans": [
521521
{
522-
"Node Type": "Sink",
522+
"Node Type": "Effect",
523523
"PlanNodeId": 2,
524524
"Plans": [
525525
{
526-
"Node Type": "ConstantExpr-Sink",
526+
"CTE Name": "precompute_0_0",
527+
"Node Type": "Upsert-ConstantExpr",
527528
"Operators": [
528529
{
529-
"Inputs": [],
530-
"Iterator": "[{Key: 3,Value: \"Three\"},{Key: 4,Value: \"Four\"}]",
531-
"Name": "Iterator"
530+
"Inputs": [
531+
{
532+
"InternalOperatorId": 1
533+
}
534+
],
535+
"Name": "Upsert",
536+
"Path": "/local/base_explain_script_script/ScriptingTest",
537+
"Table": "base_explain_script_script/ScriptingTest"
532538
},
533539
{
534540
"Inputs": [],
535-
"Name": "Replace",
536-
"Path": "/local/base_explain_script_script/ScriptingTest",
537-
"SinkType": "KqpTableSink",
538-
"Table": "base_explain_script_script/ScriptingTest"
541+
"Iterator": "precompute_0_0",
542+
"Name": "Iterator"
539543
}
540544
],
541545
"PlanNodeId": 1,
@@ -559,7 +563,7 @@
559563
"Key",
560564
"Value"
561565
],
562-
"type": "MultiReplace"
566+
"type": "MultiUpsert"
563567
}
564568
]
565569
}
@@ -571,23 +575,27 @@
571575
"PlanNodeType": "Query",
572576
"Plans": [
573577
{
574-
"Node Type": "Sink",
578+
"Node Type": "Effect",
575579
"PlanNodeId": 2,
576580
"Plans": [
577581
{
578-
"Node Type": "ConstantExpr-Sink",
582+
"CTE Name": "precompute_0_0",
583+
"Node Type": "Upsert-ConstantExpr",
579584
"Operators": [
580585
{
581-
"Inputs": [],
582-
"Iterator": "[{Key: 1,Value: \"One\"},{Key: 2,Value: \"Two\"}]",
583-
"Name": "Iterator"
586+
"Inputs": [
587+
{
588+
"InternalOperatorId": 1
589+
}
590+
],
591+
"Name": "Upsert",
592+
"Path": "/local/base_explain_script_script/ScriptingTest",
593+
"Table": "base_explain_script_script/ScriptingTest"
584594
},
585595
{
586596
"Inputs": [],
587-
"Name": "Replace",
588-
"Path": "/local/base_explain_script_script/ScriptingTest",
589-
"SinkType": "KqpTableSink",
590-
"Table": "base_explain_script_script/ScriptingTest"
597+
"Iterator": "precompute_0_0",
598+
"Name": "Iterator"
591599
}
592600
],
593601
"PlanNodeId": 1,
@@ -611,7 +619,7 @@
611619
"Key",
612620
"Value"
613621
],
614-
"type": "MultiReplace"
622+
"type": "MultiUpsert"
615623
}
616624
]
617625
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -294,23 +294,27 @@
294294
"PlanNodeType": "Query",
295295
"Plans": [
296296
{
297-
"Node Type": "Sink",
297+
"Node Type": "Effect",
298298
"PlanNodeId": 2,
299299
"Plans": [
300300
{
301-
"Node Type": "ConstantExpr-Sink",
301+
"CTE Name": "precompute_0_0",
302+
"Node Type": "Upsert-ConstantExpr",
302303
"Operators": [
303304
{
304-
"Inputs": [],
305-
"Iterator": "[{Group: 1,Value: \"One\"},{Group: 3,Value: \"Three\"}]",
306-
"Name": "Iterator"
305+
"Inputs": [
306+
{
307+
"InternalOperatorId": 1
308+
}
309+
],
310+
"Name": "Upsert",
311+
"Path": "/local/base_join_group_by_lookup_script_script/Temp",
312+
"Table": "base_join_group_by_lookup_script_script/Temp"
307313
},
308314
{
309315
"Inputs": [],
310-
"Name": "Replace",
311-
"Path": "/local/base_join_group_by_lookup_script_script/Temp",
312-
"SinkType": "KqpTableSink",
313-
"Table": "base_join_group_by_lookup_script_script/Temp"
316+
"Iterator": "precompute_0_0",
317+
"Name": "Iterator"
314318
}
315319
],
316320
"PlanNodeId": 1,
@@ -334,7 +338,7 @@
334338
"Group",
335339
"Value"
336340
],
337-
"type": "MultiReplace"
341+
"type": "MultiUpsert"
338342
}
339343
]
340344
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_from_table.sql-plan_/json_insert_from_table.sql.plan

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,21 @@
2121
},
2222
{
2323
"name": "/local/base_json_insert_from_table_sql_plan/ResultTableJD",
24+
"reads": [
25+
{
26+
"lookup_by": [
27+
"Key"
28+
],
29+
"type": "Lookup"
30+
}
31+
],
2432
"writes": [
2533
{
2634
"columns": [
2735
"Key",
2836
"Value"
2937
],
30-
"type": "MultiInsert"
38+
"type": "MultiUpsert"
3139
}
3240
]
3341
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_literal.sql-plan_/json_insert_literal.sql.plan

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66
"tables": [
77
{
88
"name": "/local/base_json_insert_literal_sql_plan/ResultLiteralJD",
9+
"reads": [
10+
{
11+
"lookup_by": [
12+
"Key"
13+
],
14+
"type": "Lookup"
15+
}
16+
],
917
"writes": [
1018
{
1119
"columns": [
1220
"Key",
1321
"Value"
1422
],
15-
"type": "MultiInsert"
23+
"type": "MultiUpsert"
1624
}
1725
]
1826
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_params.sql-plan_/json_insert_params.sql.plan

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66
"tables": [
77
{
88
"name": "/local/base_json_insert_params_sql_plan/ResultParamsJD",
9+
"reads": [
10+
{
11+
"lookup_by": [
12+
"Key"
13+
],
14+
"type": "Lookup"
15+
}
16+
],
917
"writes": [
1018
{
1119
"columns": [
1220
"Key",
1321
"Value"
1422
],
15-
"type": "MultiInsert"
23+
"type": "MultiUpsert"
1624
}
1725
]
1826
}

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_ct.script-script_/simple_ct.script.plan

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,27 @@
1010
"PlanNodeType": "Query",
1111
"Plans": [
1212
{
13-
"Node Type": "Sink",
13+
"Node Type": "Effect",
1414
"PlanNodeId": 2,
1515
"Plans": [
1616
{
17-
"Node Type": "ConstantExpr-Sink",
17+
"CTE Name": "precompute_0_0",
18+
"Node Type": "Upsert-ConstantExpr",
1819
"Operators": [
1920
{
20-
"Inputs": [],
21-
"Iterator": "[{idx: 1,text: \"to do or not to do\"}]",
22-
"Name": "Iterator"
23-
},
24-
{
25-
"Inputs": [],
21+
"Inputs": [
22+
{
23+
"InternalOperatorId": 1
24+
}
25+
],
2626
"Name": "Upsert",
2727
"Path": "/local/base_simple_ct_script_script/Questions",
28-
"SinkType": "KqpTableSink",
2928
"Table": "base_simple_ct_script_script/Questions"
29+
},
30+
{
31+
"Inputs": [],
32+
"Iterator": "precompute_0_0",
33+
"Name": "Iterator"
3034
}
3135
],
3236
"PlanNodeId": 1,

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_table_types.script-script_/table_types.script.plan

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,27 @@
135135
"PlanNodeType": "Query",
136136
"Plans": [
137137
{
138-
"Node Type": "Sink",
138+
"Node Type": "Effect",
139139
"PlanNodeId": 2,
140140
"Plans": [
141141
{
142-
"Node Type": "ConstantExpr-Sink",
142+
"CTE Name": "precompute_0_0",
143+
"Node Type": "Upsert-ConstantExpr",
143144
"Operators": [
144145
{
145-
"Inputs": [],
146-
"Iterator": "[{Key: \"Key\",Value01: \"true\",Value02: 1,Value03: -1,Value04: 2,Value05: -2,Value06: 3,Value07: \"4.5\",Value08: Minus,Value09: \"3.14\",Value10: DyNumber,Value21: \"\\u041F\\u0440\\u0438\\u0432\\u0435\\u0442\",Value22: \"{\\\"name\\\": \\\"George\\\", \\\"age\\\": 23}\",Value23: JsonDocument,Value24: \"{a=1; b=2}\",Value31: Apply,Value32: Apply,Value33: Apply,Value34: Apply}]",
147-
"Name": "Iterator"
146+
"Inputs": [
147+
{
148+
"InternalOperatorId": 1
149+
}
150+
],
151+
"Name": "Upsert",
152+
"Path": "/local/base_table_types_script_script/TableTypes",
153+
"Table": "base_table_types_script_script/TableTypes"
148154
},
149155
{
150156
"Inputs": [],
151-
"Name": "Replace",
152-
"Path": "/local/base_table_types_script_script/TableTypes",
153-
"SinkType": "KqpTableSink",
154-
"Table": "base_table_types_script_script/TableTypes"
157+
"Iterator": "precompute_0_0",
158+
"Name": "Iterator"
155159
}
156160
],
157161
"PlanNodeId": 1,
@@ -192,7 +196,7 @@
192196
"Value33",
193197
"Value34"
194198
],
195-
"type": "MultiReplace"
199+
"type": "MultiUpsert"
196200
}
197201
]
198202
}

0 commit comments

Comments
 (0)