Skip to content

Commit 6a8649b

Browse files
committed
sort dynamic partitions by default in some qtests to avoid q.out changes
1 parent 43f2cb7 commit 6a8649b

6 files changed

Lines changed: 10 additions & 2 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
-- Mask iceberg version
1919
--! qt:replace:/(\S\"iceberg-version\\\":\\\")(\w+\s\w+\s\d+\.\d+\.\d+\s\(\w+\s\w+\))(\\\")/$1#Masked#$3/
2020

21+
set hive.optimize.sort.dynamic.partition.threshold=1;
2122
set hive.explain.user=false;
23+
2224
create external table ice_parquet_int(
2325
strcol string,
2426
intcol integer

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
-- Mask iceberg version
1919
--! qt:replace:/(\S\"iceberg-version\\\":\\\")(\w+\s\w+\s\d+\.\d+\.\d+\s\(\w+\s\w+\))(\\\")/$1#Masked#$3/
2020

21+
set hive.optimize.sort.dynamic.partition.threshold=1;
2122
set hive.explain.user=false;
23+
2224
create external table ice_parquet_date_transform_year(
2325
bigintcol bigint,
2426
intcol integer,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
-- Mask iceberg version
1919
--! qt:replace:/(\S\"iceberg-version\\\":\\\")(\w+\s\w+\s\d+\.\d+\.\d+\s\(\w+\s\w+\))(\\\")/$1#Masked#$3/
2020

21+
set hive.optimize.sort.dynamic.partition.threshold=1;
2122
set hive.explain.user=false;
23+
2224
create external table ice_parquet_int(
2325
strcol string,
2426
intcol integer

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-- SORT_QUERY_RESULTS
2+
set hive.optimize.sort.dynamic.partition.threshold=1;
23
set hive.explain.user=false;
34

45
create external table target_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg stored as orc tblproperties ('format-version'='2');

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set hive.optimize.sort.dynamic.partition.threshold=1;
12
set hive.explain.user=false;
23

34
drop table if exists tbl_ice;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ POSTHOOK: query: insert into tbl_ice values (444, 'hola', 800), (555, 'schola',
5353
POSTHOOK: type: QUERY
5454
POSTHOOK: Input: _dummy_database@_dummy_table
5555
POSTHOOK: Output: default@tbl_ice
56-
Warning: Shuffle Join MERGEJOIN[66][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
57-
Warning: Shuffle Join MERGEJOIN[68][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3]] in Stage 'Reducer 4' is a cross product
56+
Warning: Shuffle Join MERGEJOIN[64][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
57+
Warning: Shuffle Join MERGEJOIN[66][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3]] in Stage 'Reducer 4' is a cross product
5858
PREHOOK: query: update tbl_ice set b='Changed again' where a in (select a from tbl_ice where a <= 5) or c in (select c from tbl_ice where c > 800)
5959
PREHOOK: type: QUERY
6060
PREHOOK: Input: default@tbl_ice

0 commit comments

Comments
 (0)