IMPALA-4477: Bump Kudu version to latest master (60aa54e) Bumps the toolchain version to get a newer Kudu build.
Also fixes test failures resulting from changes in Kudu. Notably error strings have changed (IMPALA-4590) and the number of replicas must be odd (IMPALA-4589). Note: The toolchain binaries starting with this build are now using the toolchain binutils rather than the system binutils. Testing: private exhaustive build. Change-Id: If1912f058c240fbe82b06f77e31add7755289be1 Reviewed-on: http://gerrit.cloudera.org:8080/5369 Reviewed-by: Matthew Jacobs <[email protected]> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/5188f879 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/5188f879 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/5188f879 Branch: refs/heads/hadoop-next Commit: 5188f879a7940f96dcaf3892f08c0aa76f58abe2 Parents: 0d4bdc1 Author: Matthew Jacobs <[email protected]> Authored: Sat Dec 3 09:58:20 2016 -0800 Committer: Internal Jenkins <[email protected]> Committed: Wed Dec 7 05:11:13 2016 +0000 ---------------------------------------------------------------------- bin/impala-config.sh | 4 ++-- .../functional-query/queries/QueryTest/kudu_alter.test | 2 +- .../functional-query/queries/QueryTest/kudu_create.test | 4 ++-- .../queries/QueryTest/kudu_partition_ddl.test | 6 +++--- .../functional-query/queries/QueryTest/kudu_stats.test | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5188f879/bin/impala-config.sh ---------------------------------------------------------------------- diff --git a/bin/impala-config.sh b/bin/impala-config.sh index 834f216..a3fdb57 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -57,7 +57,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. -: ${IMPALA_TOOLCHAIN_BUILD_ID=267-98c642ffcb} +: ${IMPALA_TOOLCHAIN_BUILD_ID=289-f12b0dd2e9} # This flag is used in $IMPALA_HOME/cmake_modules/toolchain.cmake. # If it's 0, Impala will be built with the compiler in the toolchain directory. @@ -270,7 +270,7 @@ export IMPALA_GFLAGS_VERSION=2.0 export IMPALA_GLOG_VERSION=0.3.2-p2 export IMPALA_GPERFTOOLS_VERSION=2.5 export IMPALA_GTEST_VERSION=1.6.0 -export IMPALA_KUDU_VERSION=f2aeba +export IMPALA_KUDU_VERSION=60aa54e export IMPALA_LLVM_VERSION=3.8.0-p1 export IMPALA_LLVM_ASAN_VERSION=3.8.0-p1 # Debug builds should use the release+asserts build to get additional coverage. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5188f879/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test b/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test index 8722f8a..ac90e07 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test +++ b/testdata/workloads/functional-query/queries/QueryTest/kudu_alter.test @@ -98,7 +98,7 @@ alter table tbl_to_alter add range partition 1000 < values # 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: [(int32 id=11), (int32 id=31)) +NonRecoverableException: New range partition conflicts with existing range partition: 11 <= VALUES < 31 ==== ---- QUERY # Try to insert a partition that overlaps with an existing partition, use IF NOT EXISTS http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5188f879/testdata/workloads/functional-query/queries/QueryTest/kudu_create.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-query/queries/QueryTest/kudu_create.test b/testdata/workloads/functional-query/queries/QueryTest/kudu_create.test index 651979d..d67103b 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/kudu_create.test +++ b/testdata/workloads/functional-query/queries/QueryTest/kudu_create.test @@ -21,14 +21,14 @@ INT,INT create table tab (x int, y boolean, primary key(x, y)) partition by hash (x) into 3 buckets stored as kudu ---- CATCH -NonRecoverableException: Key column may not have type of BOOL, FLOAT, or DOUBLE +NonRecoverableException: key column may not have type of BOOL, FLOAT, or DOUBLE ==== ---- QUERY # Float primary key column create table tab (x int, y float, primary key(x, y)) partition by hash (x) into 3 buckets stored as kudu ---- CATCH -NonRecoverableException: Key column may not have type of BOOL, FLOAT, or DOUBLE +NonRecoverableException: key column may not have type of BOOL, FLOAT, or DOUBLE ==== ---- QUERY # Primary keys should be declared first http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5188f879/testdata/workloads/functional-query/queries/QueryTest/kudu_partition_ddl.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-query/queries/QueryTest/kudu_partition_ddl.test b/testdata/workloads/functional-query/queries/QueryTest/kudu_partition_ddl.test index 5e9c477..496492b 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/kudu_partition_ddl.test +++ b/testdata/workloads/functional-query/queries/QueryTest/kudu_partition_ddl.test @@ -231,7 +231,7 @@ create table simple_range_with_overlapping (id int, name string, valf float, val primary key (id, name)) partition by range (id) (partition values <= 10, partition values < 20, partition value = 5) stored as kudu ---- CATCH -NonRecoverableException: overlapping range partitions: first range partition: [<start>, (int32 id=11)), second range partition: [<start>, (int32 id=20)) +NonRecoverableException: overlapping range partitions: first range partition: VALUES < 11, second range partition: VALUES < 20 ==== ---- QUERY -- Test range partitioning with the same partition specified multiple times @@ -239,7 +239,7 @@ create table simple_range_duplicate_parts (id int, name string, valf float, vali primary key(id, name)) partition by range (id) (partition 10 < values <= 20, partition 10 < values <= 20) stored as kudu ---- CATCH -NonRecoverableException: overlapping range partitions: first range partition: [(int32 id=11), (int32 id=21)), second range partition: [(int32 id=11), (int32 id=21)) +NonRecoverableException: overlapping range partitions: first range partition: 11 <= VALUES < 21, second range partition: 11 <= VALUES < 21 ==== ---- QUERY -- Test multi-column range partitioning with the same partition specified multiple times @@ -247,5 +247,5 @@ create table range_multi_col_duplicate_parts (id int, name string, valf float, vali bigint, primary key (id, name)) partition by range (id, name) (partition value = (10, 'dimitris'), partition value = (10, 'dimitris')) stored as kudu ---- CATCH -NonRecoverableException: overlapping range partitions: first range partition: [(int32 id=10, string name=dimitris), (int32 id=10, string name=dimitris\000)), second range partition: [(int32 id=10, string name=dimitris), (int32 id=10, string name=dimitris\000)) +NonRecoverableException: overlapping range partitions: first range partition: (10, "dimitris") <= VALUES < (10, "dimitris\000"), second range partition: (10, "dimitris") <= VALUES < (10, "dimitris\000") ==== http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5188f879/testdata/workloads/functional-query/queries/QueryTest/kudu_stats.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-query/queries/QueryTest/kudu_stats.test b/testdata/workloads/functional-query/queries/QueryTest/kudu_stats.test index d3b7bd3..697a3a3 100644 --- a/testdata/workloads/functional-query/queries/QueryTest/kudu_stats.test +++ b/testdata/workloads/functional-query/queries/QueryTest/kudu_stats.test @@ -2,15 +2,15 @@ ---- QUERY create table simple (id int primary key, name string, valf float, vali bigint) partition by range (partition values < 10, partition 10 <= values < 30, - partition 30 <= values) stored as kudu tblproperties('kudu.num_tablet_replicas' = '2') + partition 30 <= values) stored as kudu tblproperties('kudu.num_tablet_replicas' = '1') ---- RESULTS ==== ---- QUERY show table stats simple ---- RESULTS --1,'','8000000A',regex:.*?:\d+,2 --1,'8000000A','8000001E',regex:.*?:\d+,2 --1,'8000001E','',regex:.*?:\d+,2 +-1,'','8000000A',regex:.*?:\d+,1 +-1,'8000000A','8000001E',regex:.*?:\d+,1 +-1,'8000001E','',regex:.*?:\d+,1 ---- TYPES INT,STRING,STRING,STRING,INT ---- LABELS
