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

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


The following commit(s) were added to refs/heads/master by this push:
     new cae2b1e06aa HIVE-26617: Remove some useless properties (#3658)
cae2b1e06aa is described below

commit cae2b1e06aa5740d54bb9779b0fab0335ff19c0c
Author: dengzh <[email protected]>
AuthorDate: Mon Oct 17 10:56:54 2022 +0800

    HIVE-26617: Remove some useless properties (#3658)
---
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java   | 13 -------------
 .../hive/llap/cli/service/AsyncTaskCreateUdfFile.java       |  1 -
 .../org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java |  1 -
 .../apache/hadoop/hive/metastore/conf/MetastoreConf.java    |  6 ------
 .../src/test/org/apache/hive/streaming/TestStreaming.java   |  1 -
 5 files changed, 22 deletions(-)

diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java 
b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 0f8d4f7e791..f0b1a7c1bfd 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -1657,13 +1657,6 @@ public class HiveConf extends Configuration {
      */
     @Deprecated
     METASTORE_METRICS("hive.metastore.metrics.enabled", false, "Enable metrics 
on the metastore."),
-    /**
-     * @deprecated Use MetastoreConf.INIT_METADATA_COUNT_ENABLED
-     */
-    @Deprecated
-    
METASTORE_INIT_METADATA_COUNT_ENABLED("hive.metastore.initial.metadata.count.enabled",
 true,
-      "Enable a metadata count at metastore startup for metrics."),
-
     // Metastore SSL settings
     /**
      * @deprecated Use MetastoreConf.USE_SSL
@@ -3363,12 +3356,6 @@ public class HiveConf extends Configuration {
     @Deprecated
     
COMPACTOR_HISTORY_REAPER_INTERVAL("hive.compactor.history.reaper.interval", 
"2m",
       new TimeValidator(TimeUnit.MILLISECONDS), "Determines how often 
compaction history reaper runs"),
-    /**
-     * @deprecated Use MetastoreConf.ACID_HOUSEKEEPER_SERVICE_START
-     */
-    @Deprecated
-    HIVE_TIMEDOUT_TXN_REAPER_START("hive.timedout.txn.reaper.start", "100s",
-      new TimeValidator(TimeUnit.MILLISECONDS), "Time delay of 1st reaper run 
after metastore start"),
     /**
      * @deprecated Use MetastoreConf.ACID_HOUSEKEEPER_SERVICE_INTERVAL
      */
diff --git 
a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/service/AsyncTaskCreateUdfFile.java
 
b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/service/AsyncTaskCreateUdfFile.java
index 32b84fd7af6..01fd8b6e009 100644
--- 
a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/service/AsyncTaskCreateUdfFile.java
+++ 
b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/service/AsyncTaskCreateUdfFile.java
@@ -92,7 +92,6 @@ class AsyncTaskCreateUdfFile implements Callable<Void> {
     Map<String, String> udfs = new HashMap<String, String>();
     HiveConf hiveConf = new HiveConf(conf);
     // disable expensive operations on the metastore
-    
hiveConf.setBoolean(MetastoreConf.ConfVars.INIT_METADATA_COUNT_ENABLED.getVarname(),
 false);
     hiveConf.setBoolean(MetastoreConf.ConfVars.METRICS_ENABLED.getVarname(), 
false);
     // performance problem: ObjectStore does its own new HiveConf()
     Hive hive = Hive.getWithFastCheck(hiveConf, false);
diff --git 
a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java 
b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java
index f99522fa8ef..c2d93e0f95e 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager.java
@@ -536,7 +536,6 @@ public class TestDbTxnManager {
     nextInput = 1;
     readEntities = new HashSet<ReadEntity>();
     writeEntities = new HashSet<WriteEntity>();
-    MetastoreConf.setTimeVar(conf, 
MetastoreConf.ConfVars.ACID_HOUSEKEEPER_SERVICE_START, 0, TimeUnit.SECONDS);
     MetastoreConf.setTimeVar(conf, MetastoreConf.ConfVars.TXN_TIMEOUT, 10, 
TimeUnit.SECONDS);
     houseKeeperService = new AcidHouseKeeperService();
     MetastoreConf.setTimeVar(conf, MetastoreConf.ConfVars.REPL_TXN_TIMEOUT, 
30, TimeUnit.SECONDS);
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
index 10cc758ea76..d3c08a540cf 100644
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
+++ 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
@@ -286,9 +286,6 @@ public class MetastoreConf {
     ACID_HOUSEKEEPER_SERVICE_INTERVAL("metastore.acid.housekeeper.interval",
         "hive.metastore.acid.housekeeper.interval", 60, TimeUnit.SECONDS,
         "Time interval describing how often the acid housekeeper runs."),
-    ACID_HOUSEKEEPER_SERVICE_START("metastore.acid.housekeeper.start",
-        "hive.metastore.acid.housekeeper.start", 60, TimeUnit.SECONDS,
-        "Time delay of 1st acid housekeeper run after metastore has started."),
     ACID_TXN_CLEANER_INTERVAL("metastore.acid.txn.cleaner.interval",
         "hive.metastore.acid.txn.cleaner.interval", 10, TimeUnit.SECONDS,
         "Time interval describing how often aborted and committed txns are 
cleaned."),
@@ -856,9 +853,6 @@ public class MetastoreConf {
     INIT_HOOKS("metastore.init.hooks", "hive.metastore.init.hooks", "",
         "A comma separated list of hooks to be invoked at the beginning of 
HMSHandler initialization. \n" +
             "An init hook is specified as the name of Java class which extends 
org.apache.riven.MetaStoreInitListener."),
-    INIT_METADATA_COUNT_ENABLED("metastore.initial.metadata.count.enabled",
-        "hive.metastore.initial.metadata.count.enabled", true,
-        "Enable a metadata count at metastore startup for metrics."),
     INTEGER_JDO_PUSHDOWN("metastore.integral.jdo.pushdown",
         "hive.metastore.integral.jdo.pushdown", false,
         "Allow JDO query pushdown for integral partition columns in metastore. 
Off by default. This\n" +
diff --git a/streaming/src/test/org/apache/hive/streaming/TestStreaming.java 
b/streaming/src/test/org/apache/hive/streaming/TestStreaming.java
index 277081750cf..37c64429b78 100644
--- a/streaming/src/test/org/apache/hive/streaming/TestStreaming.java
+++ b/streaming/src/test/org/apache/hive/streaming/TestStreaming.java
@@ -1367,7 +1367,6 @@ public class TestStreaming {
       .connect();
 
     connection.beginTransaction();
-    conf.setTimeVar(HiveConf.ConfVars.HIVE_TIMEDOUT_TXN_REAPER_START, 0, 
TimeUnit.SECONDS);
     //ensure txn timesout
     conf.setTimeVar(HiveConf.ConfVars.HIVE_TXN_TIMEOUT, 2, 
TimeUnit.MILLISECONDS);
     AcidHouseKeeperService houseKeeperService = new AcidHouseKeeperService();

Reply via email to