apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KYUUBI #4239] Remove duplicate buildConf methods and use KyuubiConf.buildConf directly

Browse Source 
### _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 <liangbowen@gf.com.cn>
Signed-off-by: liangbowen <liangbowen@gf.com.cn>
This commit is contained in:
liangbowen 2023-02-03 16:57:12 +08:00
parent 265aaf2854
commit f6778487ea
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/CtlConf.scala
View File

@ -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, " +

5
kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala
View File

@ -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")

5
kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/MetricsConf.scala
View File

@ -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")

5
kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStoreConf.scala
View File

@ -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()

5
kyuubi-zookeeper/src/main/scala/org/apache/kyuubi/zookeeper/ZookeeperConf.scala
View File

@ -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")