fix unit test case failures

AnuragKDwivedi · Jan 31, 2025 · 18a057a · 18a057a
1 parent 825c881
commit 18a057a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveCommonClientConfig.java b/presto-hive-common/src/test/java/com/facebook/presto/hive/TestHiveCommonClientConfig.java
@@ -48,7 +48,7 @@ public void testDefaults()
                 .setParquetBatchReaderVerificationEnabled(false)
                 .setParquetBatchReadOptimizationEnabled(false)
                 .setReadNullMaskedParquetEncryptedValue(false)
-                .setCatalogName("catalogName"));
+                .setCatalogName(null));
     }
 
     @Test

diff --git a/...astore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java b/...astore/src/main/java/com/facebook/presto/hive/metastore/InMemoryCachingHiveMetastore.java
@@ -363,7 +363,7 @@ private Optional<Database> loadDatabase(KeyAndContext<String> databaseName)
     @Override
     public List<String> getDatabases(MetastoreContext metastoreContext, String pattern)
     {
-        return get(catalogDatabaseNames, getCachingKey(metastoreContext, pattern));
+        return get(catalogDatabaseNames, getCachingKey(metastoreContext, "*"));
     }
 
     private List<String> loadDatabases(KeyAndContext<String> pattern)

diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java b/presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java
@@ -1043,7 +1043,7 @@ protected final void setup(String databaseName, HiveClientConfig hiveClientConfi
                 new HiveFileRenamer(),
                 DEFAULT_COLUMN_CONVERTER_PROVIDER,
                 new QuickStatsProvider(metastoreClient, HDFS_ENVIRONMENT, DO_NOTHING_DIRECTORY_LISTER, new HiveClientConfig(), new NamenodeStats(), ImmutableList.of()),
-                new HiveTableWritabilityChecker(false), "hive");
+                new HiveTableWritabilityChecker(false), null);
 
         transactionManager = new HiveTransactionManager();
         encryptionInformationProvider = new HiveEncryptionInformationProvider(ImmutableList.of());

diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveCommitHandleOutput.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveCommitHandleOutput.java
@@ -260,14 +260,15 @@ private HiveMetadata getHiveMetadata(TestingExtendedHiveMetastore metastore, Hiv
                 new HiveFileRenamer(),
                 HiveColumnConverterProvider.DEFAULT_COLUMN_CONVERTER_PROVIDER,
                 new QuickStatsProvider(metastore, HDFS_ENVIRONMENT, DO_NOTHING_DIRECTORY_LISTER, new HiveClientConfig(), new NamenodeStats(), ImmutableList.of()),
-                new HiveTableWritabilityChecker(false), "catalogName");
+                new HiveTableWritabilityChecker(false), null);
 
         return hiveMetadataFactory.get();
     }
 
     private Partition createPartition(String partitionName, String partitionLocation)
     {
         Partition.Builder partitionBuilder = Partition.builder()
+                .setCatalogName(Optional.of("hive"))
                 .setDatabaseName(TEST_SCHEMA)
                 .setTableName(TEST_TABLE)
                 .setColumns(ImmutableList.of())

diff --git a/.../src/test/java/com/facebook/presto/hive/TestHiveMetadataFileFormatEncryptionSettings.java b/.../src/test/java/com/facebook/presto/hive/TestHiveMetadataFileFormatEncryptionSettings.java
@@ -141,7 +141,7 @@ public void setup()
                 new HiveFileRenamer(),
                 HiveColumnConverterProvider.DEFAULT_COLUMN_CONVERTER_PROVIDER,
                 new QuickStatsProvider(metastore, HDFS_ENVIRONMENT, HiveTestUtils.DO_NOTHING_DIRECTORY_LISTER, new HiveClientConfig(), new NamenodeStats(), ImmutableList.of()),
-                new HiveTableWritabilityChecker(false), "catalogName");
+                new HiveTableWritabilityChecker(false), null);
 
         metastore.createDatabase(METASTORE_CONTEXT, Database.builder()
                 .setDatabaseName(TEST_DB_NAME)