(hudi) branch master updated: [HUDI-7951] Fix conflict caused by classes using avro in hudi-aws-bundle (#11563)

[danny0405]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d91fd2b3bb3 [HUDI-7951] Fix conflict caused by classes using avro in 
hudi-aws-bundle (#11563)
d91fd2b3bb3 is described below

commit d91fd2b3bb315dc2d0510a2c6426c4b94fa1b053
Author: Shawn Chang <42792772+c...@users.noreply.github.com>
AuthorDate: Thu Jul 4 01:23:24 2024 -0700

    [HUDI-7951] Fix conflict caused by classes using avro in hudi-aws-bundle 
(#11563)
---
 .../main/java/org/apache/hudi/table/catalog/HoodieHiveCatalog.java    | 4 ++--
 packaging/hudi-aws-bundle/pom.xml                                     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/HoodieHiveCatalog.java
 
b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/HoodieHiveCatalog.java
index 1a021e110fd..ffb989b53fd 100644
--- 
a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/HoodieHiveCatalog.java
+++ 
b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/HoodieHiveCatalog.java
@@ -357,7 +357,7 @@ public class HoodieHiveCatalog extends AbstractCatalog {
   private Table isHoodieTable(Table hiveTable) {
     if (!hiveTable.getParameters().getOrDefault(SPARK_SOURCE_PROVIDER, 
"").equalsIgnoreCase("hudi")
         && !isFlinkHoodieTable(hiveTable)) {
-      throw new HoodieCatalogException(String.format("the %s is not hoodie 
table", hiveTable.getTableName()));
+      throw new HoodieCatalogException(String.format("Table %s is not a hoodie 
table", hiveTable.getTableName()));
     }
     return hiveTable;
   }
@@ -374,7 +374,7 @@ public class HoodieHiveCatalog extends AbstractCatalog {
     } catch (NoSuchObjectException e) {
       throw new TableNotExistException(getName(), tablePath);
     } catch (TException e) {
-      throw new HoodieCatalogException(String.format("Failed to get table %s 
from Hive metastore", tablePath.getObjectName()));
+      throw new HoodieCatalogException(String.format("Failed to get table %s 
from Hive metastore", tablePath.getObjectName()), e);
     }
   }
 
diff --git a/packaging/hudi-aws-bundle/pom.xml 
b/packaging/hudi-aws-bundle/pom.xml
index f55a97d67e1..2616bf8e97f 100644
--- a/packaging/hudi-aws-bundle/pom.xml
+++ b/packaging/hudi-aws-bundle/pom.xml
@@ -72,7 +72,6 @@
                             </transformers>
                             <artifactSet>
                                 <includes combine.children="append">
-                                    
<include>org.apache.hudi:hudi-hadoop-common</include>
                                     
<include>org.apache.hudi:hudi-hadoop-mr</include>
                                     
<include>org.apache.hudi:hudi-sync-common</include>
                                     
<include>org.apache.hudi:hudi-hive-sync</include>