This is an automated email from the ASF dual-hosted git repository.
mbod 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 918e4e3 HIVE-25658: Fix regex for masking totalSize table properties
in Iceberg q-tests (Marton Bod, reviewed by Adam Szita)
918e4e3 is described below
commit 918e4e3bb535be095f336bb7742e92471357ec05
Author: Marton Bod <m...@cloudera.com>
AuthorDate: Thu Oct 28 17:11:02 2021 +0200
HIVE-25658: Fix regex for masking totalSize table properties in Iceberg
q-tests (Marton Bod, reviewed by Adam Szita)
---
.../src/test/queries/positive/alter_multi_part_table_to_iceberg.q | 4 ++--
.../src/test/queries/positive/alter_part_table_to_iceberg.q | 4 ++--
.../src/test/queries/positive/alter_table_to_iceberg.q | 4 ++--
.../src/test/queries/positive/truncate_partitioned_iceberg_table.q | 4 ++--
.../test/results/positive/alter_multi_part_table_to_iceberg.q.out | 6 +++---
.../src/test/results/positive/alter_part_table_to_iceberg.q.out | 6 +++---
.../src/test/results/positive/alter_table_to_iceberg.q.out | 6 +++---
.../test/results/positive/truncate_partitioned_iceberg_table.q.out | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
b/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
index 99ba2f3..2a314ab 100644
---
a/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
+++
b/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
@@ -1,5 +1,5 @@
--- Mask the totalSize value as it can change whenever the file format (e.g.
ORC) version changes
---! qt:replace:/(\s+totalSize\s+)[\S+](\s+)/$1#Masked#$2/
+-- Mask the totalSize value as it can have slight variability, causing test
flakiness
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
set hive.vectorized.execution.enabled=false;
diff --git
a/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
b/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
index 6105ef2..8620515 100644
---
a/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
+++
b/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
@@ -1,5 +1,5 @@
--- Mask the totalSize value as it can change whenever the file format (e.g.
ORC) version changes
---! qt:replace:/(\s+totalSize\s+)[\S+](\s+)/$1#Masked#$2/
+-- Mask the totalSize value as it can have slight variability, causing test
flakiness
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
set hive.vectorized.execution.enabled=false;
diff --git
a/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
b/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
index 58afecb..dc251fc 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
@@ -1,5 +1,5 @@
--- Mask the totalSize value as it can change whenever the file format (e.g.
ORC) version changes
---! qt:replace:/(\s+totalSize\s+)[\S+](\s+)/$1#Masked#$2/
+-- Mask the totalSize value as it can have slight variability, causing test
flakiness
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
set hive.vectorized.execution.enabled=false;
diff --git
a/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
b/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
index 4ac492c..0bb98c7 100644
---
a/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
+++
b/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
@@ -1,6 +1,6 @@
-- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can change whenever the file format (e.g.
ORC) version changes
---! qt:replace:/(\s+totalSize\s+)[\S+](\s+)/$1#Masked#$2/
+-- Mask the totalSize value as it can have slight variability, causing test
flakiness
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
set hive.vectorized.execution.enabled=false;
diff --git
a/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
b/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
index 9e83312..2d00101 100644
---
a/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
+++
b/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
@@ -194,7 +194,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 1329
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default orc
@@ -433,7 +433,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 2899
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default parquet
@@ -672,7 +672,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 1843
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default avro
diff --git
a/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
b/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
index cdc6ca3..46e4797 100644
---
a/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
+++
b/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
@@ -152,7 +152,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 759
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default orc
@@ -343,7 +343,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 1659
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default parquet
@@ -534,7 +534,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 1054
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default avro
diff --git
a/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
b/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
index 90e70fd..d278e75 100644
---
a/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
+++
b/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
@@ -108,7 +108,7 @@ Table Parameters:
rawDataSize 455
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 322
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default orc
@@ -251,7 +251,7 @@ Table Parameters:
rawDataSize 116
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 607
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default parquet
@@ -394,7 +394,7 @@ Table Parameters:
rawDataSize 0
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 351
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default avro
diff --git
a/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
b/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
index c2e392c..0a63478 100644
---
a/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
+++
b/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
@@ -104,7 +104,7 @@ Table Parameters:
previous_metadata_location hdfs://### HDFS PATH ###
storage_handler
org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
table_type ICEBERG
- totalSize 1074
+ totalSize #Masked#
#### A masked pattern was here ####
write.format.default avro
