You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2021/04/04 00:13:39 UTC
[impala] 01/02: Bump up the GBN number to 11920537
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
commit 1ab1143e98ff09610dff82d1795cf103659ffe97
Author: Vihang Karajgaonkar <vi...@apache.org>
AuthorDate: Tue Mar 23 12:09:57 2021 -0700
Bump up the GBN number to 11920537
This change bumps up the GBN to 11920537 which includes several
changes to Hive needed to support Catalogd's HMS endpoint for
supporting external frontends.
Additionally, it excludes some dependencies from the pom.xml
which are not uploaded by default to the toolchain.
After the GBN bump up Hive doesn't write '_orc_acid_version'
files and hence the FileMetadataLoaderTest needed to be
modified.
Change-Id: If88ceeaffc94e5bedf2c9953122109e20663f743
Reviewed-on: http://gerrit.cloudera.org:8080/17243
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
bin/impala-config.sh | 24 +++++++++++-----------
fe/pom.xml | 8 ++++++++
.../impala/catalog/FileMetadataLoaderTest.java | 3 +--
java/shaded-deps/hive-exec/pom.xml | 4 ++++
java/test-hive-udfs/pom.xml | 4 ++++
5 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 4cacc3c..2e3166e 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -176,20 +176,20 @@ export IMPALA_TOOLCHAIN_HOST
# and adjust existing tests that mentions them:
# * HIVE-23995
# * HIVE-24175
-export CDP_BUILD_NUMBER=7049391
+export CDP_BUILD_NUMBER=11920537
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.7.0-44
-export CDP_HADOOP_VERSION=3.1.1.7.2.7.0-44
-export CDP_HBASE_VERSION=2.2.6.7.2.7.0-44
-export CDP_HIVE_VERSION=3.1.3000.7.2.7.0-44
-export CDP_ICEBERG_VERSION=0.9.1.7.2.7.0-44
-export CDP_KNOX_VERSION=1.3.0.7.2.7.0-44
-export CDP_OZONE_VERSION=1.0.0.7.2.7.0-44
-export CDP_PARQUET_VERSION=1.10.99.7.2.7.0-44
-export CDP_RANGER_VERSION=2.1.0.7.2.7.0-44
-export CDP_TEZ_VERSION=0.9.1.7.2.7.0-44
-export CDP_GCS_VERSION=2.1.2.7.2.7.0-44
+export CDP_AVRO_JAVA_VERSION=1.8.2.7.2.9.0-146
+export CDP_HADOOP_VERSION=3.1.1.7.2.9.0-146
+export CDP_HBASE_VERSION=2.2.6.7.2.9.0-146
+export CDP_HIVE_VERSION=3.1.3000.7.2.9.0-146
+export CDP_ICEBERG_VERSION=0.9.1.7.2.9.0-146
+export CDP_KNOX_VERSION=1.3.0.7.2.9.0-146
+export CDP_OZONE_VERSION=1.0.0.7.2.9.0-146
+export CDP_PARQUET_VERSION=1.10.99.7.2.9.0-146
+export CDP_RANGER_VERSION=2.1.0.7.2.9.0-146
+export CDP_TEZ_VERSION=0.9.1.7.2.9.0-146
+export CDP_GCS_VERSION=2.1.2.7.2.9.0-146
export ARCH_NAME=$(uname -p)
diff --git a/fe/pom.xml b/fe/pom.xml
index e100ff3..73be13c 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -111,6 +111,10 @@ under the License.
<artifactId>ranger-plugins-common</artifactId>
<version>${ranger.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<!-- Exclude json-smart to pin the version -->
<exclusion>
<groupId>net.minidev</groupId>
@@ -133,6 +137,10 @@ under the License.
<artifactId>shiro-core</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
diff --git a/fe/src/test/java/org/apache/impala/catalog/FileMetadataLoaderTest.java b/fe/src/test/java/org/apache/impala/catalog/FileMetadataLoaderTest.java
index 9ccdc0c..5fd2f7f 100644
--- a/fe/src/test/java/org/apache/impala/catalog/FileMetadataLoaderTest.java
+++ b/fe/src/test/java/org/apache/impala/catalog/FileMetadataLoaderTest.java
@@ -159,8 +159,7 @@ public class FileMetadataLoaderTest {
fml.load();
// Only load the compacted file.
assertEquals(1, fml.getStats().loadedFiles);
- // 2 * 8 files since the hidden '_orc_acid_version' is filtered out later.
- assertEquals(16, fml.getStats().filesSupersededByAcidState);
+ assertEquals(8, fml.getStats().filesSupersededByAcidState);
}
@Test
diff --git a/java/shaded-deps/hive-exec/pom.xml b/java/shaded-deps/hive-exec/pom.xml
index 639abc6..95030c6 100644
--- a/java/shaded-deps/hive-exec/pom.xml
+++ b/java/shaded-deps/hive-exec/pom.xml
@@ -57,6 +57,10 @@ the same dependencies
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/java/test-hive-udfs/pom.xml b/java/test-hive-udfs/pom.xml
index eb63bb6..6ef7f24 100644
--- a/java/test-hive-udfs/pom.xml
+++ b/java/test-hive-udfs/pom.xml
@@ -70,6 +70,10 @@ under the License.
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-0.20</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>