This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new 4b654e7 IMPALA-10058: Use commit hash as version for Kudu java
artifacts
4b654e7 is described below
commit 4b654e7c97545d291fa2fd214b9caf1c2c7f9c59
Author: Joe McDonnell <joemcdonn...@cloudera.com>
AuthorDate: Tue Oct 27 13:05:30 2020 -0700
IMPALA-10058: Use commit hash as version for Kudu java artifacts
This uses a new version of the native toolchain where Kudu
now uses the commit hash as the version for its jars.
This means that IMPALA_KUDU_VERSION is the same as
IMPALA_KUDU_JAVA_VERSION, so this consolidates everything
to use IMPALA_KUDU_VERSION. This also eliminates SNAPSHOT
versions for the Kudu jars.
Kudu changed one error message, so this updates the impacted
tests.
Testing:
- Ran a core job
Change-Id: I1a6c9676f4521d6709393143d3e82533486164d3
Reviewed-on: http://gerrit.cloudera.org:8080/16686
Reviewed-by: Tim Armstrong <tarmstr...@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
---
bin/impala-config.sh | 7 ++-----
java/pom.xml | 7 +++++--
.../workloads/functional-query/queries/QueryTest/kudu_alter.test | 4 ++--
.../functional-query/queries/QueryTest/kudu_hms_alter.test | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 5dd8a31..3232509 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -68,7 +68,7 @@ fi
# moving to a different build of the toolchain, e.g. when a version is bumped
or a
# compile option is changed. The build id can be found in the output of the
toolchain
# build jobs, it is constructed from the build number and toolchain git hash
prefix.
-export IMPALA_TOOLCHAIN_BUILD_ID=55-dcf54c8601
+export IMPALA_TOOLCHAIN_BUILD_ID=59-78fc9e6092
# Versions of toolchain dependencies.
# -----------------------------------
export IMPALA_AVRO_VERSION=1.7.4-p5
@@ -199,7 +199,6 @@ unset IMPALA_HBASE_URL
unset IMPALA_HIVE_URL
unset IMPALA_KUDU_URL
unset IMPALA_KUDU_VERSION
-unset IMPALA_KUDU_JAVA_VERSION
export IMPALA_KERBERIZE=false
@@ -646,8 +645,7 @@ fi
# overall build type) and does not apply when using a local Kudu build.
export USE_KUDU_DEBUG_BUILD=${USE_KUDU_DEBUG_BUILD-false}
-export IMPALA_KUDU_VERSION=${IMPALA_KUDU_VERSION-"5ad5d3d66"}
-export IMPALA_KUDU_JAVA_VERSION=${IMPALA_KUDU_JAVA_VERSION-"1.13.0-SNAPSHOT"}
+export IMPALA_KUDU_VERSION=${IMPALA_KUDU_VERSION-"2f5605dfc"}
export
IMPALA_KUDU_HOME=${IMPALA_TOOLCHAIN_PACKAGES_HOME}/kudu-$IMPALA_KUDU_VERSION
export IMPALA_KUDU_JAVA_HOME=\
${IMPALA_TOOLCHAIN_PACKAGES_HOME}/kudu-${IMPALA_KUDU_VERSION}/java
@@ -727,7 +725,6 @@ echo "IMPALA_HIVE_VERSION = $IMPALA_HIVE_VERSION"
echo "IMPALA_HBASE_VERSION = $IMPALA_HBASE_VERSION"
echo "IMPALA_HUDI_VERSION = $IMPALA_HUDI_VERSION"
echo "IMPALA_KUDU_VERSION = $IMPALA_KUDU_VERSION"
-echo "IMPALA_KUDU_JAVA_VERSION= $IMPALA_KUDU_JAVA_VERSION"
echo "IMPALA_RANGER_VERSION = $IMPALA_RANGER_VERSION"
echo "IMPALA_ICEBERG_VERSION = $IMPALA_ICEBERG_VERSION"
diff --git a/java/pom.xml b/java/pom.xml
index 05c9a7b..d2cf6a3 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -48,7 +48,7 @@ under the License.
<impala.extdatasrc.api.version>${project.version}</impala.extdatasrc.api.version>
<impala.query.event.hook.api.version>${project.version}</impala.query.event.hook.api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <kudu.version>${env.IMPALA_KUDU_JAVA_VERSION}</kudu.version>
+ <kudu.version>${env.IMPALA_KUDU_VERSION}</kudu.version>
<commons-io.version>2.6</commons-io.version>
<slf4j.version>1.7.25</slf4j.version>
<junit.version>4.12</junit.version>
@@ -173,8 +173,11 @@ under the License.
<releases>
<enabled>${env.IMPALA_TOOLCHAIN_KUDU_MAVEN_REPOSITORY_ENABLED}</enabled>
</releases>
+ <!--
+ This repository now uses explicit versions, so snapshots are no longer
required.
+ -->
<snapshots>
-
<enabled>${env.IMPALA_TOOLCHAIN_KUDU_MAVEN_REPOSITORY_ENABLED}</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
<repository>
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test
b/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test
index a13c728..c4250c0 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test
@@ -161,7 +161,7 @@ show range partitions tbl_to_alter;
# Try to insert a partition that overlaps with an existing partition
alter table tbl_to_alter add range partition 10 < values <= 30
---- CATCH
-NonRecoverableException: New range partition conflicts with existing range
partition: 11 <= VALUES < 31
+NonRecoverableException: new range partition conflicts with existing one: 11
<= VALUES < 31
====
---- QUERY
# Try to insert a partition that overlaps with an existing partition, use IF
NOT EXISTS
@@ -639,7 +639,7 @@ show range partitions multi_range_partition_cols;
# Try to insert a partition that overlaps with an existing partition
alter table multi_range_partition_cols add range partition ('b', 2) <= values
< ('c', 1)
---- CATCH
-NonRecoverableException: New range partition conflicts with existing range
partition: ("b", 2) <= VALUES < ("c", 1)
+NonRecoverableException: new range partition conflicts with existing one:
("b", 2) <= VALUES < ("c", 1)
====
---- QUERY
# Check that renaming an external Impala-Kudu table does not rename the
underlying Kudu
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/kudu_hms_alter.test
b/testdata/workloads/functional-query/queries/QueryTest/kudu_hms_alter.test
index 244f69c..d29f592 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/kudu_hms_alter.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/kudu_hms_alter.test
@@ -161,7 +161,7 @@ show range partitions tbl_to_alter;
# Try to insert a partition that overlaps with an existing partition
alter table tbl_to_alter add range partition 10 < values <= 30
---- CATCH
-NonRecoverableException: New range partition conflicts with existing range
partition: 11 <= VALUES < 31
+NonRecoverableException: new range partition conflicts with existing one: 11
<= VALUES < 31
====
---- QUERY
# Try to insert a partition that overlaps with an existing partition, use IF
NOT EXISTS
@@ -639,7 +639,7 @@ show range partitions multi_range_partition_cols;
# Try to insert a partition that overlaps with an existing partition
alter table multi_range_partition_cols add range partition ('b', 2) <= values
< ('c', 1)
---- CATCH
-NonRecoverableException: New range partition conflicts with existing range
partition: ("b", 2) <= VALUES < ("c", 1)
+NonRecoverableException: new range partition conflicts with existing one:
("b", 2) <= VALUES < ("c", 1)
====
---- QUERY
# Check that renaming an external Impala-Kudu table does not rename the
underlying Kudu
