From 29bd229c2e1af467c68e79d368f11608083d55dd Mon Sep 17 00:00:00 2001 From: ZHONG ZHUANG Date: Wed, 23 Oct 2024 21:57:28 +0800 Subject: [PATCH] [FLINK-36594][hive]HiveCatalog should set HiveConf.hiveSiteLocation back --- .../java/org/apache/flink/table/catalog/hive/HiveCatalog.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java index da38771caed1c..11edd0c8120fd 100644 --- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java +++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java @@ -253,10 +253,14 @@ public static HiveConf createHiveConf( hadoopConf = new Configuration(); } // ignore all the static conf file URLs that HiveConf may have set + URL originalHiveSiteURL = HiveConf.getHiveSiteLocation(); HiveConf.setHiveSiteLocation(null); HiveConf.setLoadMetastoreConfig(false); HiveConf.setLoadHiveServer2Config(false); HiveConf hiveConf = new HiveConf(hadoopConf, HiveConf.class); + // set it back if there was a hive-site.xml to keep HiveConf behaviour as expected + HiveConf.setHiveSiteLocation(originalHiveSiteURL); + LOG.info("Setting hive conf dir as {}", hiveConfDir);