This is an automated email from the ASF dual-hosted git repository.
ulyssesyou 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 98887e7 [KYUUBI #2218] Fix maven options about hive-provided
98887e7 is described below
commit 98887e754d8663ccb5a9c7d4abe3a4960ed58f1f
Author: Ada Wang <[email protected]>
AuthorDate: Mon Mar 28 10:10:41 2022 +0800
[KYUUBI #2218] Fix maven options about hive-provided
### _Why are the changes needed?_
much code about maven options only has `-Pflink-provided,spark-provided` no
`hive-provided`.
### _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.apache.org/docs/latest/develop_tools/testing.html#running-tests)
locally before make a pull request
Closes #2219 from deadwind4/KYUUBI-2218.
Closes #2218
5e369978 [Ada Wang] fix build dist help
a5de3ba8 [Ada Wang] [KYUUBI #2218] Fix maven options about hive-provided
Authored-by: Ada Wang <[email protected]>
Signed-off-by: ulysses-you <[email protected]>
---
.github/workflows/dep.yml | 2 +-
.github/workflows/publish-snapshot.yml | 4 ++--
build/dist | 8 ++++----
build/release/release.sh | 6 +++---
.../kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala | 4 ++--
kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/dep.yml b/.github/workflows/dep.yml
index ee3134a..b60c9e4 100644
--- a/.github/workflows/dep.yml
+++ b/.github/workflows/dep.yml
@@ -48,7 +48,7 @@ jobs:
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.defaultLogLevel=error
run: >-
build/mvn clean install
- -Pflink-provided,spark-provided
+ -Pflink-provided,spark-provided,hive-provided
-Dmaven.javadoc.skip=true
-Drat.skip=true
-Dscalastyle.skip=true
diff --git a/.github/workflows/publish-snapshot.yml
b/.github/workflows/publish-snapshot.yml
index b770173..febeceb 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -34,8 +34,8 @@ jobs:
- branch-1.4
- branch-1.3
profiles:
- - -Pflink-provided,spark-provided,spark-3.1
- - -Pflink-provided,spark-provided,spark-3.2,tpcds
+ - -Pflink-provided,spark-provided,hive-provided,spark-3.1
+ - -Pflink-provided,spark-provided,hive-provided,spark-3.2,tpcds
steps:
- name: Checkout repository
uses: actions/checkout@v2
diff --git a/build/dist b/build/dist
index 6d90682..34fca03 100755
--- a/build/dist
+++ b/build/dist
@@ -41,10 +41,10 @@ function usage {
echo "./build/dist - Tool for making binary distributions of Kyuubi"
echo ""
echo "Usage:"
- echo
"+--------------------------------------------------------------------------------------+"
- echo "| ./build/dist [--name <custom_name>] [--tgz] [--flink-provided]
[--spark-provided] |"
- echo "| [--mvn <maven_executable>] <maven build options>
|"
- echo
"+--------------------------------------------------------------------------------------+"
+ echo
"+------------------------------------------------------------------------------------------------------+"
+ echo "| ./build/dist [--name <custom_name>] [--tgz] [--flink-provided]
[--spark-provided] [--hive-provided] |"
+ echo "| [--mvn <maven_executable>] <maven build options>
|"
+ echo
"+------------------------------------------------------------------------------------------------------+"
echo "name: - custom binary name, using project version if
undefined"
echo "tgz: - whether to make a whole bundled package"
echo "flink-provided: - whether to make a package without Flink binary"
diff --git a/build/release/release.sh b/build/release/release.sh
index f1f442c..e03bd41 100755
--- a/build/release/release.sh
+++ b/build/release/release.sh
@@ -94,12 +94,12 @@ upload_svn_staging() {
}
upload_nexus_staging() {
- ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests
-Papache-release,flink-provided,spark-provided \
+ ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests
-Papache-release,flink-provided,spark-provided,hive-provided \
-s "${KYUUBI_DIR}/build/release/asf-settings.xml"
- ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests
-Papache-release,flink-provided,spark-provided,spark-3.1 \
+ ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests
-Papache-release,flink-provided,spark-provided,hive-provided,spark-3.1 \
-s "${KYUUBI_DIR}/build/release/asf-settings.xml" \
-pl dev/kyuubi-extension-spark-3-1 -am
- ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests
-Papache-release,flink-provided,spark-provided,spark-3.2 \
+ ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests
-Papache-release,flink-provided,spark-provided,hive-provided,spark-3.2 \
-s "${KYUUBI_DIR}/build/release/asf-settings.xml" \
-pl dev/kyuubi-extension-spark-3-2 -am
}
diff --git
a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala
b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala
index 6cc8456..382cb49 100644
---
a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala
+++
b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala
@@ -30,12 +30,12 @@ import org.apache.kyuubi.{KyuubiFunSuite, TestUtils}
*
* To run the entire test suite:
* {{{
- * build/mvn clean install -Pflink-provided,spark-provided
-DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
+ * build/mvn clean install -Pflink-provided,spark-provided,hive-provided
-DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
* }}}
*
* To re-generate golden files for entire suite, run:
* {{{
- * KYUUBI_UPDATE=1 build/mvn clean install -Pflink-provided,spark-provided
-DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
+ * KYUUBI_UPDATE=1 build/mvn clean install
-Pflink-provided,spark-provided,hive-provided
-DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
* }}}
*/
// scalastyle:on line.size.limit
diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala
b/kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala
index 107cf87..4f9a4f1 100644
--- a/kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala
+++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala
@@ -52,7 +52,7 @@ object TestUtils {
}
reader.close()
val hint = s"$markdown out of date, please update doc with " +
- s"KYUUBI_UPDATE=1 build/mvn clean install
-Pflink-provided,spark-provided " +
+ s"KYUUBI_UPDATE=1 build/mvn clean install
-Pflink-provided,spark-provided,hive-provided " +
s"-DwildcardSuites=$agent"
assert(newOutput.size === expected.size, hint)
