You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/04/21 07:22:21 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #2424] [Improvement] add Flink compile version and Trino client compile version to KyuubiServer Log
This is an automated email from the ASF dual-hosted git repository.
chengpan 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 a09ad0b67 [KYUUBI #2424] [Improvement] add Flink compile version and Trino client compile version to KyuubiServer Log
a09ad0b67 is described below
commit a09ad0b676971288e84d4c564f0542480d08fbb0
Author: jiaoqingbo <11...@qq.com>
AuthorDate: Thu Apr 21 15:22:10 2022 +0800
[KYUUBI #2424] [Improvement] add Flink compile version and Trino client compile version to KyuubiServer Log
### _Why are the changes needed?_
fix #2424
### _How was this patch tested?_
- [x] 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.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #2425 from jiaoqingbo/2424.
Closes #2424
9949d9a5 [jiaoqingbo] Update UtilsSuite.scala
ac9afb46 [jiaoqingbo] Update package.scala
e415345d [jiaoqingbo] Update kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala
081b061f [jiaoqingbo] Update kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
c1ade020 [jiaoqingbo] Update build/kyuubi-build-info
6af3dd08 [jiaoqingbo] [KYUUBI #2424] [Improvement] add Flink compile version and Trino client compile version
Authored-by: jiaoqingbo <11...@qq.com>
Signed-off-by: Cheng Pan <ch...@apache.org>
---
build/kyuubi-build-info | 2 ++
kyuubi-common/pom.xml | 2 ++
kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala | 4 ++++
kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala | 2 ++
.../src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala | 3 ++-
5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/kyuubi-build-info b/build/kyuubi-build-info
index 48d4f4f93..a3da7ccae 100755
--- a/build/kyuubi-build-info
+++ b/build/kyuubi-build-info
@@ -28,6 +28,8 @@ echo_build_properties() {
echo kyuubi_spark_version="$5"
echo kyuubi_hive_version="$6"
echo kyuubi_hadoop_version="$7"
+ echo kyuubi_flink_version="$8"
+ echo kyuubi_trino_version="$9"
echo user="$USER"
echo revision=$(git rev-parse HEAD)
echo branch=$(git rev-parse --abbrev-ref HEAD)
diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml
index 68d3efc50..f47686831 100644
--- a/kyuubi-common/pom.xml
+++ b/kyuubi-common/pom.xml
@@ -180,6 +180,8 @@
<arg value="${spark.version}"/>
<arg value="${hive.version}"/>
<arg value="${hadoop.version}"/>
+ <arg value="${flink.version}"/>
+ <arg value="${trino.client.version}"/>
</exec>
</target>
</configuration>
diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala
index 5e4233ee7..1adc7c8cd 100644
--- a/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala
+++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala
@@ -48,6 +48,8 @@ package object kyuubi {
val spark_version: String = props.getProperty("kyuubi_spark_version", unknown)
val hive_version: String = props.getProperty("kyuubi_hive_version", unknown)
val hadoop_version: String = props.getProperty("kyuubi_hadoop_version", unknown)
+ val flink_version: String = props.getProperty("kyuubi_flink_version", unknown)
+ val trino_version: String = props.getProperty("kyuubi_trino_version", unknown)
val branch: String = props.getProperty("branch", unknown)
val revision: String = props.getProperty("revision", unknown)
val user: String = props.getProperty("user", unknown)
@@ -61,6 +63,8 @@ package object kyuubi {
val SPARK_COMPILE_VERSION: String = BuildInfo.spark_version
val HIVE_COMPILE_VERSION: String = BuildInfo.hive_version
val HADOOP_COMPILE_VERSION: String = BuildInfo.hadoop_version
+ val FLINK_COMPILE_VERSION: String = BuildInfo.flink_version
+ val TRINO_COMPILE_VERSION: String = BuildInfo.trino_version
val BRANCH: String = BuildInfo.branch
val REVISION: String = BuildInfo.revision
val BUILD_USER: String = BuildInfo.user
diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala
index 6bd12c3da..3b50b3066 100644
--- a/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala
+++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala
@@ -42,6 +42,8 @@ class UtilsSuite extends KyuubiFunSuite {
assert(props.getProperty("kyuubi_spark_version") === SPARK_COMPILE_VERSION)
assert(props.getProperty("kyuubi_hive_version") === HIVE_COMPILE_VERSION)
assert(props.getProperty("kyuubi_hadoop_version") === HADOOP_COMPILE_VERSION)
+ assert(props.getProperty("kyuubi_flink_version") === FLINK_COMPILE_VERSION)
+ assert(props.getProperty("kyuubi_trino_version") === TRINO_COMPILE_VERSION)
assert(props.getProperty("branch") === BRANCH)
assert(props.getProperty("revision") === REVISION)
assert(props.getProperty("user") === BUILD_USER)
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
index 341e9d0fd..ab0e81cca 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
@@ -122,7 +122,8 @@ object KyuubiServer extends Logging {
info(s"Version: $KYUUBI_VERSION, Revision: $REVISION, Branch: $BRANCH," +
s" Java: $JAVA_COMPILE_VERSION, Scala: $SCALA_COMPILE_VERSION," +
s" Spark: $SPARK_COMPILE_VERSION, Hadoop: $HADOOP_COMPILE_VERSION," +
- s" Hive: $HIVE_COMPILE_VERSION")
+ s" Hive: $HIVE_COMPILE_VERSION, Flink: $FLINK_COMPILE_VERSION," +
+ s" Trino: $TRINO_COMPILE_VERSION")
info(s"Using Scala ${Properties.versionString}, ${Properties.javaVmName}," +
s" ${Properties.javaVersion}")
SignalRegister.registerLogger(logger)