[iceberg] branch master updated: Hive: Fix compilation failure in TestHiveIcebergStorageHandlerNoScan and TestHiveIcebergStorageHandlerWithEngine. (#2459)

[pv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new 08c709e  Hive: Fix compilation failure in TestHiveIcebergStorageHandlerNoScan and TestHiveIcebergStorageHandlerWithEngine. (#2459)
08c709e is described below

commit 08c709ec10ebdbc67b0ad32e38331e798de36cd0
Author: László Pintér <47...@users.noreply.github.com>
AuthorDate: Mon Apr 12 16:42:21 2021 +0200

    Hive: Fix compilation failure in TestHiveIcebergStorageHandlerNoScan and TestHiveIcebergStorageHandlerWithEngine. (#2459)
---
 .../apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java   | 2 +-
 .../iceberg/mr/hive/TestHiveIcebergStorageHandlerWithEngine.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java b/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
index 9ace489..2b2eb6b 100644
--- a/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
+++ b/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
@@ -653,7 +653,7 @@ public class TestHiveIcebergStorageHandlerNoScan {
   @Test
   public void testIcebergHMSPropertiesTranslation() throws Exception {
     Assume.assumeTrue("Iceberg - HMS property translation is only relevant for HiveCatalog",
-        Catalogs.hiveCatalog(shell.getHiveConf()));
+        testTableType == TestTables.TestTableType.HIVE_CATALOG);
 
     TableIdentifier identifier = TableIdentifier.of("default", "customers");
 
diff --git a/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerWithEngine.java b/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerWithEngine.java
index c55f731..23404b8 100644
--- a/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerWithEngine.java
+++ b/mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerWithEngine.java
@@ -34,7 +34,6 @@ import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.data.GenericRecord;
 import org.apache.iceberg.data.Record;
 import org.apache.iceberg.hive.HiveSchemaUtil;
-import org.apache.iceberg.mr.Catalogs;
 import org.apache.iceberg.mr.TestHelper;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
 import org.apache.iceberg.relocated.com.google.common.collect.Lists;
@@ -667,7 +666,8 @@ public class TestHiveIcebergStorageHandlerWithEngine {
   @Test
   public void testWriteWithDefaultWriteFormat() {
     Assume.assumeTrue("Testing the default file format is enough for a single scenario.",
-        executionEngine.equals("mr") && Catalogs.hiveCatalog(shell.getHiveConf()) && fileFormat == FileFormat.ORC);
+        executionEngine.equals("mr") && testTableType == TestTables.TestTableType.HIVE_CATALOG &&
+                fileFormat == FileFormat.ORC);
 
     TableIdentifier identifier = TableIdentifier.of("default", "customers");