Fix test failures

Author: zsmiskolczi

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -2129,7 +2129,7 @@ public static enum ConfVars {
         "If this is set to true, then all the data files being read should be withing the table location"),
     HIVE_ICEBERG_MATERIALIZEDVIEW_METADATA_LOCATION("hive.iceberg.materializedview.metadata.location", "metastore",
             new StringSet("metastore", "iceberg"),
-        "Location of materialized view matedata stored by iceberg"),
+        "Location of materialized view metadata stored by iceberg"),
     HIVE_USE_EXPLICIT_RCFILE_HEADER("hive.exec.rcfile.use.explicit.header", true,
         "If this is set the header for RCFiles will simply be RCF.  If this is not\n" +
         "set the header will be that borrowed from sequence files, e.g. SEQ- followed\n" +

iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveOperationsBase.java

@@ -148,9 +148,9 @@ static void validateTableOrMVIsIceberg(Table table, String fullName) {
 
   static void validateTableIsIcebergView(Table table, String fullName) {
     String tableTypeProp = table.getParameters().get(BaseMetastoreTableOperations.TABLE_TYPE_PROP);
+
     NoSuchIcebergViewException.check(
             (TableType.VIRTUAL_VIEW.name().equalsIgnoreCase(table.getTableType()) ||
-                    TableType.MATERIALIZED_VIEW.name().equalsIgnoreCase(table.getTableType()) ||
                     TableType.EXTERNAL_MATERIALIZED_VIEW.name().equalsIgnoreCase(table.getTableType())) &&
                     ICEBERG_VIEW_TYPE_VALUE.equalsIgnoreCase(tableTypeProp),
         "Not an iceberg view: %s (type=%s) (tableType=%s)",

iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java

@@ -26,6 +26,7 @@
 import java.util.stream.Collectors;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.common.StatsSetupConst;
+import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.IMetaStoreClient;
 import org.apache.hadoop.hive.metastore.TableType;
 import org.apache.hadoop.hive.metastore.api.InvalidObjectException;
@@ -118,8 +119,10 @@ protected void doRefresh() {
 
       // Check if we are trying to load an Iceberg View as a Table
       HiveOperationsBase.validateIcebergViewNotLoadedAsIcebergTable(table, fullName);
-      // Check if it is a valid Iceberg Table
-      HiveOperationsBase.validateTableOrMVIsIceberg(table, fullName);
+
+      if ("iceberg".equals(HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_ICEBERG_MATERIALIZEDVIEW_METADATA_LOCATION))) {
+        HiveOperationsBase.validateTableOrMVIsIceberg(table, fullName);
+      }
 
       metadataLocation = table.getParameters().get(METADATA_LOCATION_PROP);
 

iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/Catalogs.java

@@ -26,6 +26,7 @@
 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;
 import org.apache.iceberg.CatalogUtil;
 import org.apache.iceberg.PartitionSpec;
@@ -306,10 +307,14 @@ public static MaterializedView createMaterializedView(
           Configuration conf, Properties props, String viewOriginalText, String viewExpandedText,
           CreationMetadata creationMetadata) {
 
+    boolean isExternalMaterializedView = "iceberg".equals(
+        HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_ICEBERG_MATERIALIZEDVIEW_METADATA_LOCATION));
+
     Schema schema = schema(props);
     PartitionSpec spec = spec(props, schema);
     String location = props.getProperty(LOCATION);
-    String storageTableLocation = location + MATERIALIZED_VIEW_STORAGE_TABLE_IDENTIFIER_SUFFIX;
+    String storageTableLocation = location +
+        (isExternalMaterializedView ? MATERIALIZED_VIEW_STORAGE_TABLE_IDENTIFIER_SUFFIX : "");
     String catalogName = props.getProperty(InputFormatConfig.CATALOG_NAME);
 
     Optional<Catalog> catalog = loadCatalog(conf, catalogName);
@@ -323,7 +328,8 @@ public static MaterializedView createMaterializedView(
     ViewCatalog viewCatalog = (ViewCatalog) catalog.get();
 
     Map<String, String> map = filterIcebergTableProperties(props);
-    String storageTableIdentifier = name + MATERIALIZED_VIEW_STORAGE_TABLE_IDENTIFIER_SUFFIX;
+    String storageTableIdentifier = name +
+        (isExternalMaterializedView ? MATERIALIZED_VIEW_STORAGE_TABLE_IDENTIFIER_SUFFIX : "");
     Table storageTable = catalog.get().buildTable(TableIdentifier.parse(storageTableIdentifier), schema)
             .withPartitionSpec(spec).withLocation(storageTableLocation).withProperties(map).withSortOrder(sortOrder)
             .create();

iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/BaseHiveIcebergMetaHook.java

@@ -48,7 +48,6 @@
 import org.apache.hadoop.hive.ql.ddl.misc.sortoder.ZOrderFields;
 import org.apache.hadoop.hive.ql.util.NullOrdering;
 import org.apache.iceberg.BaseMetastoreTableOperations;
-import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.NullOrder;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.PartitionSpecParser;
@@ -560,12 +559,12 @@ public void postGetTable(org.apache.hadoop.hive.metastore.api.Table hmsTable) {
           case EXTERNAL_TABLE:
           case MATERIALIZED_VIEW:
             tbl = IcebergTableUtil.getTable(conf, hmsTable);
-            formatVersion = String.valueOf(((BaseTable) tbl).operations().current().formatVersion());
+            formatVersion = String.valueOf(TableUtil.formatVersion(tbl));
             break;
 
           case EXTERNAL_MATERIALIZED_VIEW:
             Catalogs.MaterializedView mv = IcebergTableUtil.getMaterializedView(conf, hmsTable, false);
-            formatVersion = String.valueOf(((BaseTable) mv.getStorageTable()).operations().current().formatVersion());
+            formatVersion = String.valueOf(TableUtil.formatVersion(mv.getStorageTable()));
 
             hmsTable.setViewOriginalText(mv.getView().properties().get(Catalogs.MATERIALIZED_VIEW_ORIGINAL_TEXT));
             hmsTable.setViewExpandedText(mv.getView().sqlFor("hive").sql());

iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java

@@ -37,6 +37,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.common.TableName;
+import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaHook;
 import org.apache.hadoop.hive.metastore.PartitionDropOptions;
 import org.apache.hadoop.hive.metastore.Warehouse;
@@ -194,8 +195,13 @@ public void commitCreateTable(org.apache.hadoop.hive.metastore.api.Table hmsTabl
       Table table;
       if (metadataLocation != null) {
         table = Catalogs.registerTable(conf, tableProperties, metadataLocation);
-      } else if ("MATERIALIZED_VIEW".equals(hmsTable.getTableType()) ||
-          "EXTERNAL_MATERIALIZED_VIEW".equals(hmsTable.getTableType())) {
+      } else if (
+          "iceberg".equals(HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_ICEBERG_MATERIALIZEDVIEW_METADATA_LOCATION)) &&
+            (
+              "MATERIALIZED_VIEW".equals(hmsTable.getTableType()) ||
+              "EXTERNAL_MATERIALIZED_VIEW".equals(hmsTable.getTableType())
+            )
+      ) {
         Catalogs.MaterializedView mv =
                 Catalogs.createMaterializedView(
                         conf,

iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveTableUtil.java

@@ -243,7 +243,10 @@ public static Table deserializeTable(Configuration config, String name) {
           config.getBoolean(hive_metastoreConstants.TABLE_IS_CTAS, false) &&
           StringUtils.isNotBlank(location)) {
       String type = config.get(InputFormatConfig.TABLE_TYPE);
-      if (HiveOperationsBase.ICEBERG_VIEW_TYPE_VALUE.equals(type)) {
+      if ("iceberg".equals(
+            HiveConf.getVar(config, HiveConf.ConfVars.HIVE_ICEBERG_MATERIALIZEDVIEW_METADATA_LOCATION)
+          ) && HiveOperationsBase.ICEBERG_VIEW_TYPE_VALUE.equals(type)) {
+
         location += Catalogs.MATERIALIZED_VIEW_STORAGE_TABLE_IDENTIFIER_SUFFIX;
       }
       table = readTableObjectFromFile(location, config);

iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergTableUtil.java

@@ -162,8 +162,15 @@ static Table getTable(Configuration configuration, org.apache.hadoop.hive.metast
               return v;
             });
 
-    if (TableType.MATERIALIZED_VIEW.name().equalsIgnoreCase(hmsTable.getTableType()) ||
-        TableType.EXTERNAL_MATERIALIZED_VIEW.name().equalsIgnoreCase(hmsTable.getTableType())) {
+    if (
+          "iceberg".equals(
+              HiveConf.getVar(configuration, HiveConf.ConfVars.HIVE_ICEBERG_MATERIALIZEDVIEW_METADATA_LOCATION)
+          ) &&
+          (
+            TableType.MATERIALIZED_VIEW.name().equalsIgnoreCase(hmsTable.getTableType()) ||
+            TableType.EXTERNAL_MATERIALIZED_VIEW.name().equalsIgnoreCase(hmsTable.getTableType())
+          )
+    ) {
       return getMaterializedView(configuration, hmsTable, skipCache).getStorageTable();
     }