[impala] branch master updated (dced8ca27 -> 85e1a3e33)

[st...@apache.org]

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

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


    from dced8ca27 IMPALA-12217: Update cgroup-util to handle cgroups v2
     new 4bb705e7c IMPALA-12223: Bump thrift to 0.16.0-p5 to fix THRIFT-5716
     new 85e1a3e33 IMPALA-12218: Exclude Ranger's ORC dependency

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/impala-config.sh | 8 ++++----
 fe/pom.xml           | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

[impala] 01/02: IMPALA-12223: Bump thrift to 0.16.0-p5 to fix THRIFT-5716

[st...@apache.org]

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

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

commit 4bb705e7ca70dd38fdf97d43a44957fdca809ca5
Author: stiga-huang <hu...@gmail.com>
AuthorDate: Thu Jun 22 16:08:43 2023 +0800

    IMPALA-12223: Bump thrift to 0.16.0-p5 to fix THRIFT-5716
    
    This bumps the toolchain version to add the fix of THRIFT-5716 which
    causes coordinator crashes in serializing large profiles.
    
    Tests:
     - Verified the build on Ubuntu18 and the recently supported Ubuntu22
       and Redhat9.
    
    Change-Id: I2b07843778b160f914d9250c3d1066c09056c198
    Reviewed-on: http://gerrit.cloudera.org:8080/20107
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/impala-config.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 778f7b9ca..d6b7715f0 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -81,7 +81,7 @@ export USE_APACHE_HIVE=${USE_APACHE_HIVE-false}
 # 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=320-33e177225e
+export IMPALA_TOOLCHAIN_BUILD_ID=324-bb64c6ed91
 # Versions of toolchain dependencies.
 # -----------------------------------
 export IMPALA_AVRO_VERSION=1.7.4-p5
@@ -184,7 +184,7 @@ unset IMPALA_CALLONCEHACK_URL
 # If upgrading IMPALA_THRIFT_PY_VERSION, remember to also upgrade thrift version in
 # shell/ext-py and shell/packaging/requirements.txt. IMPALA_THRIFT_PY_VERSION is used
 # with Impyla and for the thrift compiler.
-export IMPALA_THRIFT_CPP_VERSION=0.16.0-p4
+export IMPALA_THRIFT_CPP_VERSION=0.16.0-p5
 unset IMPALA_THRIFT_CPP_URL
 if $USE_APACHE_HIVE; then
   # Apache Hive 3 clients can't run on thrift versions >= 0.14 (IMPALA-11801)
@@ -192,10 +192,10 @@ if $USE_APACHE_HIVE; then
   export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p5
 else
   export IMPALA_THRIFT_POM_VERSION=0.16.0
-  export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p4
+  export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p5
 fi
 unset IMPALA_THRIFT_JAVA_URL
-export IMPALA_THRIFT_PY_VERSION=0.16.0-p4
+export IMPALA_THRIFT_PY_VERSION=0.16.0-p5
 unset IMPALA_THRIFT_PY_URL
 
 # Find system python versions for testing

[impala] 02/02: IMPALA-12218: Exclude Ranger's ORC dependency

[st...@apache.org]

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

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

commit 85e1a3e33b9a3f55684e321f5ad180d4fc04c5ad
Author: Laszlo Gaal <la...@cloudera.com>
AuthorDate: Wed May 31 20:22:31 2023 +0200

    IMPALA-12218: Exclude Ranger's ORC dependency
    
    Since RANGER-1837 Ranger has a dependency on ORC, as it became capable
    of writing audit information in ORC format in addition to the text-based
    formats supported earlier (JSON, CSV).
    The Impala front-end has its own direct ORC dependency, for which
    versioning is driven by the front-end's Iceberg dependency, as Iceberg
    needs quite recent versions of the file formats libraries, including
    ORC.
    
    Since the front-end's Ranger plugin requires only basic functionality
    from ORC, which is expected to be compatible across versions,
    the potential version conflict between the two dependencies is resolved
    by excluding Ranger's transitive ORC dependency from the Impala build.
    
    Tested by building the front-end locally, then passing a core-mode test
    run on Jenkins.
    
    Change-Id: I368489016795020d590ab6d12d656327d7911eb7
    Reviewed-on: http://gerrit.cloudera.org:8080/20081
    Reviewed-by: Joe McDonnell <jo...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 fe/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fe/pom.xml b/fe/pom.xml
index 6cea36f97..549abf499 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -199,6 +199,14 @@ under the License.
           <groupId>org.apache.shiro</groupId>
           <artifactId>shiro-core</artifactId>
         </exclusion>
+        <!-- RANGER-1837 causes Ranger to pull in ORC dependencies.
+        We have a much tighter coupling with the ORC version required by the Iceberg
+        dependency (which is likely to conflict), so the indirect dependency
+        through Ranger is excluded here. -->
+        <exclusion>
+          <groupId>org.apache.orc</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
         <!--
         We do not explicitly exclude all artifacts in org.eclipse.jetty because
         jetty-client is needed.