HIVE-28119: Iceberg: Allow insert clause with a column list in Merge query not_matched condition (Denys Kuzmenko, reviewed by Butao Zhang, Simhadri Govindappa)

Closes #5127

Author: deniskuzZ

iceberg/iceberg-handler/src/test/queries/positive/merge_iceberg_copy_on_write_partitioned.q

@@ -27,6 +27,15 @@ merge into target_ice as t using source src ON t.a = src.a
 when not matched then insert values (src.a, src.b, src.c);
 
 merge into target_ice as t using source src ON t.a = src.a
-when not matched then insert values (src.a, src.b, src.c);
+when not matched and src.a <= 5 then insert values (src.a, src.b, src.c);
+
+select * from target_ice;
+
+-- insert clause with a column list
+merge into target_ice as t using source src ON t.a = src.a
+when not matched then insert (a, c) values (src.a, src.c);
 
 select * from target_ice;
+
+
+

iceberg/iceberg-handler/src/test/queries/positive/merge_iceberg_copy_on_write_unpartitioned.q

@@ -14,13 +14,14 @@ insert into source values (1, 'one', 50), (2, 'two', 51), (3, 'three', 52), (4,
 explain
 merge into target_ice as t using source src ON t.a = src.a
 when matched and t.a > 100 THEN DELETE
+when matched then update set b = 'Merged', c = t.c + 10
 when not matched then insert values (src.a, src.b, src.c);
 
+-- insert clause with a column list
 explain
 merge into target_ice as t using source src ON t.a = src.a
 when matched and t.a > 100 THEN DELETE
-when matched then update set b = 'Merged', c = t.c + 10
-when not matched then insert values (src.a, src.b, src.c);
+when not matched then insert (a, b) values (src.a, src.b);
 
 merge into target_ice as t using source src ON t.a = src.a
 when matched and t.a > 100 THEN DELETE

iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_copy_on_write_partitioned.q.out

@@ -551,13 +551,39 @@ STAGE PLANS:
       Basic Stats Work:
 
 PREHOOK: query: merge into target_ice as t using source src ON t.a = src.a
-when not matched then insert values (src.a, src.b, src.c)
+when not matched and src.a <= 5 then insert values (src.a, src.b, src.c)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@source
 PREHOOK: Input: default@target_ice
 PREHOOK: Output: default@target_ice
 POSTHOOK: query: merge into target_ice as t using source src ON t.a = src.a
-when not matched then insert values (src.a, src.b, src.c)
+when not matched and src.a <= 5 then insert values (src.a, src.b, src.c)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@source
+POSTHOOK: Input: default@target_ice
+POSTHOOK: Output: default@target_ice
+PREHOOK: query: select * from target_ice
+PREHOOK: type: QUERY
+PREHOOK: Input: default@target_ice
+PREHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: query: select * from target_ice
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@target_ice
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+1	Merged	60
+2	Merged	61
+3	three	52
+333	two	56
+4	four	53
+5	five	54
+PREHOOK: query: merge into target_ice as t using source src ON t.a = src.a
+when not matched then insert (a, c) values (src.a, src.c)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@source
+PREHOOK: Input: default@target_ice
+PREHOOK: Output: default@target_ice
+POSTHOOK: query: merge into target_ice as t using source src ON t.a = src.a
+when not matched then insert (a, c) values (src.a, src.c)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@source
 POSTHOOK: Input: default@target_ice
@@ -571,7 +597,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@target_ice
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	Merged	60
-111	one	55
+111	NULL	55
 2	Merged	61
 3	three	52
 333	two	56