Skip to content

Commit d924b68

Browse files
authored
chore: rollback partial tests (#15015)
rollback partial tests
1 parent 623b536 commit d924b68

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

tests/sqllogictests/suites/mode/standalone/explain/09_0039_target_build_merge_into_standalone.test

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,17 @@ insert into source_optimization values(5,'b5','c5'),(6,'b6','c6');
5050
statement error 4001
5151
merge into target_build_optimization as t1 using source_optimization as t2 on t1.a = t2.a and t1.b = t2.b when matched then update * when not matched then insert *;
5252

53+
statement ok
54+
set join_spilling_memory_ratio = 0;
55+
5356
### 2.2 make sure the plan is expected
5457
query T
5558
explain merge into target_build_optimization as t1 using source_optimization as t2 on t1.a = t2.a and t1.b = t2.b when matched then update set t1.a = t2.a,t1.b = t2.b,t1.c = t2.c when not matched then insert *;
5659
----
5760
MergeInto:
5861
target_table: default.default.target_build_optimization
5962
├── distributed: false
60-
├── target_build_optimization: false
63+
├── target_build_optimization: true
6164
├── can_try_update_column_only: true
6265
├── matched update: [condition: None,update set a = t2.a (#0),b = t2.b (#1),c = t2.c (#2)]
6366
├── unmatched insert: [condition: None,insert into (a,b,c) values(CAST(a (#0) AS Int32 NULL),CAST(b (#1) AS String NULL),CAST(c (#2) AS String NULL))]
@@ -119,7 +122,7 @@ explain merge into target_build_optimization as t1 using source_optimization as
119122
MergeInto:
120123
target_table: default.default.target_build_optimization
121124
├── distributed: false
122-
├── target_build_optimization: false
125+
├── target_build_optimization: true
123126
├── can_try_update_column_only: true
124127
├── matched update: [condition: None,update set a = t2.a (#0),b = t2.b (#1),c = t2.c (#2)]
125128
├── unmatched insert: [condition: None,insert into (a,b,c) values(CAST(a (#0) AS Int32 NULL),CAST(b (#1) AS String NULL),CAST(c (#2) AS String NULL))]
@@ -160,6 +163,9 @@ select * from target_build_optimization order by a,b,c;
160163
11 b11 c_11
161164
12 b12 c_12
162165

166+
statement ok
167+
set join_spilling_memory_ratio = 60;
168+
163169
### test with conjunct
164170
#### we need to make sure the blocks count and layout, so we should truncate and insert again.
165171
statement ok

tests/sqllogictests/suites/mode/standalone/explain/merge_into.test

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,17 @@ create table column_only_optimization_target(a int,b string);
9090
statement ok
9191
create table column_only_optimization_source(a int,b string);
9292

93+
statement ok
94+
set join_spilling_memory_ratio = 0;
95+
9396
query T
9497
explain MERGE INTO column_only_optimization_target as t1 using column_only_optimization_source as t2
9598
on t1.a = t2.a when matched then update set t1.b = t2.b when not matched then insert *;
9699
----
97100
MergeInto:
98101
target_table: default.default.column_only_optimization_target
99102
├── distributed: false
100-
├── target_build_optimization: false
103+
├── target_build_optimization: true
101104
├── can_try_update_column_only: true
102105
├── matched update: [condition: None,update set b = t2.b (#1)]
103106
├── unmatched insert: [condition: None,insert into (a,b) values(CAST(a (#0) AS Int32 NULL),CAST(b (#1) AS String NULL))]
@@ -123,7 +126,7 @@ on t1.a = t2.a when matched then update * when not matched then insert *;
123126
MergeInto:
124127
target_table: default.default.column_only_optimization_target
125128
├── distributed: false
126-
├── target_build_optimization: false
129+
├── target_build_optimization: true
127130
├── can_try_update_column_only: true
128131
├── matched update: [condition: None,update set a = a (#0),b = b (#1)]
129132
├── unmatched insert: [condition: None,insert into (a,b) values(CAST(a (#0) AS Int32 NULL),CAST(b (#1) AS String NULL))]
@@ -142,6 +145,9 @@ target_table: default.default.column_only_optimization_target
142145
├── order by: []
143146
└── limit: NONE
144147

148+
statement ok
149+
set join_spilling_memory_ratio = 60;
150+
145151
query T
146152
explain MERGE INTO column_only_optimization_target as t1 using column_only_optimization_source as t2
147153
on t1.a = t2.a when matched then update set t1.b = 'test' when not matched then insert *;

0 commit comments

Comments
 (0)