You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yi...@apache.org on 2024/10/03 01:10:45 UTC

(hudi) branch master updated: [HUDI-8082] Fix netty dependency conflict in hudi-gcp module (#12038)

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

yihua 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 2cbf7483cd7 [HUDI-8082] Fix netty dependency conflict in hudi-gcp module (#12038)
2cbf7483cd7 is described below

commit 2cbf7483cd79affde04a43d98c73b2ce54521e50
Author: Lin Liu <14...@users.noreply.github.com>
AuthorDate: Wed Oct 2 18:10:38 2024 -0700

    [HUDI-8082] Fix netty dependency conflict in hudi-gcp module (#12038)
---
 hudi-gcp/pom.xml                                                    | 6 ++++++
 .../hudi/utilities/deltastreamer/TestSparkSampleWritesUtils.java    | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hudi-gcp/pom.xml b/hudi-gcp/pom.xml
index be6ac446aac..b1fb88dc8f4 100644
--- a/hudi-gcp/pom.xml
+++ b/hudi-gcp/pom.xml
@@ -65,6 +65,12 @@ See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-common</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/deltastreamer/TestSparkSampleWritesUtils.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/deltastreamer/TestSparkSampleWritesUtils.java
index 94638b4dad7..2706a97e5d5 100644
--- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/deltastreamer/TestSparkSampleWritesUtils.java
+++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/deltastreamer/TestSparkSampleWritesUtils.java
@@ -35,7 +35,6 @@ import org.apache.hudi.utilities.streamer.SparkSampleWritesUtils;
 import org.apache.spark.api.java.JavaRDD;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -86,7 +85,6 @@ public class TestSparkSampleWritesUtils extends SparkClientFunctionalTestHarness
     assertEquals(originalRecordSize, originalWriteConfig.getCopyOnWriteRecordSizeEstimate(), "Original record size estimate should not be changed.");
   }
 
-  @Disabled("HUDI-8082")
   @Test
   public void overwriteRecordSizeEstimateForEmptyTable() {
     int originalRecordSize = 100;