From eb2a7050d92d88417c92e72d9b6532ceac60b972 Mon Sep 17 00:00:00 2001 From: Kent Yao Date: Mon, 21 Sep 2020 21:26:16 +0800 Subject: [PATCH] build info --- build/kyuubi-build-info | 10 +++++----- .../org/apache/kyuubi/cli/HandleIdentifier.scala | 11 ++++++++--- .../src/main/scala/org/apache/kyuubi/package.scala | 14 ++++++-------- .../test/scala/org/apache/kyuubi/UtilsSuite.scala | 10 +++++----- .../apache/kyuubi/cli/HandleIdentifierSuite.scala | 6 ++++++ .../apache/kyuubi/session/KyuubiSessionImpl.scala | 1 - .../src/main/scala/yaooqinn/kyuubi/package.scala | 2 +- .../test/scala/yaooqinn/kyuubi/packageSuite.scala | 2 +- 8 files changed, 32 insertions(+), 24 deletions(-) diff --git a/build/kyuubi-build-info b/build/kyuubi-build-info index 87c39e0ba..0a9fe9fcb 100755 --- a/build/kyuubi-build-info +++ b/build/kyuubi-build-info @@ -23,11 +23,11 @@ BUILD_INFO="$EXTRA_RESOURCE_DIR"/kyuubi-version-info.properties echo_build_properties() { echo kyuubi_version="$2" - echo java_version="$3" - echo scala_version="$4" - echo spark_version="$5" - echo hive_version="$6" - echo hadoop_version="$7" + echo kyuubi_java_version="$3" + echo kyuubi_scala_version="$4" + echo kyuubi_spark_version="$5" + echo kyuubi_hive_version="$6" + echo kyuubi_hadoop_version="$7" echo user="$USER" echo jar=kyuubi-server-$2.jar echo revision=$(git rev-parse HEAD) diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/cli/HandleIdentifier.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/cli/HandleIdentifier.scala index a5ae88fb0..1fcda7618 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/cli/HandleIdentifier.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/cli/HandleIdentifier.scala @@ -22,7 +22,7 @@ import java.util.{Objects, UUID} import org.apache.hive.service.rpc.thrift.THandleIdentifier -case class HandleIdentifier(publicId: UUID, secretId: UUID) { +class HandleIdentifier(val publicId: UUID, val secretId: UUID) { def toTHandleIdentifier: THandleIdentifier = { val guid = new Array[Byte](16) @@ -39,8 +39,8 @@ case class HandleIdentifier(publicId: UUID, secretId: UUID) { override def hashCode(): Int = (Objects.hashCode(publicId) + 31) * 31 + Objects.hashCode(secretId) override def equals(obj: Any): Boolean = obj match { - case HandleIdentifier(pid, sid) => - Objects.equals(publicId, pid) && Objects.equals(secretId, sid) + case i: HandleIdentifier => + Objects.equals(publicId, i.publicId) && Objects.equals(secretId, i.secretId) case _ => false } @@ -48,6 +48,11 @@ case class HandleIdentifier(publicId: UUID, secretId: UUID) { } object HandleIdentifier { + + def apply(publicId: UUID, secretId: UUID): HandleIdentifier = { + new HandleIdentifier(publicId, secretId) + } + def apply(): HandleIdentifier = { val publicId = UUID.randomUUID() val secretId = UUID.randomUUID() 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 585b11ebf..8babf01e0 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala @@ -31,18 +31,16 @@ package object kyuubi { try { props.load(buildFileStream) - } catch { - case e: Exception => throw new KyuubiException(e) } finally { Try(buildFileStream.close()) } val version: String = props.getProperty("kyuubi_version", unknown) - val java_version: String = props.getProperty("java_version", unknown) - val scala_version: String = props.getProperty("scala_version", unknown) - val sparkVersion: String = props.getProperty("spark_version", unknown) - val hive_version: String = props.getProperty("hive_version", unknown) - val hadoop_version: String = props.getProperty("hadoop_version", unknown) + val java_version: String = props.getProperty("kyuubi_java_version", unknown) + val scala_version: String = props.getProperty("kyuubi_scala_version", unknown) + 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 branch: String = props.getProperty("branch", unknown) val revision: String = props.getProperty("revision", unknown) val user: String = props.getProperty("user", unknown) @@ -53,7 +51,7 @@ package object kyuubi { val KYUUBI_VERSION: String = BuildInfo.version val JAVA_COMPILE_VERSION: String = BuildInfo.java_version val SCALA_COMPILE_VERSION: String = BuildInfo.scala_version - val SPARK_COMPILE_VERSION: String = BuildInfo.sparkVersion + 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 BRANCH: String = BuildInfo.branch 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 5a6bc98f5..2b2dbae30 100644 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala +++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala @@ -30,11 +30,11 @@ class UtilsSuite extends KyuubiFunSuite { props.load(str) str.close() assert(props.getProperty("kyuubi_version") === KYUUBI_VERSION) - assert(props.getProperty("java_version") === JAVA_COMPILE_VERSION) - assert(props.getProperty("scala_version") === SCALA_COMPILE_VERSION) - assert(props.getProperty("spark_version") === SPARK_COMPILE_VERSION) - assert(props.getProperty("hive_version") === HIVE_COMPILE_VERSION) - assert(props.getProperty("hadoop_version") === HADOOP_COMPILE_VERSION) + assert(props.getProperty("kyuubi_java_version") === JAVA_COMPILE_VERSION) + assert(props.getProperty("kyuubi_scala_version") === SCALA_COMPILE_VERSION) + 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("branch") === BRANCH) assert(props.getProperty("revision") === REVISION) assert(props.getProperty("user") === BUILD_USER) diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/cli/HandleIdentifierSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/cli/HandleIdentifierSuite.scala index a73214cf2..1507a710d 100644 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/cli/HandleIdentifierSuite.scala +++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/cli/HandleIdentifierSuite.scala @@ -17,6 +17,8 @@ package org.apache.kyuubi.cli +import java.util.Objects + import org.apache.kyuubi.KyuubiFunSuite class HandleIdentifierSuite extends KyuubiFunSuite { @@ -29,7 +31,11 @@ class HandleIdentifierSuite extends KyuubiFunSuite { val id3 = HandleIdentifier(id1.publicId, id1.secretId) assert(id3 === id1) + assert(id3.toString === id1.publicId.toString) + assert(id3.hashCode() === + (Objects.hashCode(id1.publicId) + 31) * 31 + Objects.hashCode(id1.secretId)) val id4 = HandleIdentifier() assert(id4 !== id1) + assert(id4 !== new Integer(1)) } } diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala b/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala index c21a7d04e..d828393da 100644 --- a/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala +++ b/kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala @@ -47,7 +47,6 @@ class KyuubiSessionImpl( private def configureSession(): Unit = { conf.foreach { - case (k, v) => sessionConf.set(k, v) case (HIVE_VAR_PREFIX(key), value) => sessionConf.set(key, value) case (HIVE_CONF_PREFIX(key), value) => sessionConf.set(key, value) case ("use:database", _) => diff --git a/kyuubi-server/src/main/scala/yaooqinn/kyuubi/package.scala b/kyuubi-server/src/main/scala/yaooqinn/kyuubi/package.scala index 286161b05..5fc43ec2e 100644 --- a/kyuubi-server/src/main/scala/yaooqinn/kyuubi/package.scala +++ b/kyuubi-server/src/main/scala/yaooqinn/kyuubi/package.scala @@ -40,7 +40,7 @@ package object kyuubi { } val version: String = props.getProperty("kyuubi_version", unknown) - val sparkVersion: String = props.getProperty("spark_version", unknown) + val sparkVersion: String = props.getProperty("kyuubi_spark_version", unknown) val branch: String = props.getProperty("branch", unknown) val jar: String = props.getProperty("jar", unknown) val revision: String = props.getProperty("revision", unknown) diff --git a/kyuubi-server/src/test/scala/yaooqinn/kyuubi/packageSuite.scala b/kyuubi-server/src/test/scala/yaooqinn/kyuubi/packageSuite.scala index bb393ea0d..086d2f414 100644 --- a/kyuubi-server/src/test/scala/yaooqinn/kyuubi/packageSuite.scala +++ b/kyuubi-server/src/test/scala/yaooqinn/kyuubi/packageSuite.scala @@ -30,7 +30,7 @@ class packageSuite extends SparkFunSuite { props.load(str) str.close() assert(props.getProperty("kyuubi_version") === KYUUBI_VERSION) - assert(props.getProperty("spark_version") === SPARK_COMPILE_VERSION) + assert(props.getProperty("kyuubi_spark_version") === SPARK_COMPILE_VERSION) assert(props.getProperty("branch") === BRANCH) assert(props.getProperty("jar") === KYUUBI_JAR_NAME) assert(props.getProperty("revision") === REVISION)