Use jUnit5 based HiveMetastoreExtension with HiveTests, remove HiveMetastoeTest

build.gradle

@@ -719,6 +719,7 @@ project(':iceberg-hive-metastore') {
     }
 
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
+    testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
     testImplementation libs.awaitility
   }
 }

core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java

@@ -164,6 +164,10 @@ protected boolean supportsNamesWithSlashes() {
     return true;
   }
 
+  protected boolean supportsNamesWithDot() {
+    return true;
+  }
+
   @Test
   public void testCreateNamespace() {
     C catalog = catalog();
@@ -470,6 +474,8 @@ public void testNamespaceWithSlash() {
 
   @Test
   public void testNamespaceWithDot() {
+    Assumptions.assumeTrue(supportsNamesWithDot());
+
     C catalog = catalog();
 
     Namespace withDot = Namespace.of("new.db");
@@ -547,6 +553,8 @@ public void testTableNameWithSlash() {
 
   @Test
   public void testTableNameWithDot() {
+    Assumptions.assumeTrue(supportsNamesWithDot());
+
     C catalog = catalog();
 
     TableIdentifier ident = TableIdentifier.of("ns", "ta.ble");

hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java

@@ -261,6 +261,16 @@ public void renameTable(TableIdentifier from, TableIdentifier originalTo) {
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
       throw new RuntimeException("Interrupted in call to rename", e);
+    } catch (RuntimeException e) {
+      // in case of table already exists,
+      // Hive rename operation throws exception as
+      // java.lang.RuntimeException:InvalidOperationException(message:new table <> already exists)
+      if (e.getCause() instanceof InvalidOperationException
+          && e.getCause().getMessage().contains(String.format("new table %s already exists", to))) {
+        throw new org.apache.iceberg.exceptions.AlreadyExistsException(
+            "Table already exists: %s", to);
+      }
+      throw new RuntimeException("Failed to rename " + from + " to " + to, e);
     }
   }
 
@@ -288,7 +298,7 @@ public void createNamespace(Namespace namespace, Map<String, String> meta) {
 
     } catch (AlreadyExistsException e) {
       throw new org.apache.iceberg.exceptions.AlreadyExistsException(
-          e, "Namespace '%s' already exists!", namespace);
+          e, "Namespace already exists: %s", namespace);
 
     } catch (TException e) {
       throw new RuntimeException(
@@ -500,6 +510,9 @@ protected String defaultWarehouseLocation(TableIdentifier tableIdentifier) {
         return String.format("%s/%s", databaseData.getLocationUri(), tableIdentifier.name());
       }
 
+    } catch (NoSuchObjectException e) {
+      throw new NoSuchNamespaceException(
+          e, "Namespace does not exist: %s", tableIdentifier.namespace().levels()[0]);
     } catch (TException e) {
       throw new RuntimeException(
           String.format("Metastore operation failed for %s", tableIdentifier), e);

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

@@ -217,7 +217,7 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
       String baseMetadataLocation = base != null ? base.metadataFileLocation() : null;
       if (!Objects.equals(baseMetadataLocation, metadataLocation)) {
         throw new CommitFailedException(
-            "Base metadata location '%s' is not same as the current table metadata location '%s' for %s.%s",
+            "Cannot commit: Base metadata location '%s' is not same as the current table metadata location '%s' for %s.%s",
             baseMetadataLocation, metadataLocation, database, tableName);
       }
 

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java

@@ -25,7 +25,11 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 import org.apache.iceberg.AppendFiles;
+import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.CatalogUtil;
 import org.apache.iceberg.DataFile;
 import org.apache.iceberg.DataFiles;
 import org.apache.iceberg.PartitionSpec;
@@ -43,12 +47,14 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-public class HiveCreateReplaceTableTest extends HiveMetastoreTest {
+public class HiveCreateReplaceTableTest {
 
+  private static final String DB_NAME = "hivedb";
   private static final String TABLE_NAME = "tbl";
   private static final TableIdentifier TABLE_IDENTIFIER = TableIdentifier.of(DB_NAME, TABLE_NAME);
   private static final Schema SCHEMA =
@@ -60,8 +66,23 @@ public class HiveCreateReplaceTableTest extends HiveMetastoreTest {
 
   private String tableLocation;
 
+  @RegisterExtension
+  private static final HiveMetastoreExtension HIVE_METASTORE_EXTENSION =
+      new HiveMetastoreExtension(DB_NAME, Collections.emptyMap());
+
+  private HiveCatalog catalog;
+
   @BeforeEach
   public void createTableLocation() throws IOException {
+    catalog =
+        (HiveCatalog)
+            CatalogUtil.loadCatalog(
+                HiveCatalog.class.getName(),
+                CatalogUtil.ICEBERG_CATALOG_TYPE_HIVE,
+                ImmutableMap.of(
+                    CatalogProperties.CLIENT_POOL_CACHE_EVICTION_INTERVAL_MS,
+                    String.valueOf(TimeUnit.SECONDS.toMillis(10))),
+                HIVE_METASTORE_EXTENSION.hiveConf());
     tableLocation = temp.resolve("hive-").toString();
   }
 

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveMetastoreExtension.java

@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iceberg.hive;
+
+import java.util.Map;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
+import org.apache.hadoop.hive.metastore.api.Database;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class HiveMetastoreExtension implements BeforeEachCallback, AfterEachCallback {
+  private HiveMetaStoreClient metastoreClient;
+  private TestHiveMetastore metastore;
+  private final Map<String, String> hiveConfOverride;
+  private final String databaseName;
+
+  public HiveMetastoreExtension(String databaseName, Map<String, String> hiveConfOverride) {
+    this.databaseName = databaseName;
+    this.hiveConfOverride = hiveConfOverride;
+  }
+
+  @Override
+  public void beforeEach(ExtensionContext extensionContext) throws Exception {
+    metastore = new TestHiveMetastore();
+    HiveConf hiveConfWithOverrides = new HiveConf(TestHiveMetastore.class);
+    if (hiveConfOverride != null) {
+      for (Map.Entry<String, String> kv : hiveConfOverride.entrySet()) {
+        hiveConfWithOverrides.set(kv.getKey(), kv.getValue());
+      }
+    }
+
+    metastore.start(hiveConfWithOverrides);
+    metastoreClient = new HiveMetaStoreClient(hiveConfWithOverrides);
+
+    String dbPath = metastore.getDatabasePath(databaseName);
+    Database db = new Database(databaseName, "description", dbPath, Maps.newHashMap());
+    metastoreClient.createDatabase(db);
+  }
+
+  @Override
+  public void afterEach(ExtensionContext extensionContext) throws Exception {
+    if (null != metastoreClient) {
+      metastoreClient.close();
+    }
+
+    if (null != metastore) {
+      metastore.stop();
+    }
+
+    metastoreClient = null;
+    metastore = null;
+  }
+
+  public HiveMetaStoreClient metastoreClient() {
+    return metastoreClient;
+  }
+
+  public HiveConf hiveConf() {
+    return metastore.hiveConf();
+  }
+
+  public TestHiveMetastore metastore() {
+    return metastore;
+  }
+}

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveTableBaseTest.java

@@ -26,22 +26,34 @@
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.apache.hadoop.fs.Path;
+import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.CatalogUtil;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.TableMetadataParser;
 import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
 import org.apache.iceberg.types.Types;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class HiveTableBaseTest extends HiveMetastoreTest {
+public class HiveTableBaseTest {
 
   static final String TABLE_NAME = "tbl";
+  static final String DB_NAME = "hivedb";
   static final TableIdentifier TABLE_IDENTIFIER = TableIdentifier.of(DB_NAME, TABLE_NAME);
 
+  @RegisterExtension
+  static final HiveMetastoreExtension HIVE_METASTORE_EXTENSION =
+      new HiveMetastoreExtension(DB_NAME, Collections.emptyMap());
+
+  HiveCatalog catalog;
+
   static final Schema schema =
       new Schema(Types.StructType.of(required(1, "id", Types.LongType.get())).fields());
 
@@ -54,23 +66,22 @@ public class HiveTableBaseTest extends HiveMetastoreTest {
 
   private static final PartitionSpec partitionSpec = builderFor(schema).identity("id").build();
 
-  private Path tableLocation;
-
   @BeforeEach
   public void createTestTable() {
-    this.tableLocation =
-        new Path(catalog.createTable(TABLE_IDENTIFIER, schema, partitionSpec).location());
-  }
-
-  @AfterEach
-  public void dropTestTable() throws Exception {
-    // drop the table data
-    tableLocation.getFileSystem(hiveConf).delete(tableLocation, true);
-    catalog.dropTable(TABLE_IDENTIFIER, false /* metadata only, location was already deleted */);
+    catalog =
+        (HiveCatalog)
+            CatalogUtil.loadCatalog(
+                HiveCatalog.class.getName(),
+                CatalogUtil.ICEBERG_CATALOG_TYPE_HIVE,
+                ImmutableMap.of(
+                    CatalogProperties.CLIENT_POOL_CACHE_EVICTION_INTERVAL_MS,
+                    String.valueOf(TimeUnit.SECONDS.toMillis(10))),
+                HIVE_METASTORE_EXTENSION.hiveConf());
+    catalog.createTable(TABLE_IDENTIFIER, schema, partitionSpec);
   }
 
   private static String getTableBasePath(String tableName) {
-    String databasePath = metastore.getDatabasePath(DB_NAME);
+    String databasePath = HIVE_METASTORE_EXTENSION.metastore().getDatabasePath(DB_NAME);
     return Paths.get(databasePath, tableName).toAbsolutePath().toString();
   }