HIVE-27102: Upgrade Calcite to 1.33.0 and Avatica to 1.23.0

beeline/pom.xml

@@ -127,6 +127,11 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.locationtech.jts</groupId>
+      <artifactId>jts-core</artifactId>
+      <version>1.19.0</version>
+    </dependency>
     <!-- test intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

hbase-handler/src/test/results/positive/hbase_custom_key2.q.out

@@ -111,10 +111,10 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: hbase_ck_4
-          filterExpr: ((key.col1 < '27') and (key.col1 >= '165')) (type: boolean)
+          filterExpr: ((key.col1 >= '165') and (key.col1 < '27')) (type: boolean)
           Statistics: Num rows: 1 Data size: 792 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: ((key.col1 < '27') and (key.col1 >= '165')) (type: boolean)
+            predicate: ((key.col1 >= '165') and (key.col1 < '27')) (type: boolean)
             Statistics: Num rows: 1 Data size: 792 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: struct<col1:string,col2:string,col3:string>), value (type: string)

hbase-handler/src/test/results/positive/hbase_custom_key3.q.out

@@ -113,7 +113,7 @@ STAGE PLANS:
           alias: hbase_ck_5
           Statistics: Num rows: 1 Data size: 792 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: ((key.col1 < '27') and (key.col1 >= '165')) (type: boolean)
+            predicate: ((key.col1 >= '165') and (key.col1 < '27')) (type: boolean)
             Statistics: Num rows: 1 Data size: 792 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: struct<col1:string,col2:string,col3:string>), value (type: string)

hbase-handler/src/test/results/positive/hbase_queries.q.out

@@ -326,7 +326,7 @@ STAGE PLANS:
             alias: hbase_table_2
             Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 120) and (key > 100)) (type: boolean)
+              predicate: ((key > 100) and (key < 120)) (type: boolean)
               Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)

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

@@ -48,10 +48,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_ice
-                  filterExpr: (((b <> 'one') and (b <> 'four') and (a <> 22)) or ((a = 22) or (b) IN ('one', 'four')) is null or (b) IN ('one', 'four') or (a = 22)) (type: boolean)
+                  filterExpr: (((b) IN ('four', 'one') or (a = 22)) is null or ((b <> 'four') and (b <> 'one') and (a <> 22)) or (b) IN ('four', 'one') or (a = 22)) (type: boolean)
                   Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((((b <> 'one') and (b <> 'four') and (a <> 22)) or ((a = 22) or (b) IN ('one', 'four')) is null) and FILE__PATH is not null) (type: boolean)
+                    predicate: ((((b) IN ('four', 'one') or (a = 22)) is null or ((b <> 'four') and (b <> 'one') and (a <> 22))) and FILE__PATH is not null) (type: boolean)
                     Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: a (type: int), b (type: string), c (type: int), PARTITION__SPEC__ID (type: int), PARTITION__HASH (type: bigint), FILE__PATH (type: string), ROW__POSITION (type: bigint), PARTITION__PROJECTION (type: string)
@@ -65,7 +65,7 @@ STAGE PLANS:
                         Statistics: Num rows: 7 Data size: 3388 Basic stats: COMPLETE Column stats: COMPLETE
                         value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: int), _col4 (type: bigint), _col6 (type: bigint), _col7 (type: string)
                   Filter Operator
-                    predicate: (((b) IN ('one', 'four') or (a = 22)) and FILE__PATH is not null) (type: boolean)
+                    predicate: (((b) IN ('four', 'one') or (a = 22)) and FILE__PATH is not null) (type: boolean)
                     Statistics: Num rows: 4 Data size: 368 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: FILE__PATH (type: string)
@@ -78,10 +78,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_ice
-                  filterExpr: ((a = 22) or (b) IN ('one', 'four')) (type: boolean)
+                  filterExpr: ((a = 22) or (b) IN ('four', 'one')) (type: boolean)
                   Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((a = 22) or (b) IN ('one', 'four')) (type: boolean)
+                    predicate: ((a = 22) or (b) IN ('four', 'one')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 384 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: FILE__PATH (type: string)

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

@@ -84,17 +84,17 @@ Stage-4
               <-Reducer 2 [CONTAINS]
                 File Output Operator [FS_46]
                   table:{"name:":"default.ice01"}
-                  Select Operator [SEL_44] (rows=3 width=479)
+                  Select Operator [SEL_44] (rows=3 width=450)
                     Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                    Merge Join Operator [MERGEJOIN_43] (rows=3 width=479)
+                    Merge Join Operator [MERGEJOIN_43] (rows=3 width=450)
                       Conds:RS_57._col4=RS_63._col0(Left Semi),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                     <-Map 1 [SIMPLE_EDGE] vectorized
                       SHUFFLE [RS_57]
                         PartitionCols:_col4
-                        Select Operator [SEL_55] (rows=5 width=479)
+                        Select Operator [SEL_55] (rows=6 width=464)
                           Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                          Filter Operator [FIL_53] (rows=5 width=91)
-                            predicate:((((id <= 4) and (id <> 2)) or ((id > 4) or (id = 2)) is null) and ((id <= 4) or (id <> 2) or ((id > 4) or (id = 2)) is null) and FILE__PATH is not null)
+                          Filter Operator [FIL_53] (rows=6 width=76)
+                            predicate:((((id = 2) or (id > 4)) is null or (id < 2) or ((id > 2) and (id <= 4))) and FILE__PATH is not null)
                             TableScan [TS_0] (rows=7 width=78)
                               default@ice01,ice01,Tbl:COMPLETE,Col:COMPLETE,Output:["id","name"]
                     <-Reducer 4 [SIMPLE_EDGE] vectorized
@@ -114,7 +114,7 @@ Stage-4
                                   SHUFFLE [RS_56]
                                     PartitionCols:FILE__PATH
                                     Filter Operator [FIL_54] (rows=6 width=4)
-                                      predicate:(((id > 4) or (id = 2)) and FILE__PATH is not null)
+                                      predicate:(((id = 2) or (id > 4)) and FILE__PATH is not null)
                                        Please refer to the previous TableScan [TS_0]
               <-Reducer 6 [CONTAINS] vectorized
                 File Output Operator [FS_70]
@@ -131,7 +131,7 @@ Stage-4
                           SHUFFLE [RS_65]
                             PartitionCols:FILE__PATH
                             Filter Operator [FIL_64] (rows=6 width=76)
-                              predicate:((id > 4) or (id = 2))
+                              predicate:((id = 2) or (id > 4))
                               TableScan [TS_18] (rows=7 width=78)
                                 default@ice01,ice01,Tbl:COMPLETE,Col:COMPLETE,Output:["id","name"]
 

iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_bucket_map_join_7.q.out

@@ -164,13 +164,13 @@ Stage-0
                     Select Operator [SEL_52] (rows=500 width=178)
                       Output:["_col0","_col1"]
                       Filter Operator [FIL_51] (rows=500 width=178)
-                        predicate:((key <> '0') and (key <> '100') and value is not null)
+                        predicate:(key is not null and (key <> '0') and (key <> '100') and value is not null)
                         TableScan [TS_3] (rows=500 width=178)
                           default@src,b,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
                 <-Select Operator [SEL_55] (rows=500 width=269)
                     Output:["_col0","_col1","_col2"]
                     Filter Operator [FIL_54] (rows=500 width=269)
-                      predicate:((key1 <> '0') and (key1 <> '100') and key2 is not null)
+                      predicate:(key1 is not null and (key1 <> '0') and (key1 <> '100') and key2 is not null)
                       TableScan [TS_0] (rows=500 width=269)
                         default@srcbucket_big,a,Tbl:COMPLETE,Col:COMPLETE,Grouping Num Buckets:8,Grouping Partition Columns:["key1","key2"],Output:["key1","key2","value"]
 
@@ -360,13 +360,13 @@ Stage-0
                     Select Operator [SEL_32] (rows=500 width=178)
                       Output:["_col0","_col1"]
                       Filter Operator [FIL_31] (rows=500 width=178)
-                        predicate:((key <> '0') and (key <> '100'))
+                        predicate:(key is not null and (key <> '0') and (key <> '100'))
                         TableScan [TS_3] (rows=500 width=178)
                           default@src,b,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
                 <-Select Operator [SEL_35] (rows=500 width=269)
                     Output:["_col0","_col1","_col2"]
                     Filter Operator [FIL_34] (rows=500 width=269)
-                      predicate:((key1 <> '0') and (key1 <> '100'))
+                      predicate:(key1 is not null and (key1 <> '0') and (key1 <> '100'))
                       TableScan [TS_0] (rows=500 width=269)
                         default@srcbucket_big,a,Tbl:COMPLETE,Col:COMPLETE,Grouping Num Buckets:4,Grouping Partition Columns:["key1"],Output:["key1","key2","value"]
 

iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_orc.q.out

@@ -360,11 +360,11 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: o
-                  filterExpr: ((quantity NOT BETWEEN 39 AND 0 or quantity NOT BETWEEN 69 AND 39 or (quantity > 70)) and (((quantity > 0) and (quantity < 39)) or ((quantity > 39) and (quantity < 69)) or (quantity > 70)) and itemid is not null) (type: boolean)
+                  filterExpr: (quantity is not null and (((quantity > 0) and (quantity < 39)) or ((quantity > 39) and (quantity < 69)) or (quantity > 70)) and itemid is not null) (type: boolean)
                   probeDecodeDetails: cacheKey:HASH_MAP_MAPJOIN_29_container, bigKeyColName:itemid, smallTablePos:1, keyRatio:0.9523809523809523
                   Statistics: Num rows: 21 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((quantity NOT BETWEEN 39 AND 0 or quantity NOT BETWEEN 69 AND 39 or (quantity > 70)) and (((quantity > 0) and (quantity < 39)) or ((quantity > 39) and (quantity < 69)) or (quantity > 70)) and itemid is not null) (type: boolean)
+                    predicate: (quantity is not null and (((quantity > 0) and (quantity < 39)) or ((quantity > 39) and (quantity < 69)) or (quantity > 70)) and itemid is not null) (type: boolean)
                     Statistics: Num rows: 21 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: quantity (type: int), itemid (type: int)

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

@@ -283,7 +283,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                 Statistics: Num rows: 8 Data size: 3884 Basic stats: COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: ((_col5 <> _col8) or ((_col5 = _col8) or _col5 is null) is null) (type: boolean)
+                  predicate: ((_col5 <> _col8) or (_col5 is null or (_col5 = _col8)) is null) (type: boolean)
                   Statistics: Num rows: 8 Data size: 3884 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: string), _col3 (type: bigint), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: int)
@@ -634,7 +634,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                 Statistics: Num rows: 8 Data size: 3884 Basic stats: COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: ((((_col5 <> _col8) or (_col5 <= 100)) and _col5 is not null) or (((_col5 = _col8) and (_col5 > 100)) or _col5 is null) is null) (type: boolean)
+                  predicate: ((((_col5 <> _col8) or (_col5 <= 100)) and _col5 is not null) or (_col5 is null or ((_col5 = _col8) and (_col5 > 100))) is null) (type: boolean)
                   Statistics: Num rows: 8 Data size: 3884 Basic stats: COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: string), _col3 (type: bigint), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: int)

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

@@ -50,10 +50,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_ice
-                  filterExpr: ((a = 22) or (b) IN ('one', 'four')) (type: boolean)
+                  filterExpr: ((a = 22) or (b) IN ('four', 'one')) (type: boolean)
                   Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((a = 22) or (b) IN ('one', 'four')) (type: boolean)
+                    predicate: ((a = 22) or (b) IN ('four', 'one')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 384 Basic stats: COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: PARTITION__SPEC__ID (type: int), PARTITION__HASH (type: bigint), FILE__PATH (type: string), ROW__POSITION (type: bigint), PARTITION__PROJECTION (type: string), a (type: int), 'Changed' (type: string), c (type: int)
@@ -71,10 +71,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_ice
-                  filterExpr: (((b <> 'one') and (b <> 'four') and (a <> 22)) or ((a = 22) or (b) IN ('one', 'four')) is null) (type: boolean)
+                  filterExpr: (((b) IN ('four', 'one') or (a = 22)) is null or ((b <> 'four') and (b <> 'one') and (a <> 22))) (type: boolean)
                   Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((((b <> 'one') and (b <> 'four') and (a <> 22)) or ((a = 22) or (b) IN ('one', 'four')) is null) and FILE__PATH is not null) (type: boolean)
+                    predicate: ((((b) IN ('four', 'one') or (a = 22)) is null or ((b <> 'four') and (b <> 'one') and (a <> 22))) and FILE__PATH is not null) (type: boolean)
                     Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: a (type: int), b (type: string), c (type: int), PARTITION__SPEC__ID (type: int), PARTITION__HASH (type: bigint), FILE__PATH (type: string), ROW__POSITION (type: bigint), PARTITION__PROJECTION (type: string)
@@ -92,10 +92,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_ice
-                  filterExpr: ((a = 22) or (b) IN ('one', 'four')) (type: boolean)
+                  filterExpr: ((a = 22) or (b) IN ('four', 'one')) (type: boolean)
                   Statistics: Num rows: 7 Data size: 672 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((a = 22) or (b) IN ('one', 'four')) (type: boolean)
+                    predicate: ((a = 22) or (b) IN ('four', 'one')) (type: boolean)
                     Statistics: Num rows: 4 Data size: 384 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: FILE__PATH (type: string)
@@ -105,7 +105,7 @@ STAGE PLANS:
                       Statistics: Num rows: 4 Data size: 384 Basic stats: COMPLETE Column stats: COMPLETE
                       value expressions: a (type: int), b (type: string), c (type: int), PARTITION__SPEC__ID (type: int), PARTITION__HASH (type: bigint), PARTITION__PROJECTION (type: string)
                   Filter Operator
-                    predicate: (((b) IN ('one', 'four') or (a = 22)) and FILE__PATH is not null) (type: boolean)
+                    predicate: (((b) IN ('four', 'one') or (a = 22)) and FILE__PATH is not null) (type: boolean)
                     Statistics: Num rows: 4 Data size: 368 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: FILE__PATH (type: string)