Skip to content

Commit 78357d2

Browse files
zhangbutaozhangbutao
committed
Update qtest after upgrading guava to 27.0-jre
1 parent 69ad0e9 commit 78357d2

File tree

12 files changed

+442
-426
lines changed

12 files changed

+442
-426
lines changed

‎iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_orc.q.out‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ STAGE PLANS:
121121
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
122122
Statistics: Num rows: 10 Data size: 3375 Basic stats: COMPLETE Column stats: COMPLETE
123123
Select Operator
124-
expressions: _col1 (type: string), _col0 (type: int), _col5 (type: string), _col7 (type: string), _col2 (type: int), _col6 (type: bigint), _col4 (type: bigint), _col3 (type: int), _col10 (type: int), _col9 (type: string), _col8 (type: int)
124+
expressions: _col7 (type: string), _col4 (type: bigint), _col3 (type: int), _col10 (type: int), _col9 (type: string), _col8 (type: int), _col1 (type: string), _col0 (type: int), _col5 (type: string), _col2 (type: int), _col6 (type: bigint)
125125
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
126126
Statistics: Num rows: 10 Data size: 3375 Basic stats: COMPLETE Column stats: COMPLETE
127127
Filter Operator
128-
predicate: ((_col10 = _col1) and (_col10 > 100)) (type: boolean)
128+
predicate: ((_col5 = _col7) and (_col5 > 100)) (type: boolean)
129129
Statistics: Num rows: 4 Data size: 1833 Basic stats: COMPLETE Column stats: COMPLETE
130130
Select Operator
131-
expressions: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint), _col3 (type: string), _col10 (type: int), _col9 (type: string), _col8 (type: int)
131+
expressions: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint), _col0 (type: string), _col5 (type: int), _col4 (type: string), _col3 (type: int)
132132
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
133133
Statistics: Num rows: 4 Data size: 1449 Basic stats: COMPLETE Column stats: COMPLETE
134134
File Output Operator
@@ -140,10 +140,10 @@ STAGE PLANS:
140140
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
141141
name: default.target_ice
142142
Filter Operator
143-
predicate: ((_col10 = _col1) and (_col10 <= 100)) (type: boolean)
143+
predicate: ((_col5 = _col7) and (_col5 <= 100)) (type: boolean)
144144
Statistics: Num rows: 1 Data size: 579 Basic stats: COMPLETE Column stats: COMPLETE
145145
Select Operator
146-
expressions: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint), _col3 (type: string), _col10 (type: int), _col9 (type: string), _col8 (type: int)
146+
expressions: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint), _col0 (type: string), _col5 (type: int), _col4 (type: string), _col3 (type: int)
147147
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
148148
Statistics: Num rows: 1 Data size: 483 Basic stats: COMPLETE Column stats: COMPLETE
149149
File Output Operator
@@ -155,10 +155,10 @@ STAGE PLANS:
155155
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
156156
name: default.target_ice
157157
Filter Operator
158-
predicate: ((_col10 = _col1) and (_col10 <= 100)) (type: boolean)
158+
predicate: ((_col5 = _col7) and (_col5 <= 100)) (type: boolean)
159159
Statistics: Num rows: 1 Data size: 579 Basic stats: COMPLETE Column stats: COMPLETE
160160
Select Operator
161-
expressions: _col10 (type: int), 'Merged' (type: string), (_col8 + 10) (type: int)
161+
expressions: _col5 (type: int), 'Merged' (type: string), (_col3 + 10) (type: int)
162162
outputColumnNames: _col0, _col1, _col2
163163
Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column stats: COMPLETE
164164
File Output Operator
@@ -170,10 +170,10 @@ STAGE PLANS:
170170
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
171171
name: default.target_ice
172172
Filter Operator
173-
predicate: _col10 is null (type: boolean)
173+
predicate: _col5 is null (type: boolean)
174174
Statistics: Num rows: 6 Data size: 2025 Basic stats: COMPLETE Column stats: COMPLETE
175175
Select Operator
176-
expressions: _col1 (type: int), _col0 (type: string), _col4 (type: int)
176+
expressions: _col7 (type: int), _col6 (type: string), _col9 (type: int)
177177
outputColumnNames: _col0, _col1, _col2
178178
Statistics: Num rows: 6 Data size: 576 Basic stats: COMPLETE Column stats: COMPLETE
179179
File Output Operator
@@ -185,15 +185,15 @@ STAGE PLANS:
185185
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
186186
name: default.target_ice
187187
Filter Operator
188-
predicate: (_col10 = _col1) (type: boolean)
188+
predicate: (_col5 = _col7) (type: boolean)
189189
Statistics: Num rows: 5 Data size: 1929 Basic stats: COMPLETE Column stats: COMPLETE
190190
Select Operator
191-
expressions: _col2 (type: string), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int)
192-
outputColumnNames: _col2, _col5, _col6, _col7
191+
expressions: _col1 (type: bigint), _col2 (type: int), _col8 (type: string), _col10 (type: bigint)
192+
outputColumnNames: _col1, _col2, _col8, _col10
193193
Statistics: Num rows: 5 Data size: 1929 Basic stats: COMPLETE Column stats: COMPLETE
194194
Group By Operator
195195
aggregations: count()
196-
keys: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint)
196+
keys: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint)
197197
minReductionHashAggr: 0.4
198198
mode: hash
199199
outputColumnNames: _col0, _col1, _col2, _col3, _col4

‎iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_partitioned_orc.q.out‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ STAGE PLANS:
123123
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
124124
Statistics: Num rows: 10 Data size: 3375 Basic stats: COMPLETE Column stats: COMPLETE
125125
Select Operator
126-
expressions: _col1 (type: string), _col0 (type: int), _col5 (type: string), _col7 (type: string), _col2 (type: int), _col6 (type: bigint), _col4 (type: bigint), _col3 (type: int), _col10 (type: int), _col9 (type: string), _col8 (type: int)
126+
expressions: _col7 (type: string), _col4 (type: bigint), _col3 (type: int), _col10 (type: int), _col9 (type: string), _col8 (type: int), _col1 (type: string), _col0 (type: int), _col5 (type: string), _col2 (type: int), _col6 (type: bigint)
127127
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
128128
Statistics: Num rows: 10 Data size: 3375 Basic stats: COMPLETE Column stats: COMPLETE
129129
Filter Operator
130-
predicate: ((_col10 = _col1) and (_col10 > 100)) (type: boolean)
130+
predicate: ((_col5 = _col7) and (_col5 > 100)) (type: boolean)
131131
Statistics: Num rows: 4 Data size: 1833 Basic stats: COMPLETE Column stats: COMPLETE
132132
Select Operator
133-
expressions: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint), _col3 (type: string), _col10 (type: int), _col9 (type: string), _col8 (type: int)
133+
expressions: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint), _col0 (type: string), _col5 (type: int), _col4 (type: string), _col3 (type: int)
134134
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
135135
Statistics: Num rows: 4 Data size: 1449 Basic stats: COMPLETE Column stats: COMPLETE
136136
File Output Operator
@@ -142,10 +142,10 @@ STAGE PLANS:
142142
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
143143
name: default.target_ice
144144
Filter Operator
145-
predicate: ((_col10 = _col1) and (_col10 <= 100)) (type: boolean)
145+
predicate: ((_col5 = _col7) and (_col5 <= 100)) (type: boolean)
146146
Statistics: Num rows: 1 Data size: 579 Basic stats: COMPLETE Column stats: COMPLETE
147147
Select Operator
148-
expressions: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint), _col3 (type: string), _col10 (type: int), _col9 (type: string), _col8 (type: int)
148+
expressions: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint), _col0 (type: string), _col5 (type: int), _col4 (type: string), _col3 (type: int)
149149
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
150150
Statistics: Num rows: 1 Data size: 483 Basic stats: COMPLETE Column stats: COMPLETE
151151
File Output Operator
@@ -157,10 +157,10 @@ STAGE PLANS:
157157
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
158158
name: default.target_ice
159159
Filter Operator
160-
predicate: ((_col10 = _col1) and (_col10 <= 100)) (type: boolean)
160+
predicate: ((_col5 = _col7) and (_col5 <= 100)) (type: boolean)
161161
Statistics: Num rows: 1 Data size: 579 Basic stats: COMPLETE Column stats: COMPLETE
162162
Select Operator
163-
expressions: _col10 (type: int), 'Merged' (type: string), (_col8 + 10) (type: int)
163+
expressions: _col5 (type: int), 'Merged' (type: string), (_col3 + 10) (type: int)
164164
outputColumnNames: _col0, _col1, _col2
165165
Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column stats: COMPLETE
166166
Reduce Output Operator
@@ -171,10 +171,10 @@ STAGE PLANS:
171171
Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column stats: COMPLETE
172172
value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: int)
173173
Filter Operator
174-
predicate: _col10 is null (type: boolean)
174+
predicate: _col5 is null (type: boolean)
175175
Statistics: Num rows: 6 Data size: 2025 Basic stats: COMPLETE Column stats: COMPLETE
176176
Select Operator
177-
expressions: _col1 (type: int), _col0 (type: string), _col4 (type: int)
177+
expressions: _col7 (type: int), _col6 (type: string), _col9 (type: int)
178178
outputColumnNames: _col0, _col1, _col2
179179
Statistics: Num rows: 6 Data size: 576 Basic stats: COMPLETE Column stats: COMPLETE
180180
Reduce Output Operator
@@ -185,15 +185,15 @@ STAGE PLANS:
185185
Statistics: Num rows: 6 Data size: 576 Basic stats: COMPLETE Column stats: COMPLETE
186186
value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: int)
187187
Filter Operator
188-
predicate: (_col10 = _col1) (type: boolean)
188+
predicate: (_col5 = _col7) (type: boolean)
189189
Statistics: Num rows: 5 Data size: 1929 Basic stats: COMPLETE Column stats: COMPLETE
190190
Select Operator
191-
expressions: _col2 (type: string), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int)
192-
outputColumnNames: _col2, _col5, _col6, _col7
191+
expressions: _col1 (type: bigint), _col2 (type: int), _col8 (type: string), _col10 (type: bigint)
192+
outputColumnNames: _col1, _col2, _col8, _col10
193193
Statistics: Num rows: 5 Data size: 1929 Basic stats: COMPLETE Column stats: COMPLETE
194194
Group By Operator
195195
aggregations: count()
196-
keys: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint)
196+
keys: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint)
197197
minReductionHashAggr: 0.4
198198
mode: hash
199199
outputColumnNames: _col0, _col1, _col2, _col3, _col4

‎iceberg/iceberg-handler/src/test/results/positive/write_iceberg_branch.q.out‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,14 @@ STAGE PLANS:
478478
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
479479
Statistics: Num rows: 10 Data size: 3385 Basic stats: COMPLETE Column stats: COMPLETE
480480
Select Operator
481-
expressions: _col1 (type: string), _col0 (type: int), _col5 (type: string), _col7 (type: string), _col2 (type: int), _col6 (type: bigint), _col4 (type: bigint), _col3 (type: int), _col10 (type: int), _col9 (type: string), _col8 (type: int)
481+
expressions: _col7 (type: string), _col4 (type: bigint), _col3 (type: int), _col10 (type: int), _col9 (type: string), _col8 (type: int), _col1 (type: string), _col0 (type: int), _col5 (type: string), _col2 (type: int), _col6 (type: bigint)
482482
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
483483
Statistics: Num rows: 10 Data size: 3385 Basic stats: COMPLETE Column stats: COMPLETE
484484
Filter Operator
485-
predicate: ((_col10 = _col1) and (_col10 > 100)) (type: boolean)
485+
predicate: ((_col5 = _col7) and (_col5 > 100)) (type: boolean)
486486
Statistics: Num rows: 1 Data size: 581 Basic stats: COMPLETE Column stats: COMPLETE
487487
Select Operator
488-
expressions: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint), _col3 (type: string), _col10 (type: int), _col9 (type: string), _col8 (type: int)
488+
expressions: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint), _col0 (type: string), _col5 (type: int), _col4 (type: string), _col3 (type: int)
489489
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
490490
Statistics: Num rows: 1 Data size: 485 Basic stats: COMPLETE Column stats: COMPLETE
491491
File Output Operator
@@ -497,10 +497,10 @@ STAGE PLANS:
497497
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
498498
name: default.ice01
499499
Filter Operator
500-
predicate: ((_col10 = _col1) and (_col10 <= 100)) (type: boolean)
500+
predicate: ((_col5 = _col7) and (_col5 <= 100)) (type: boolean)
501501
Statistics: Num rows: 5 Data size: 1935 Basic stats: COMPLETE Column stats: COMPLETE
502502
Select Operator
503-
expressions: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint), _col3 (type: string), _col10 (type: int), _col9 (type: string), _col8 (type: int)
503+
expressions: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint), _col0 (type: string), _col5 (type: int), _col4 (type: string), _col3 (type: int)
504504
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
505505
Statistics: Num rows: 5 Data size: 1455 Basic stats: COMPLETE Column stats: COMPLETE
506506
File Output Operator
@@ -512,10 +512,10 @@ STAGE PLANS:
512512
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
513513
name: default.ice01
514514
Filter Operator
515-
predicate: ((_col10 = _col1) and (_col10 <= 100)) (type: boolean)
515+
predicate: ((_col5 = _col7) and (_col5 <= 100)) (type: boolean)
516516
Statistics: Num rows: 5 Data size: 1935 Basic stats: COMPLETE Column stats: COMPLETE
517517
Select Operator
518-
expressions: _col10 (type: int), 'Merged' (type: string), (_col8 + 10) (type: int)
518+
expressions: _col5 (type: int), 'Merged' (type: string), (_col3 + 10) (type: int)
519519
outputColumnNames: _col0, _col1, _col2
520520
Statistics: Num rows: 5 Data size: 482 Basic stats: COMPLETE Column stats: COMPLETE
521521
File Output Operator
@@ -527,10 +527,10 @@ STAGE PLANS:
527527
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
528528
name: default.ice01
529529
Filter Operator
530-
predicate: _col10 is null (type: boolean)
530+
predicate: _col5 is null (type: boolean)
531531
Statistics: Num rows: 6 Data size: 2031 Basic stats: COMPLETE Column stats: COMPLETE
532532
Select Operator
533-
expressions: _col1 (type: int), _col0 (type: string), _col4 (type: int)
533+
expressions: _col7 (type: int), _col6 (type: string), _col9 (type: int)
534534
outputColumnNames: _col0, _col1, _col2
535535
Statistics: Num rows: 6 Data size: 576 Basic stats: COMPLETE Column stats: COMPLETE
536536
File Output Operator
@@ -542,15 +542,15 @@ STAGE PLANS:
542542
serde: org.apache.iceberg.mr.hive.HiveIcebergSerDe
543543
name: default.ice01
544544
Filter Operator
545-
predicate: (_col10 = _col1) (type: boolean)
545+
predicate: (_col5 = _col7) (type: boolean)
546546
Statistics: Num rows: 5 Data size: 1935 Basic stats: COMPLETE Column stats: COMPLETE
547547
Select Operator
548-
expressions: _col2 (type: string), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int)
549-
outputColumnNames: _col2, _col5, _col6, _col7
548+
expressions: _col1 (type: bigint), _col2 (type: int), _col8 (type: string), _col10 (type: bigint)
549+
outputColumnNames: _col1, _col2, _col8, _col10
550550
Statistics: Num rows: 5 Data size: 1935 Basic stats: COMPLETE Column stats: COMPLETE
551551
Group By Operator
552552
aggregations: count()
553-
keys: _col7 (type: int), _col6 (type: bigint), _col2 (type: string), _col5 (type: bigint)
553+
keys: _col2 (type: int), _col1 (type: bigint), _col8 (type: string), _col10 (type: bigint)
554554
minReductionHashAggr: 0.4
555555
mode: hash
556556
outputColumnNames: _col0, _col1, _col2, _col3, _col4

0 commit comments

Comments
 (0)