You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by bo...@apache.org on 2023/02/03 08:57:24 UTC
[kyuubi] branch master updated: [KYUUBI #4239] Remove duplicate buildConf methods and use `KyuubiConf.buildConf` directly
This is an automated email from the ASF dual-hosted git repository.
bowenliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new f6778487e [KYUUBI #4239] Remove duplicate buildConf methods and use `KyuubiConf.buildConf` directly
f6778487e is described below
commit f6778487ea8071443fe185114dd74f7d6326f1ad
Author: liangbowen <li...@gf.com.cn>
AuthorDate: Fri Feb 3 16:57:12 2023 +0800
[KYUUBI #4239] Remove duplicate buildConf methods and use `KyuubiConf.buildConf` directly
### _Why are the changes needed?_
- Remove duplicate buildConf methods in a series configs , change to import and use `KyuubiConf.buildConf` directly
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [x] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #4239 from bowenliang123/duplicate-buildconf.
Closes #4239
04495e69 [liangbowen] remove duplciate buildConf methods
Authored-by: liangbowen <li...@gf.com.cn>
Signed-off-by: liangbowen <li...@gf.com.cn>
---
kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/CtlConf.scala | 5 ++---
.../src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala | 5 ++---
.../src/main/scala/org/apache/kyuubi/metrics/MetricsConf.scala | 5 ++---
.../apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala | 5 ++---
.../src/main/scala/org/apache/kyuubi/zookeeper/ZookeeperConf.scala | 5 ++---
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/CtlConf.scala b/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/CtlConf.scala
index f299a5a88..58b65582a 100644
--- a/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/CtlConf.scala
+++ b/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/CtlConf.scala
@@ -19,12 +19,11 @@ package org.apache.kyuubi.ctl
import java.time.Duration
-import org.apache.kyuubi.config.{ConfigBuilder, ConfigEntry, KyuubiConf, OptionalConfigEntry}
+import org.apache.kyuubi.config.{ConfigEntry, OptionalConfigEntry}
+import org.apache.kyuubi.config.KyuubiConf.buildConf
object CtlConf {
- private def buildConf(key: String): ConfigBuilder = KyuubiConf.buildConf(key)
-
val CTL_REST_CLIENT_BASE_URL: OptionalConfigEntry[String] =
buildConf("kyuubi.ctl.rest.base.url")
.doc("The REST API base URL, " +
diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala
index 6052e31f5..148a21e4d 100644
--- a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala
+++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala
@@ -21,14 +21,13 @@ import java.time.Duration
import org.apache.hadoop.security.UserGroupInformation
-import org.apache.kyuubi.config.{ConfigBuilder, ConfigEntry, KyuubiConf, OptionalConfigEntry}
+import org.apache.kyuubi.config.{ConfigEntry, KyuubiConf, OptionalConfigEntry}
+import org.apache.kyuubi.config.KyuubiConf.buildConf
import org.apache.kyuubi.ha.client.AuthTypes
import org.apache.kyuubi.ha.client.RetryPolicies
object HighAvailabilityConf {
- private def buildConf(key: String): ConfigBuilder = KyuubiConf.buildConf(key)
-
@deprecated("using kyuubi.ha.addresses instead", "1.6.0")
val HA_ZK_QUORUM: ConfigEntry[String] = buildConf("kyuubi.ha.zookeeper.quorum")
.doc("(deprecated) The connection string for the ZooKeeper ensemble")
diff --git a/kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/MetricsConf.scala b/kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/MetricsConf.scala
index daa221b78..ad734ced5 100644
--- a/kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/MetricsConf.scala
+++ b/kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/MetricsConf.scala
@@ -19,13 +19,12 @@ package org.apache.kyuubi.metrics
import java.time.Duration
-import org.apache.kyuubi.config.{ConfigBuilder, ConfigEntry, KyuubiConf}
+import org.apache.kyuubi.config.ConfigEntry
+import org.apache.kyuubi.config.KyuubiConf.buildConf
import org.apache.kyuubi.metrics.ReporterType._
object MetricsConf {
- private def buildConf(key: String): ConfigBuilder = KyuubiConf.buildConf(key)
-
val METRICS_ENABLED: ConfigEntry[Boolean] =
buildConf("kyuubi.metrics.enabled")
.doc("Set to true to enable kyuubi metrics system")
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala
index 84067b8d0..de30b6e66 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala
@@ -19,13 +19,12 @@ package org.apache.kyuubi.server.metadata.jdbc
import java.util.{Locale, Properties}
-import org.apache.kyuubi.config.{ConfigBuilder, ConfigEntry, KyuubiConf, OptionalConfigEntry}
+import org.apache.kyuubi.config.{ConfigEntry, KyuubiConf, OptionalConfigEntry}
+import org.apache.kyuubi.config.KyuubiConf.buildConf
object JDBCMetadataStoreConf {
final val METADATA_STORE_JDBC_DATASOURCE_PREFIX = "kyuubi.metadata.store.jdbc.datasource"
- private def buildConf(key: String): ConfigBuilder = KyuubiConf.buildConf(key)
-
/** Get metadata store jdbc datasource properties. */
def getMetadataStoreJDBCDataSourceProperties(conf: KyuubiConf): Properties = {
val datasourceProperties = new Properties()
diff --git a/kyuubi-zookeeper/src/main/scala/org/apache/kyuubi/zookeeper/ZookeeperConf.scala b/kyuubi-zookeeper/src/main/scala/org/apache/kyuubi/zookeeper/ZookeeperConf.scala
index ee1fe00dc..c6256a5e3 100644
--- a/kyuubi-zookeeper/src/main/scala/org/apache/kyuubi/zookeeper/ZookeeperConf.scala
+++ b/kyuubi-zookeeper/src/main/scala/org/apache/kyuubi/zookeeper/ZookeeperConf.scala
@@ -17,12 +17,11 @@
package org.apache.kyuubi.zookeeper
-import org.apache.kyuubi.config.{ConfigBuilder, ConfigEntry, KyuubiConf, OptionalConfigEntry}
+import org.apache.kyuubi.config.{ConfigEntry, OptionalConfigEntry}
+import org.apache.kyuubi.config.KyuubiConf.buildConf
object ZookeeperConf {
- private def buildConf(key: String): ConfigBuilder = KyuubiConf.buildConf(key)
-
@deprecated("using kyuubi.zookeeper.embedded.client.port instead", since = "1.2.0")
val EMBEDDED_ZK_PORT: ConfigEntry[Int] = buildConf("kyuubi.zookeeper.embedded.port")
.doc("The port of the embedded ZooKeeper server")