From 5536e5402540e76d7fef508054b12674cb947e84 Mon Sep 17 00:00:00 2001
From: basapuram-kumar <basapuram@acceldata.io>
Date: Mon, 5 Aug 2024 11:56:57 +0530
Subject: [PATCH] ODP-1841: Hive - HMS | Unable to run hive queries (#35)

* ODP-1838: handling NoClassDefFoundError for com.google.guava:failureaccess for Hive-4.0.0

(cherry picked from commit ed5f688d5078ea51cf8679a746d06460d57904af)
(cherry picked from commit a2fb224611b05f591160288f41b05a58555288c2)

* undo partial ODP-1640

---------
---
 packaging/src/main/assembly/bin.xml | 4 ++--
 ql/pom.xml                          | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml
index afda80ae65f4..871e3024aa95 100644
--- a/packaging/src/main/assembly/bin.xml
+++ b/packaging/src/main/assembly/bin.xml
@@ -39,11 +39,11 @@
       <useStrictFiltering>false</useStrictFiltering>
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <excludes>
-        <!--exclude>org.apache.calcite:*</exclude-->
+        <exclude>org.apache.calcite:*</exclude>
         <exclude>org.apache.hadoop:*</exclude>
         <exclude>org.apache.hive.hcatalog:*</exclude>
         <exclude>org.slf4j:*</exclude>
-        <!--exclude>log4j:*</exclude-->
+        <exclude>log4j:*</exclude>
         <exclude>ch.qos.reload4j:*</exclude>
         <exclude>junit:*</exclude>
         <exclude>commons-configuration:commons-configuration</exclude>
diff --git a/ql/pom.xml b/ql/pom.xml
index 613b3d3c8c16..4ecf0c04395c 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -1103,6 +1103,7 @@
                   <include>org.roaringbitmap:RoaringBitmap</include>
                   <include>org.roaringbitmap:shims</include>
                   <include>com.github.luben:zstd-jni</include>
+                  <include>com.google.guava:failureaccess</include>
                 </includes>
               </artifactSet>
               <filters>
@@ -1124,6 +1125,10 @@
                 </filter>
               </filters>
               <relocations>
+                <relocation>
+                  <pattern>com.google.common.util.concurrent.internal</pattern>
+                  <shadedPattern>org.apache.hive.com.google.common.util.concurrent.internal</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>com.esotericsoftware</pattern>
                   <shadedPattern>org.apache.hive.com.esotericsoftware</shadedPattern>