This is an automated email from the ASF dual-hosted git repository.

okumin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new d989c177b6c HIVE-28917: NPE in merge statement when checking 
nullability of joining column in matched clause - ADDENDUM (#5815)
d989c177b6c is described below

commit d989c177b6c5b6c1a6ba7534a4e3da73d3aac016
Author: Soumyakanti Das <[email protected]>
AuthorDate: Fri May 16 01:20:09 2025 -0700

    HIVE-28917: NPE in merge statement when checking nullability of joining 
column in matched clause - ADDENDUM (#5815)
---
 .../merge_with_null_check_on_joining_col.q.out     | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/merge_with_null_check_on_joining_col.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/merge_with_null_check_on_joining_col.q.out
index 521eb4e26f2..023edb48c58 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/merge_with_null_check_on_joining_col.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/merge_with_null_check_on_joining_col.q.out
@@ -74,7 +74,7 @@ CBO PLAN:
 HiveUnion(all=[true])
   HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
t__a=[$5], t__b=[+($6, 100)], t__c=[$7])
     HiveJoin(condition=[AND(=($5, $8), =($6, $9))], joinType=[inner], 
algorithm=[none], cost=[not available])
-      HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1], t__c=[$2])
+      HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1], t__c=[$2])
         HiveFilter(condition=[AND(>($0, 10), IS NOT NULL($1))])
           HiveTableScan(table=[[default, target]], table:alias=[target])
       HiveProject(a=[$0], b=[$1])
@@ -83,7 +83,7 @@ HiveUnion(all=[true])
   HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
a=[$7], b=[$8], c=[$9])
     HiveFilter(condition=[AND(IS NULL($5), IS NULL($6))])
       HiveJoin(condition=[AND(=($5, $7), =($6, $8))], joinType=[right], 
algorithm=[none], cost=[not available])
-        HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1])
+        HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1])
           HiveFilter(condition=[AND(>($0, 20), IS NOT NULL($1))])
             HiveTableScan(table=[[default, target]], table:alias=[target])
         HiveProject(a=[$0], b=[$1], c=[$2])
@@ -94,8 +94,8 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
t__a=[$5], t__b=[$6], t__c=[$7], a=[$8], b=[$9])
         HiveFilter(condition=[OR(IS NULL(OR(AND(=($5, $8), =($6, $9), IS 
NULL($5)), >($5, 10), AND(IS NULL($5), IS NULL($6)))), AND(OR(<>($5, $8), 
<>($6, $9), IS NOT NULL($5)), <=($5, 10), OR(IS NOT NULL($5), IS NOT 
NULL($6))))])
           HiveJoin(condition=[AND(=($5, $8), =($6, $9))], joinType=[left], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1], t__c=[$2])
-              HiveFilter(condition=[IS NOT NULL($9)])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1], t__c=[$2])
+              HiveFilter(condition=[IS NOT NULL($5)])
                 HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -104,8 +104,8 @@ HiveUnion(all=[true])
         HiveFilter(condition=[=($1, 1)])
           HiveProject(t__file__path=[$0], row_number_window_0=[row_number() 
OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING 
AND UNBOUNDED FOLLOWING)])
             HiveJoin(condition=[AND(=($1, $3), =($2, $4))], joinType=[left], 
algorithm=[none], cost=[not available])
-              HiveProject(t__file__path=[$9], t__a=[$0], t__b=[$1])
-                HiveFilter(condition=[AND(>($0, 10), IS NOT NULL($9))])
+              HiveProject(t__file__path=[$5], t__a=[$0], t__b=[$1])
+                HiveFilter(condition=[AND(>($0, 10), IS NOT NULL($5))])
                   HiveTableScan(table=[[default, target]], 
table:alias=[target])
               HiveProject(a=[$0], b=[$1])
                 HiveFilter(condition=[AND(>($0, 10), IS NOT NULL($1))])
@@ -114,7 +114,7 @@ HiveUnion(all=[true])
     HiveFilter(condition=[=($7, 1)])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__partition__projection=[$3], t__a=[$4], t__b=[$5], 
t__c=[$6], row_number_window_0=[row_number() OVER (PARTITION BY $2 ORDER BY $2 
NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
         HiveJoin(condition=[AND(=($4, $7), =($5, $8))], joinType=[left], 
algorithm=[none], cost=[not available])
-          HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__partition__projection=[$11], t__a=[$0], t__b=[$1], 
t__c=[$2])
+          HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__partition__projection=[$7], t__a=[$0], t__b=[$1], 
t__c=[$2])
             HiveFilter(condition=[>($0, 10)])
               HiveTableScan(table=[[default, target]], table:alias=[target])
           HiveProject(a=[$0], b=[$1])
@@ -144,7 +144,7 @@ HiveUnion(all=[true])
   HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
a=[$7], b=[$8], c=[$9])
     HiveFilter(condition=[AND(IS NULL($5), IS NULL($6))])
       HiveJoin(condition=[AND(=($5, $7), =($6, $8))], joinType=[right], 
algorithm=[none], cost=[not available])
-        HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1])
+        HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1])
           HiveFilter(condition=[AND(>($0, 20), IS NOT NULL($1))])
             HiveTableScan(table=[[default, target]], table:alias=[target])
         HiveProject(a=[$0], b=[$1], c=[$2])
@@ -155,8 +155,8 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
t__a=[$5], t__b=[$6], t__c=[$7], a=[$8], b=[$9])
         HiveFilter(condition=[OR(IS NULL(OR(IS NULL($5), AND(=($5, $8), =($6, 
$9), >($5, 10)), AND(IS NULL($5), IS NULL($6)))), AND(OR(<>($5, $8), <>($6, 
$9), <=($5, 10)), IS NOT NULL($5)))])
           HiveJoin(condition=[AND(=($5, $8), =($6, $9))], joinType=[left], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1], t__c=[$2])
-              HiveFilter(condition=[IS NOT NULL($9)])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1], t__c=[$2])
+              HiveFilter(condition=[IS NOT NULL($5)])
                 HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -166,8 +166,8 @@ HiveUnion(all=[true])
           HiveProject(t__file__path=[$0], row_number_window_0=[row_number() 
OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING 
AND UNBOUNDED FOLLOWING)])
             HiveFilter(condition=[OR(IS NULL($1), AND(=($1, $3), =($2, $4), 
>($1, 10)))])
               HiveJoin(condition=[AND(=($1, $3), =($2, $4))], joinType=[left], 
algorithm=[none], cost=[not available])
-                HiveProject(t__file__path=[$9], t__a=[$0], t__b=[$1])
-                  HiveFilter(condition=[IS NOT NULL($9)])
+                HiveProject(t__file__path=[$5], t__a=[$0], t__b=[$1])
+                  HiveFilter(condition=[IS NOT NULL($5)])
                     HiveTableScan(table=[[default, target]], 
table:alias=[target])
                 HiveProject(a=[$0], b=[$1])
                   HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -177,7 +177,7 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__partition__projection=[$3], t__a=[$4], t__b=[$5], 
t__c=[$6], row_number_window_0=[row_number() OVER (PARTITION BY $2 ORDER BY $2 
NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
         HiveFilter(condition=[OR(IS NULL($4), AND(=($4, $7), =($5, $8), >($4, 
10)))])
           HiveJoin(condition=[AND(=($4, $7), =($5, $8))], joinType=[full], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__partition__projection=[$11], t__a=[$0], t__b=[$1], 
t__c=[$2])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__partition__projection=[$7], t__a=[$0], t__b=[$1], 
t__c=[$2])
               HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveTableScan(table=[[default, source]], table:alias=[s])
@@ -205,7 +205,7 @@ HiveUnion(all=[true])
   HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
a=[null:INTEGER], b=[$8], c=[$9])
     HiveFilter(condition=[AND(IS NULL($5), IS NULL($6), IS NULL($7))])
       HiveJoin(condition=[AND(=($5, $7), =($6, $8))], joinType=[full], 
algorithm=[none], cost=[not available])
-        HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1])
+        HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1])
           HiveTableScan(table=[[default, target]], table:alias=[target])
         HiveProject(a=[$0], b=[$1], c=[$2])
           HiveTableScan(table=[[default, source]], table:alias=[s])
@@ -214,8 +214,8 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
t__a=[$5], t__b=[$6], t__c=[$7], a=[$8], b=[$9])
         HiveFilter(condition=[OR(IS NULL(OR(AND(=($5, $8), =($6, $9), >($5, 
10)), >($5, 20), AND(IS NULL($5), IS NULL($6)))), AND(OR(<>($5, $8), <>($6, 
$9), <=($5, 10)), <=($5, 20), OR(IS NOT NULL($5), IS NOT NULL($6))))])
           HiveJoin(condition=[AND(=($5, $8), =($6, $9))], joinType=[left], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1], t__c=[$2])
-              HiveFilter(condition=[IS NOT NULL($9)])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1], t__c=[$2])
+              HiveFilter(condition=[IS NOT NULL($5)])
                 HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -225,8 +225,8 @@ HiveUnion(all=[true])
           HiveProject(t__file__path=[$0], row_number_window_0=[row_number() 
OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING 
AND UNBOUNDED FOLLOWING)])
             HiveFilter(condition=[OR(>($1, 20), AND(=($1, $3), =($2, $4), 
>($1, 10)))])
               HiveJoin(condition=[AND(=($1, $3), =($2, $4))], joinType=[left], 
algorithm=[none], cost=[not available])
-                HiveProject(t__file__path=[$9], t__a=[$0], t__b=[$1])
-                  HiveFilter(condition=[IS NOT NULL($9)])
+                HiveProject(t__file__path=[$5], t__a=[$0], t__b=[$1])
+                  HiveFilter(condition=[IS NOT NULL($5)])
                     HiveTableScan(table=[[default, target]], 
table:alias=[target])
                 HiveProject(a=[$0], b=[$1])
                   HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -236,7 +236,7 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__partition__projection=[$3], t__a=[$4], t__b=[$5], 
t__c=[$6], row_number_window_0=[row_number() OVER (PARTITION BY $2 ORDER BY $2 
NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
         HiveFilter(condition=[OR(>($4, 20), AND(=($4, $7), =($5, $8), >($4, 
10)))])
           HiveJoin(condition=[AND(=($4, $7), =($5, $8))], joinType=[left], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__partition__projection=[$11], t__a=[$0], t__b=[$1], 
t__c=[$2])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__partition__projection=[$7], t__a=[$0], t__b=[$1], 
t__c=[$2])
               HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -265,7 +265,7 @@ HiveUnion(all=[true])
   HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
a=[$7], b=[$8], c=[$9])
     HiveFilter(condition=[AND(IS NULL($5), IS NULL($6))])
       HiveJoin(condition=[AND(=($5, $7), =($6, $8))], joinType=[right], 
algorithm=[none], cost=[not available])
-        HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1])
+        HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1])
           HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
             HiveTableScan(table=[[default, target]], table:alias=[target])
         HiveProject(a=[$0], b=[$1], c=[$2])
@@ -276,8 +276,8 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__row__position=[$3], t__partition__projection=[$4], 
t__a=[$5], t__b=[$6], t__c=[$7], a=[$8], b=[$9])
         HiveFilter(condition=[OR(IS NULL(OR(AND(=($5, $8), =($6, $9), >($5, 
10)), >($5, 20), AND(IS NULL($5), IS NULL($6)))), AND(OR(<>($5, $8), <>($6, 
$9), <=($5, 10)), <=($5, 20), OR(IS NOT NULL($5), IS NOT NULL($6))))])
           HiveJoin(condition=[AND(=($5, $8), =($6, $9))], joinType=[left], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__row__position=[$10], t__partition__projection=[$11], 
t__a=[$0], t__b=[$1], t__c=[$2])
-              HiveFilter(condition=[IS NOT NULL($9)])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__row__position=[$6], t__partition__projection=[$7], 
t__a=[$0], t__b=[$1], t__c=[$2])
+              HiveFilter(condition=[IS NOT NULL($5)])
                 HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -287,8 +287,8 @@ HiveUnion(all=[true])
           HiveProject(t__file__path=[$0], row_number_window_0=[row_number() 
OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING 
AND UNBOUNDED FOLLOWING)])
             HiveFilter(condition=[OR(>($1, 20), AND(=($1, $3), =($2, $4), 
>($1, 10)))])
               HiveJoin(condition=[AND(=($1, $3), =($2, $4))], joinType=[left], 
algorithm=[none], cost=[not available])
-                HiveProject(t__file__path=[$9], t__a=[$0], t__b=[$1])
-                  HiveFilter(condition=[IS NOT NULL($9)])
+                HiveProject(t__file__path=[$5], t__a=[$0], t__b=[$1])
+                  HiveFilter(condition=[IS NOT NULL($5)])
                     HiveTableScan(table=[[default, target]], 
table:alias=[target])
                 HiveProject(a=[$0], b=[$1])
                   HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
@@ -298,7 +298,7 @@ HiveUnion(all=[true])
       HiveProject(t__partition__spec__id=[$0], t__partition__hash=[$1], 
t__file__path=[$2], t__partition__projection=[$3], t__a=[$4], t__b=[$5], 
t__c=[$6], row_number_window_0=[row_number() OVER (PARTITION BY $2 ORDER BY $2 
NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
         HiveFilter(condition=[OR(>($4, 20), AND(=($4, $7), =($5, $8), >($4, 
10)))])
           HiveJoin(condition=[AND(=($4, $7), =($5, $8))], joinType=[left], 
algorithm=[none], cost=[not available])
-            HiveProject(t__partition__spec__id=[$7], t__partition__hash=[$8], 
t__file__path=[$9], t__partition__projection=[$11], t__a=[$0], t__b=[$1], 
t__c=[$2])
+            HiveProject(t__partition__spec__id=[$3], t__partition__hash=[$4], 
t__file__path=[$5], t__partition__projection=[$7], t__a=[$0], t__b=[$1], 
t__c=[$2])
               HiveTableScan(table=[[default, target]], table:alias=[target])
             HiveProject(a=[$0], b=[$1])
               HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])

Reply via email to