You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by vi...@apache.org on 2021/12/31 09:13:04 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #1665] Rename FlinkEngineProcessBuilder to FlinkProcessBuilder to align with SparkProcessBuilder
This is an automated email from the ASF dual-hosted git repository.
vinoyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 3eaa1d8 [KYUUBI #1665] Rename FlinkEngineProcessBuilder to FlinkProcessBuilder to align with SparkProcessBuilder
3eaa1d8 is described below
commit 3eaa1d86c8da03d9f568847f3300c1cda82be7a3
Author: yanghua <ya...@gmail.com>
AuthorDate: Fri Dec 31 17:12:53 2021 +0800
[KYUUBI #1665] Rename FlinkEngineProcessBuilder to FlinkProcessBuilder to align with SparkProcessBuilder
…r to align with SparkProcessBuilder
<!--
Thanks for sending a pull request!
Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->
### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
1. If you add a feature, you can talk about the use case of it.
2. If you fix a bug, you can clarify why it is a bug.
-->
### _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
- [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #1666 from yanghua/KYUUBI-1665.
Closes #1665
569becd3 [yanghua] [KYUUBI #1665] Rename FlinkEngineProcessBuilder to FlinkProcessBuilder to align with SparkProcessBuilder
Authored-by: yanghua <ya...@gmail.com>
Signed-off-by: yanghua <ya...@gmail.com>
---
.../src/main/scala/org/apache/kyuubi/engine/EngineRef.scala | 10 +++++-----
.../apache/kyuubi/engine/flink/FlinkEngineProcessBuilder.scala | 6 +++---
.../apache/kyuubi/WithKyuubiServerAndFlinkLocalCluster.scala | 4 ++--
...rocessBuilderSuite.scala => FlinkProcessBuilderSuite.scala} | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
index 6f8dd74..34c59f5 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
@@ -34,7 +34,7 @@ import org.apache.kyuubi.config.KyuubiConf
import org.apache.kyuubi.config.KyuubiConf._
import org.apache.kyuubi.engine.EngineType.{EngineType, FLINK_SQL, SPARK_SQL}
import org.apache.kyuubi.engine.ShareLevel.{CONNECTION, GROUP, SERVER, ShareLevel}
-import org.apache.kyuubi.engine.flink.FlinkEngineProcessBuilder
+import org.apache.kyuubi.engine.flink.FlinkProcessBuilder
import org.apache.kyuubi.engine.spark.SparkProcessBuilder
import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_ENGINE_REF_ID
import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_NAMESPACE
@@ -186,14 +186,14 @@ private[kyuubi] class EngineRef(
conf.getOption(SparkProcessBuilder.TAG_KEY).map(_ + ",").getOrElse("") + "KYUUBI")
new SparkProcessBuilder(appUser, conf, extraEngineLog)
case FLINK_SQL =>
- conf.setIfMissing(FlinkEngineProcessBuilder.APP_KEY, defaultEngineName)
+ conf.setIfMissing(FlinkProcessBuilder.APP_KEY, defaultEngineName)
// tag is a seq type with comma-separated
conf.set(
- FlinkEngineProcessBuilder.TAG_KEY,
- conf.getOption(FlinkEngineProcessBuilder.TAG_KEY).map(_ + ",").getOrElse("") + "KYUUBI")
+ FlinkProcessBuilder.TAG_KEY,
+ conf.getOption(FlinkProcessBuilder.TAG_KEY).map(_ + ",").getOrElse("") + "KYUUBI")
conf.set(HA_ZK_NAMESPACE, engineSpace)
conf.set(HA_ZK_ENGINE_REF_ID, engineRefId)
- new FlinkEngineProcessBuilder(appUser, conf, extraEngineLog)
+ new FlinkProcessBuilder(appUser, conf, extraEngineLog)
}
MetricsSystem.tracing(_.incCount(ENGINE_TOTAL))
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilder.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilder.scala
index ca9fc83..8a02caf 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilder.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilder.scala
@@ -27,13 +27,13 @@ import org.apache.kyuubi._
import org.apache.kyuubi.config.KyuubiConf
import org.apache.kyuubi.config.KyuubiConf.ENGINE_FLINK_MAIN_RESOURCE
import org.apache.kyuubi.engine.ProcBuilder
-import org.apache.kyuubi.engine.flink.FlinkEngineProcessBuilder.FLINK_ENGINE_BINARY_FILE
+import org.apache.kyuubi.engine.flink.FlinkProcessBuilder.FLINK_ENGINE_BINARY_FILE
import org.apache.kyuubi.operation.log.OperationLog
/**
* A builder to build flink sql engine progress.
*/
-class FlinkEngineProcessBuilder(
+class FlinkProcessBuilder(
override val proxyUser: String,
override val conf: KyuubiConf,
val extraEngineLog: Option[OperationLog] = None)
@@ -164,7 +164,7 @@ class FlinkEngineProcessBuilder(
private def useKeytab(): Boolean = false
}
-object FlinkEngineProcessBuilder {
+object FlinkProcessBuilder {
final val APP_KEY = "yarn.application.name"
final val TAG_KEY = "yarn.tags"
diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerAndFlinkLocalCluster.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerAndFlinkLocalCluster.scala
index 445f6fd..a6d5d92 100644
--- a/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerAndFlinkLocalCluster.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerAndFlinkLocalCluster.scala
@@ -19,12 +19,12 @@ package org.apache.kyuubi
import scala.sys.process._
-import org.apache.kyuubi.engine.flink.FlinkEngineProcessBuilder
+import org.apache.kyuubi.engine.flink.FlinkProcessBuilder
trait WithKyuubiServerAndFlinkLocalCluster extends WithKyuubiServer {
private lazy val FLINK_HOME: String =
- new FlinkEngineProcessBuilder(Utils.currentUser, conf).FLINK_HOME
+ new FlinkProcessBuilder(Utils.currentUser, conf).FLINK_HOME
override def beforeAll(): Unit = {
s"$FLINK_HOME/bin/start-cluster.sh".!
diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilderSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala
similarity index 89%
rename from kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilderSuite.scala
rename to kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala
index c111e00..94c5cb4 100644
--- a/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkEngineProcessBuilderSuite.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilderSuite.scala
@@ -20,11 +20,11 @@ package org.apache.kyuubi.engine.flink
import org.apache.kyuubi.KyuubiFunSuite
import org.apache.kyuubi.config.KyuubiConf
-class FlinkEngineProcessBuilderSuite extends KyuubiFunSuite {
+class FlinkProcessBuilderSuite extends KyuubiFunSuite {
private def conf = KyuubiConf().set("kyuubi.on", "off")
test("flink engine process builder") {
- val builder = new FlinkEngineProcessBuilder("vinoyang", conf)
+ val builder = new FlinkProcessBuilder("vinoyang", conf)
val commands = builder.toString.split(' ')
assert(commands.exists(_ endsWith "flink-sql-engine.sh"))
}