You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2020/07/15 19:15:13 UTC

[impala] branch master updated: Bump up CDP_BUILD_NUMBER to 4493826

This is an automated email from the ASF dual-hosted git repository.

tarmstrong 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 3a6022c  Bump up CDP_BUILD_NUMBER to 4493826
3a6022c is described below

commit 3a6022ce80ca1cedb629400b18caaf0d1f54137c
Author: Zoltan Borok-Nagy <bo...@cloudera.com>
AuthorDate: Fri Jul 10 17:19:44 2020 +0200

    Bump up CDP_BUILD_NUMBER to 4493826
    
    This change bumps up the CDP_BUILD_NUMBER to 4493826. This is needed
    to fix a failing test.
    
    Hive started to assign bucket ids to files differently. Because of
    that I had to modify the test_full_acid_rowid test that had an
    assumption about how bucket ids are assigned to files.
    
    If you have problems restarting the Hive Metastore, try the following:
    
      buildall.sh <your usual flags> -upgrade_metastore_db
    
    If you have problems restarting Kudu, try the following:
    
      Unset LD_LIBRARY_PATH in your shell, and stop setting it in
      impala-config-local.sh
    
    Change-Id: Ia4635feef146c945624135e0715495bb01ea4699
    Reviewed-on: http://gerrit.cloudera.org:8080/16195
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
    Reviewed-by: Tim Armstrong <ta...@cloudera.com>
---
 bin/impala-config.sh                                 | 20 ++++++++++----------
 fe/pom.xml                                           | 15 ++++++++++++++-
 .../queries/QueryTest/full-acid-rowid.test           | 12 ++++++------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 51faa0d..b20d1179 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -172,18 +172,18 @@ export CDH_BUILD_NUMBER=1814051
 export CDH_MAVEN_REPOSITORY=\
 "https://${IMPALA_TOOLCHAIN_HOST}/build/cdh_components/${CDH_BUILD_NUMBER}/maven"
 
-export CDP_BUILD_NUMBER=3192304
+export CDP_BUILD_NUMBER=4493826
 export CDP_MAVEN_REPOSITORY=\
 "https://${IMPALA_TOOLCHAIN_HOST}/build/cdp_components/${CDP_BUILD_NUMBER}/maven"
-export CDP_AVRO_JAVA_VERSION=1.8.2.7.2.1.0-57
-export CDP_HADOOP_VERSION=3.1.1.7.2.1.0-57
-export CDP_HBASE_VERSION=2.2.3.7.2.1.0-57
-export CDP_HIVE_VERSION=3.1.3000.7.2.1.0-57
-export CDP_KNOX_VERSION=1.3.0.7.2.1.0-57
-export CDP_OZONE_VERSION=0.6.0.7.2.1.0-57
-export CDP_PARQUET_VERSION=1.10.99.7.2.1.0-57
-export CDP_RANGER_VERSION=2.0.0.7.2.1.0-57
-export CDP_TEZ_VERSION=0.9.1.7.2.1.0-57
+export CDP_AVRO_JAVA_VERSION=1.8.2.7.2.1.0-287
+export CDP_HADOOP_VERSION=3.1.1.7.2.1.0-287
+export CDP_HBASE_VERSION=2.2.5.7.2.1.0-287
+export CDP_HIVE_VERSION=3.1.3000.7.2.1.0-287
+export CDP_KNOX_VERSION=1.3.0.7.2.1.0-287
+export CDP_OZONE_VERSION=0.6.0.7.2.1.0-287
+export CDP_PARQUET_VERSION=1.10.99.7.2.1.0-287
+export CDP_RANGER_VERSION=2.0.0.7.2.1.0-287
+export CDP_TEZ_VERSION=0.9.1.7.2.1.0-287
 
 export IMPALA_HUDI_VERSION=0.5.0-incubating
 export IMPALA_KITE_VERSION=1.0.0-cdh6.x-SNAPSHOT
diff --git a/fe/pom.xml b/fe/pom.xml
index 0f5e777..190f0b8 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -212,6 +212,14 @@ under the License.
           <groupId>org.apache.kafka</groupId>
           <artifactId>kafka_2.11</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.shiro</groupId>
+          <artifactId>shiro-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- this is needed by ranger-plugins-audit -->
@@ -220,6 +228,11 @@ under the License.
       <artifactId>mail</artifactId>
       <version>1.4</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.impala</groupId>
@@ -1012,7 +1025,7 @@ under the License.
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
+          <artifactId>hadoop-ozone-filesystem-hadoop3</artifactId>
           <version>${ozone.version}</version>
         </dependency>
       </dependencies>
diff --git a/testdata/workloads/functional-query/queries/QueryTest/full-acid-rowid.test b/testdata/workloads/functional-query/queries/QueryTest/full-acid-rowid.test
index e5e3899..2f1570e 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/full-acid-rowid.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/full-acid-rowid.test
@@ -20,14 +20,14 @@ select row__id.*, * from functional_orc_def.alltypestiny;
 ---- LABELS
 OPERATION, ORIGINALTRANSACTION, BUCKET, ROWID, CURRENTTRANSACTION, ID, BOOL_COL, TINYINT_COL, SMALLINT_COL, INT_COL, BIGINT_COL, FLOAT_COL, DOUBLE_COL, DATE_STRING_COL, STRING_COL, TIMESTAMP_COL, YEAR, MONTH
 ---- RESULTS
-0,1,536936448,0,1,2,true,0,0,0,0,0,0,'02/01/09','0',2009-02-01 00:00:00,2009,2
-0,1,536936448,1,1,3,false,1,1,1,10,1.100000023841858,10.1,'02/01/09','1',2009-02-01 00:01:00,2009,2
-0,1,537067520,0,1,6,true,0,0,0,0,0,0,'04/01/09','0',2009-04-01 00:00:00,2009,4
-0,1,537067520,1,1,7,false,1,1,1,10,1.100000023841858,10.1,'04/01/09','1',2009-04-01 00:01:00,2009,4
+0,1,536870912,0,1,2,true,0,0,0,0,0,0,'02/01/09','0',2009-02-01 00:00:00,2009,2
+0,1,536870912,1,1,3,false,1,1,1,10,1.100000023841858,10.1,'02/01/09','1',2009-02-01 00:01:00,2009,2
+0,1,536870912,0,1,6,true,0,0,0,0,0,0,'04/01/09','0',2009-04-01 00:00:00,2009,4
+0,1,536870912,1,1,7,false,1,1,1,10,1.100000023841858,10.1,'04/01/09','1',2009-04-01 00:01:00,2009,4
 0,1,536870912,0,1,0,true,0,0,0,0,0,0,'01/01/09','0',2009-01-01 00:00:00,2009,1
 0,1,536870912,1,1,1,false,1,1,1,10,1.100000023841858,10.1,'01/01/09','1',2009-01-01 00:01:00,2009,1
-0,1,537001984,0,1,4,true,0,0,0,0,0,0,'03/01/09','0',2009-03-01 00:00:00,2009,3
-0,1,537001984,1,1,5,false,1,1,1,10,1.100000023841858,10.1,'03/01/09','1',2009-03-01 00:01:00,2009,3
+0,1,536870912,0,1,4,true,0,0,0,0,0,0,'03/01/09','0',2009-03-01 00:00:00,2009,3
+0,1,536870912,1,1,5,false,1,1,1,10,1.100000023841858,10.1,'03/01/09','1',2009-03-01 00:01:00,2009,3
 ---- TYPES
 INT, BIGINT, INT, BIGINT, BIGINT, INT, BOOLEAN, TINYINT, SMALLINT, INT, BIGINT, FLOAT, DOUBLE, STRING, STRING, TIMESTAMP, INT, INT
 ====