Exclude org.apache.hadoop.hbase.KeyValue.KeyComparator from shading for backward compatibility

yihua · yihua · commit 8ebfdf950e37 · 2022-03-20T18:20:21.000-07:00
diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml
@@ -178,6 +178,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-hadoop-mr-bundle/pom.xml b/packaging/hudi-hadoop-mr-bundle/pom.xml
@@ -118,6 +118,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml
@@ -199,6 +199,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-kafka-connect-bundle/pom.xml b/packaging/hudi-kafka-connect-bundle/pom.xml
@@ -161,6 +161,9 @@
                                 <relocation>
                                     <pattern>org.apache.hadoop.hbase.</pattern>
                                     <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                                    <excludes>
+                                        <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                                    </excludes>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-presto-bundle/pom.xml b/packaging/hudi-presto-bundle/pom.xml
@@ -109,6 +109,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
@@ -150,6 +150,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml
@@ -227,6 +227,9 @@
                     <relocation>
                         <pattern>org.apache.hadoop.hbase.</pattern>
                         <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                        <excludes>
+                            <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                        </excludes>
                     </relocation>
                     <relocation>
                         <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-trino-bundle/pom.xml b/packaging/hudi-trino-bundle/pom.xml
@@ -111,6 +111,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml
@@ -187,6 +187,9 @@
                 <relocation>
                   <pattern>org.apache.hadoop.hbase.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.hadoop.hbase.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.hadoop.hbase.KeyValue$KeyComparator</exclude>
+                  </excludes>
                 </relocation>
                 <relocation>
                   <pattern>org.apache.hbase.</pattern>
