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

garyli 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 34ab756  [HUDI-1948] Shade kryo-shaded jar for hudi flink bundle 
(#3014)
34ab756 is described below

commit 34ab756a40b8ff25984a809803bffbe97c00a4ab
Author: Danny Chan <[email protected]>
AuthorDate: Mon May 31 17:39:19 2021 +0800

    [HUDI-1948] Shade kryo-shaded jar for hudi flink bundle (#3014)
---
 packaging/hudi-flink-bundle/pom.xml | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packaging/hudi-flink-bundle/pom.xml 
b/packaging/hudi-flink-bundle/pom.xml
index 9e2b5f9..614f5da 100644
--- a/packaging/hudi-flink-bundle/pom.xml
+++ b/packaging/hudi-flink-bundle/pom.xml
@@ -32,7 +32,7 @@
     <checkstyle.skip>true</checkstyle.skip>
     <main.basedir>${project.parent.basedir}</main.basedir>
     <flink.bundle.hive.scope>provided</flink.bundle.hive.scope>
-    
<flink.bundle.hive.shade.prefix>org.apache.hudi.</flink.bundle.hive.shade.prefix>
+    <flink.bundle.shade.prefix>org.apache.hudi.</flink.bundle.shade.prefix>
     <javax.servlet.version>3.1.0</javax.servlet.version>
     <!-- override to be same with flink 1.12.2 -->
     <parquet.version>1.11.1</parquet.version>
@@ -120,6 +120,9 @@
                   <include>org.eclipse.jetty.websocket:*</include>
                   <include>javax.servlet:javax.servlet-api</include>
 
+                  <!-- Used for HUDI write handle -->
+                  <inclide>com.esotericsoftware:kryo-shaded</inclide>
+
                   
<include>org.apache.flink:flink-hadoop-compatibility_${scala.binary.version}</include>
                   <include>org.apache.flink:flink-avro</include>
                   <include>org.apache.flink:flink-json</include>
@@ -141,59 +144,63 @@
               <relocations>
                 <relocation>
                   <pattern>org.apache.avro.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.avro.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.avro.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.parquet.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.parquet.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.parquet.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>com.yammer.metrics.</pattern>
-                  
<shadedPattern>org.apache.hudi.com.yammer.metrics.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}com.yammer.metrics.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>com.beust.jcommander.</pattern>
-                  
<shadedPattern>org.apache.hudi.com.beust.jcommander.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}com.beust.jcommander.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hive.jdbc.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hive.jdbc.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hive.jdbc.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hadoop.hive.metastore.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hadoop.hive.metastore.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hadoop.hive.metastore.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hive.common.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hive.common.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hive.common.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hadoop.hive.common.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hadoop.hive.common.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hadoop.hive.common.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hadoop.hive.conf.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hadoop.hive.conf.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hadoop.hive.conf.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hive.service.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hive.service.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hive.service.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hadoop.hive.service.</pattern>
-                  
<shadedPattern>${flink.bundle.hive.shade.prefix}org.apache.hadoop.hive.service.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.hadoop.hive.service.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>com.codahale.metrics.</pattern>
-                  
<shadedPattern>org.apache.hudi.com.codahale.metrics.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}com.codahale.metrics.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.commons.codec.</pattern>
-                  
<shadedPattern>org.apache.hudi.org.apache.commons.codec.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.commons.codec.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>org.eclipse.jetty.</pattern>
-                  
<shadedPattern>org.apache.hudi.org.apache.jetty.</shadedPattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}org.apache.jetty.</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.esotericsoftware.kryo.</pattern>
+                  
<shadedPattern>${flink.bundle.shade.prefix}com.esotericsoftware.kryo.</shadedPattern>
                 </relocation>
               </relocations>
               <filters>

Reply via email to