Merge pull request #4 from arenadata/feature/apache-hive-4.0.0

Apache hive 4.0.0
arenadata · Jul 25, 2024 · c6f7036 · c6f7036
2 parents 749f4d1 + 116003b
commit c6f7036
Show file tree

Hide file tree

Showing 14 changed files with 1,223 additions and 1,069 deletions.
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
@@ -226,8 +226,8 @@ export IMPALA_THRIFT_CPP_VERSION=0.16.0-p7
 unset IMPALA_THRIFT_CPP_URL
 if $USE_APACHE_HIVE; then
   # Apache Hive 3 clients can't run on thrift versions >= 0.14 (IMPALA-11801)
-  export IMPALA_THRIFT_POM_VERSION=0.11.0
-  export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p5
+  export IMPALA_THRIFT_POM_VERSION=0.16.0
+  export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p7
 else
   export IMPALA_THRIFT_POM_VERSION=0.16.0
   export IMPALA_THRIFT_JAVA_VERSION=${IMPALA_THRIFT_POM_VERSION}-p7
@@ -272,8 +272,8 @@ export CDP_TEZ_VERSION=0.9.1.7.2.18.0-369
 # Ref: https://infra.apache.org/release-download-pages.html#closer
 : ${APACHE_MIRROR:="https://www.apache.org/dyn/closer.cgi"}
 export APACHE_MIRROR
-export APACHE_HIVE_VERSION=3.1.3
-export APACHE_HIVE_STORAGE_API_VERSION=2.7.0
+export APACHE_HIVE_VERSION=4.0.0
+export APACHE_HIVE_STORAGE_API_VERSION=4.0.0
 export APACHE_OZONE_VERSION=1.3.0
 
 # Java dependencies that are not also runtime components. Declaring versions here allows
@@ -648,7 +648,7 @@ else
 fi
 # Set the path to the hive_metastore.thrift which is used to build thrift code
 export HIVE_METASTORE_THRIFT_DIR=${HIVE_METASTORE_THRIFT_DIR_OVERRIDE:-\
-"$HIVE_SRC_DIR/standalone-metastore/src/main/thrift"}
+"$HIVE_SRC_DIR/standalone-metastore/metastore-common/src/main/thrift"}
 export TEZ_HOME="$CDP_COMPONENTS_HOME/tez-${IMPALA_TEZ_VERSION}-minimal"
 export HBASE_HOME="$CDP_COMPONENTS_HOME/hbase-${IMPALA_HBASE_VERSION}/"
 if $USE_APACHE_OZONE; then

diff --git a/fe/pom.xml b/fe/pom.xml
@@ -494,6 +494,7 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
+
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-classification</artifactId>
@@ -502,9 +503,50 @@ under the License.
 
     <dependency>
       <groupId>org.apache.hive</groupId>
-      <artifactId>hive-standalone-metastore</artifactId>
+      <artifactId>hive-standalone-metastore-common</artifactId>
+      <version>${hive.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jcl</artifactId>
+        </exclusion>
+        <!-- Impala uses log4j v1; avoid pulling in slf4j handling for log4j2 -->
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-1.2-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>hive-serde</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>hive-shims</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.cloudera</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
       <version>${hive.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jcl</artifactId>
+        </exclusion>
         <!-- Impala uses log4j v1; avoid pulling in slf4j handling for log4j2 -->
         <exclusion>
           <groupId>org.apache.logging.log4j</groupId>
@@ -1113,22 +1155,6 @@ under the License.
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.11.0</version>
-            <configuration>
-              <excludes>
-                <exclude>**/org/apache/impala/catalog/metastore/*.java</exclude>
-                <exclude>**/org/apache/impala/catalog/CatalogHmsAPIHelper.java</exclude>
-                <exclude>**/org/apache/impala/catalog/CompactionInfoLoader.java</exclude>
-              </excludes>
-              <testExcludes>
-                <testExclude>**/org/apache/impala/catalog/metastore/*.java</testExclude>
-                <testExclude>**/org/apache/impala/testutil/Catalog*.java</testExclude>
-              </testExcludes>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>