You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by tm...@apache.org on 2022/08/10 07:26:40 UTC

[impala] 01/04: IMPALA-11465, IMPALA-11466: Bump CDP_BUILD_NUMBER to 30010248

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

tmater pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 05c3a8e09ce2e0180186639508b5c77eb01e919d
Author: Riza Suminto <ri...@cloudera.com>
AuthorDate: Sat Jul 30 22:02:54 2022 -0700

    IMPALA-11465, IMPALA-11466: Bump CDP_BUILD_NUMBER to 30010248
    
    This patch bump up CDP_BUILD_NUMBER to pick Hive version
    3.1.3000.7.2.16.0-127 that contains:
    - thrift-0.16.0 upgrade from HIVE-25635.
    - Backport of ORC-517.
    
    This patch also contains fix for IMPALA-11466 by adding jetty-server as
    an allowed dependency.
    
    Testing:
    - Build locally and confirm that the cdp components is downloaded.
    
    Change-Id: Iff5297a48865fb2444e8ef7b9881536dc1bbf63c
    Reviewed-on: http://gerrit.cloudera.org:8080/18803
    Reviewed-by: Riza Suminto <ri...@cloudera.com>
    Tested-by: Riza Suminto <ri...@cloudera.com>
---
 bin/impala-config.sh                               | 24 +++++++++++-----------
 fe/pom.xml                                         |  7 +++++++
 .../queries/QueryTest/orc-stats.test               | 11 +++-------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 753b8b13d..d8bf48e65 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -198,20 +198,20 @@ fi
 : ${IMPALA_TOOLCHAIN_HOST:=native-toolchain.s3.amazonaws.com}
 export IMPALA_TOOLCHAIN_HOST
 
-export CDP_BUILD_NUMBER=27992803
+export CDP_BUILD_NUMBER=30010248
 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.16.0-77
-export CDP_HADOOP_VERSION=3.1.1.7.2.16.0-77
-export CDP_HBASE_VERSION=2.4.6.7.2.16.0-77
-export CDP_HIVE_VERSION=3.1.3000.7.2.16.0-77
-export CDP_ICEBERG_VERSION=0.13.1.7.2.16.0-77
-export CDP_KNOX_VERSION=1.3.0.7.2.16.0-77
-export CDP_OZONE_VERSION=1.1.0.7.2.16.0-77
-export CDP_PARQUET_VERSION=1.10.99.7.2.16.0-77
-export CDP_RANGER_VERSION=2.1.0.7.2.16.0-77
-export CDP_TEZ_VERSION=0.9.1.7.2.16.0-77
-export CDP_GCS_VERSION=2.1.2.7.2.16.0-77
+export CDP_AVRO_JAVA_VERSION=1.8.2.7.2.16.0-127
+export CDP_HADOOP_VERSION=3.1.1.7.2.16.0-127
+export CDP_HBASE_VERSION=2.4.6.7.2.16.0-127
+export CDP_HIVE_VERSION=3.1.3000.7.2.16.0-127
+export CDP_ICEBERG_VERSION=0.13.1.7.2.16.0-127
+export CDP_KNOX_VERSION=1.3.0.7.2.16.0-127
+export CDP_OZONE_VERSION=1.1.0.7.2.16.0-127
+export CDP_PARQUET_VERSION=1.10.99.7.2.16.0-127
+export CDP_RANGER_VERSION=2.3.0.7.2.16.0-127
+export CDP_TEZ_VERSION=0.9.1.7.2.16.0-127
+export CDP_GCS_VERSION=2.1.2.7.2.16.0-127
 
 # Ref: https://infra.apache.org/release-download-pages.html#closer
 : ${APACHE_MIRROR:="https://www.apache.org/dyn/closer.cgi"}
diff --git a/fe/pom.xml b/fe/pom.xml
index 25496d633..8bb051c84 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -518,6 +518,11 @@ under the License.
       <version>3.2.0-m3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.4.31.v20200723</version>
+    </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.pac4j/pac4j-saml -->
     <dependency>
@@ -859,6 +864,8 @@ under the License.
                     <include>org.eclipse.jetty:jetty-client</include>
                     <include>org.eclipse.jetty:jetty-http</include>
                     <include>org.eclipse.jetty:jetty-io</include>
+                    <!-- jetty-server is required when HiveMetaStoreClient is instantiated after HIVE-21456. -->
+                    <include>org.eclipse.jetty:jetty-server</include>
                     <!-- hadoop-yarn-common depends on some Jetty utilities. -->
                     <include>org.eclipse.jetty:jetty-util</include>
                     <!-- Include the allowed versions specifically -->
diff --git a/testdata/workloads/functional-query/queries/QueryTest/orc-stats.test b/testdata/workloads/functional-query/queries/QueryTest/orc-stats.test
index fbe24d4d1..d43049c4d 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/orc-stats.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/orc-stats.test
@@ -330,14 +330,11 @@ aggregation(SUM, RowsRead): 100
 ====
 ---- QUERY
 # Test on predicate x < min_val for decimal(9,0).
-# Due to ORC-517 not included in the current Hive version (3.1.3000.7.2.12.0-104),
-# the ORC files have wrong statistics on d1 column showing that its minimum is 0.
-# So we still see RowsRead=5 here.
 select count(*) from functional_orc_def.decimal_tbl where d1 < 1234
 ---- RESULTS
 0
 ---- RUNTIME_PROFILE
-aggregation(SUM, RowsRead): 5
+aggregation(SUM, RowsRead): 0
 ====
 ---- QUERY
 select count(*) from functional_orc_def.decimal_tbl where d1 < 0
@@ -734,11 +731,9 @@ aggregation(SUM, RowsRead): 13
 ---- QUERY
 # Test pushing down IN-list predicate with literals outside the value range. Explicitly cast
 # the literals so FE won't wrap 'd1' as casting to INT, so the predicate can be pushed down.
-# Due to ORC-517 not included in the current Hive version (3.1.3000.7.2.12.0-104),
-# the ORC files have wrong statistics on d1 column showing that its minimum is 0. So here we
-# use -1 to be smaller than it. The max of d1 is 132842 so we use 132843.
+# The min and max of d1 are 1234 and 132842 so we use 1233 and 132843.
 select count(*) from functional_orc_def.decimal_tbl
-where d1 in (cast(-1 as decimal(9,0)), cast(132843 as decimal(9,0)));
+where d1 in (cast(1233 as decimal(9,0)), cast(132843 as decimal(9,0)));
 ---- RESULTS
 0
 ---- RUNTIME_PROFILE