HIVE-27073: Apply SerDe properties when creating materialized view (K…

…risztian Kasa, reviewed by Laszlo Vegh, Steve Carlin)
apache · Feb 15, 2023 · 6f480cd · 6f480cd
1 parent ca9e6c2
commit 6f480cd
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc.q b/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc.q
@@ -2,6 +2,8 @@
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask random snapshot id
 --! qt:replace:/(\s+current-snapshot-id\s+)\d+(\s*)/$1#SnapshotId#/
+-- Mask the totalSize value as it can change at file format library update
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- SORT_QUERY_RESULTS
 
 drop materialized view if exists mat1;

diff --git a/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc2.q b/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc2.q
@@ -1,6 +1,8 @@
 -- MV data is stored by partitioned iceberg with partition spec
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 --! qt:replace:/(\s+current-snapshot-id\s+)\d+(\s*)/$1#SnapshotId#/
+-- Mask the totalSize value as it can change at file format library update
+--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- SORT_QUERY_RESULTS
 
 drop materialized view if exists mat1;

diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
@@ -64,16 +64,17 @@ Table Parameters:
 	current-snapshot-id 	#SnapshotId#
 	engine.hive.enabled 	true                
 	format-version      	1                   
-	iceberg.orc.files.only	false               
+	iceberg.orc.files.only	true                
 	metadata_location   	hdfs://### HDFS PATH ###
 	numFiles            	2                   
 	numRows             	2                   
 	previous_metadata_location	hdfs://### HDFS PATH ###
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	1282                
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	uuid                	#Masked#
+	write.format.default	orc                 
 
 # Storage Information	 	 
 SerDe Library:      	org.apache.iceberg.mr.hive.HiveIcebergSerDe	 
@@ -143,17 +144,18 @@ Table Parameters:
 	current-snapshot-id 	#SnapshotId#
 	engine.hive.enabled 	true                
 	format-version      	2                   
-	iceberg.orc.files.only	false               
+	iceberg.orc.files.only	true                
 	metadata_location   	hdfs://### HDFS PATH ###
 	numFiles            	2                   
 	numRows             	2                   
 	previous_metadata_location	hdfs://### HDFS PATH ###
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	1282                
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
+	write.format.default	orc                 
 	write.merge.mode    	merge-on-read       
 	write.update.mode   	merge-on-read       
 

diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
@@ -65,16 +65,17 @@ Table Parameters:
 	current-snapshot-id 	#SnapshotId#
 	engine.hive.enabled 	true                
 	format-version      	1                   
-	iceberg.orc.files.only	false               
+	iceberg.orc.files.only	true                
 	metadata_location   	hdfs://### HDFS PATH ###
 	numFiles            	2                   
 	numRows             	2                   
 	previous_metadata_location	hdfs://### HDFS PATH ###
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	1282                
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	uuid                	#Masked#
+	write.format.default	orc                 
 
 # Storage Information	 	 
 SerDe Library:      	org.apache.iceberg.mr.hive.HiveIcebergSerDe	 
@@ -145,17 +146,18 @@ Table Parameters:
 	current-snapshot-id 	#SnapshotId#
 	engine.hive.enabled 	true                
 	format-version      	2                   
-	iceberg.orc.files.only	false               
+	iceberg.orc.files.only	true                
 	metadata_location   	hdfs://### HDFS PATH ###
 	numFiles            	2                   
 	numRows             	2                   
 	previous_metadata_location	hdfs://### HDFS PATH ###
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	1282                
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
+	write.format.default	orc                 
 	write.merge.mode    	merge-on-read       
 	write.update.mode   	merge-on-read       
 

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/create/CreateMaterializedViewDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/create/CreateMaterializedViewDesc.java
@@ -349,6 +349,12 @@ public Table toTable(HiveConf conf) throws HiveException {
           org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_STORAGE,
           getStorageHandler());
     }
+    if (getSerdeProps() != null) {
+      for (Map.Entry<String, String> entry : getSerdeProps().entrySet()) {
+        tbl.setSerdeParam(entry.getKey(), entry.getValue());
+      }
+    }
+
     HiveStorageHandler storageHandler = tbl.getStorageHandler();
 
     setColumnsAndStorePartitionTransformSpecOfTable(getSchema(), getPartCols(), conf, tbl);