Fix test failure after rebase

zsmiskolczi · zsmiskolczi · commit d7178ee35f73 · 2026-06-29T09:23:16.000+02:00
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/Catalogs.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/Catalogs.java
@@ -19,6 +19,12 @@
 
 package org.apache.iceberg.mr;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.UUID;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.api.CreationMetadata;
@@ -50,13 +56,6 @@
 import org.apache.iceberg.view.View;
 import org.apache.iceberg.view.ViewVersion;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
 /**
  * Class for catalog resolution and accessing the common functions for {@link Catalog} API.
  *
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/BaseHiveIcebergMetaHook.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/BaseHiveIcebergMetaHook.java
@@ -152,7 +152,7 @@ public void preCreateTable(CreateTableRequest request) {
 
     setTableTypeForNonHiveCatalogBasedTables(hmsTable);
 
-    storeViewTextInfoForMaterializedView(request, tableType);
+    storeViewTextInfoForMaterializedView(request, Enum.valueOf(TableType.class, hmsTable.getTableType()));
 
     if (!Catalogs.hiveCatalog(conf, tableProperties)) {
       if (Boolean.parseBoolean(this.tableProperties.getProperty(hive_metastoreConstants.TABLE_IS_CTLT))) {
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
@@ -395,13 +395,6 @@ private void doPreAlterTable(org.apache.hadoop.hive.metastore.api.Table hmsTable
     }
 
     handleAlterTableOperationBasedOnType(hmsTable, context);
-
-    // Migration case is already handled above, in case of migration we don't have all the properties set till this
-    // point.
-    if (!isTableMigration) {
-      // Set whether the format is ORC, to be used during vectorization.
-      setOrcOnlyFilesParam(hmsTable);
-    }
   }
 
   private void handleAlterTableOperationBasedOnType(
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergOutputCommitter.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergOutputCommitter.java
@@ -19,6 +19,23 @@
 
 package org.apache.iceberg.mr.hive;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -83,24 +100,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 /**
  * An Iceberg table committer for adding data files to the Iceberg tables.
  * Currently independent of the Hive ACID transactions.
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/mv_iceberg_native.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/mv_iceberg_native.q.out
@@ -219,7 +219,6 @@ TBLPROPERTIES (
   'iceberg.materialized.view'='true', 
   'iceberg.materialized.view.original.text'='select b, c from tbl_ice_native where c > 52', 
   'iceberg.materialized.view.storage.table'='default.mat_native_storage_table', 
-  'iceberg.orc.files.only'='false', 
   'max-staleness-ms'='1000', 
 #### A masked pattern was here ####
   'table_type'='ICEBERG-VIEW', 
@@ -249,7 +248,6 @@ Table Parameters:
 	iceberg.materialized.view	true                
 	iceberg.materialized.view.original.text	select b, c from tbl_ice_native where c > 52
 	iceberg.materialized.view.storage.table	default.mat_native_storage_table
-	iceberg.orc.files.only	false               
 	max-staleness-ms    	1000                
 #### A masked pattern was here ####
 	numFiles            	1                   
@@ -333,7 +331,6 @@ TBLPROPERTIES (
   'iceberg.materialized.view'='true', 
   'iceberg.materialized.view.original.text'='select b, c from tbl_ice_native where c > 52', 
   'iceberg.materialized.view.storage.table'='default.mat_native_orc_storage_table', 
-  'iceberg.orc.files.only'='false', 
   'max-staleness-ms'='1000', 
 #### A masked pattern was here ####
   'table_type'='ICEBERG-VIEW', 
@@ -417,7 +414,6 @@ Table Parameters:
 	iceberg.materialized.view	true                
 	iceberg.materialized.view.original.text	select b, c from tbl_ice_native where c > 52
 	iceberg.materialized.view.storage.table	default.mat_native_orc_storage_table
-	iceberg.orc.files.only	false               
 	max-staleness-ms    	1000                
 #### A masked pattern was here ####
 	numFiles            	1                   
@@ -554,7 +550,6 @@ Table Parameters:
 	iceberg.materialized.view	true                
 	iceberg.materialized.view.original.text	select b, c from tbl_ice_native where c > 52
 	iceberg.materialized.view.storage.table	default.mat_native_orc_partitioned_storage_table
-	iceberg.orc.files.only	false               
 #### A masked pattern was here ####
 	numFiles            	3                   
 	numPartitions       	3                   
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
@@ -18,11 +18,6 @@
 
 package org.apache.hadoop.hive.ql.ddl.view.create;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.common.StatsSetupConst;
@@ -34,7 +29,6 @@
 import org.apache.hadoop.hive.ql.ddl.DDLDescWithTableProperties;
 import org.apache.hadoop.hive.ql.ddl.DDLUtils;
 import org.apache.hadoop.hive.ql.exec.Utilities;
-import org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler;
 import org.apache.hadoop.hive.ql.metadata.Table;
@@ -44,6 +38,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import static org.apache.hadoop.hive.ql.ddl.DDLUtils.setColumnsAndStorePartitionTransformSpecOfTable;
 
 /**
@@ -233,7 +232,7 @@ public Table toTable(HiveConf conf) throws HiveException {
 
     HiveStorageHandler storageHandler = tbl.getStorageHandler();
 
-    if (storageHandler != null && storageHandler.getClass().equals("org.apache.iceberg.mr.hive.HiveIcebergStorageHandler")){
+    if (storageHandler != null && storageHandler.getClass().getName().equals("org.apache.iceberg.mr.hive.HiveIcebergStorageHandler")){
       tbl.setTableType(TableType.EXTERNAL_MATERIALIZED_VIEW);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -395,13 +395,6 @@ private void doPreAlterTable(org.apache.hadoop.hive.metastore.api.Table hmsTable`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`handleAlterTableOperationBasedOnType(hmsTable, context);`
`398`		`-`
`399`		`- // Migration case is already handled above, in case of migration we don't have all the properties set till this`
`400`		`- // point.`
`401`		`- if (!isTableMigration) {`
`402`		`- // Set whether the format is ORC, to be used during vectorization.`
`403`		`- setOrcOnlyFilesParam(hmsTable);`
`404`		`- }`
`405`	`398`	`}`
`406`	`399`
`407`	`400`	`private void handleAlterTableOperationBasedOnType(`