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

build info

Browse Source
This commit is contained in:
Kent Yao 2020-09-21 21:26:16 +08:00
parent 69ee4c18e8
commit eb2a7050d9
8 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/kyuubi-build-info
View File

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

11
kyuubi-common/src/main/scala/org/apache/kyuubi/cli/HandleIdentifier.scala
View File

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

14
kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala
View File

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

10
kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala
View File

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

6
kyuubi-common/src/test/scala/org/apache/kyuubi/cli/HandleIdentifierSuite.scala
View File

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

1
kyuubi-main/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
View File

@ -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", _) =>

2
kyuubi-server/src/main/scala/yaooqinn/kyuubi/package.scala
View File

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

2
kyuubi-server/src/test/scala/yaooqinn/kyuubi/packageSuite.scala
View File

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