[dependency] Update paimon-shade version; replace flink-shaded-netty …

…by paimon-shaded-netty (apache#2792)
sunxiaojian · Jan 27, 2024 · 5d5733b · 5d5733b
1 parent 41e9202
commit 5d5733b
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 79 deletions.
diff --git a/paimon-bundle/pom.xml b/paimon-bundle/pom.xml
@@ -108,6 +108,12 @@ under the License.
             <artifactId>paimon-shade-caffeine-2</artifactId>
             <version>${paimon.shade.caffeine.version}-${paimon.shade.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.paimon</groupId>
+            <artifactId>paimon-shade-netty-4</artifactId>
+            <version>${paimon.shade.netty.version}-${paimon.shade.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -129,6 +135,7 @@ under the License.
                                     <include>org.apache.paimon:paimon-shade-jackson-2</include>
                                     <include>org.apache.paimon:paimon-shade-guava-30</include>
                                     <include>org.apache.paimon:paimon-shade-caffeine-2</include>
+                                    <include>org.apache.paimon:paimon-shade-netty-4</include>
 
                                     <!-- Paimon -->
                                     <include>org.apache.paimon:paimon-common</include>

diff --git a/paimon-service/paimon-service-client/pom.xml b/paimon-service/paimon-service-client/pom.xml
@@ -31,10 +31,6 @@ under the License.
     <artifactId>paimon-service-client</artifactId>
     <name>Paimon : Service : Client</name>
 
-    <properties>
-        <flink.shaded.version>17.0</flink.shaded.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.paimon</groupId>
@@ -51,9 +47,9 @@ under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-shaded-netty</artifactId>
-            <version>4.1.91.Final-${flink.shaded.version}</version>
+            <groupId>org.apache.paimon</groupId>
+            <artifactId>paimon-shade-netty-4</artifactId>
+            <version>${paimon.shade.netty.version}-${paimon.shade.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...ice/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvRequest.java b/...ice/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvRequest.java
@@ -22,7 +22,7 @@
 import org.apache.paimon.service.network.messages.MessageBody;
 import org.apache.paimon.service.network.messages.MessageDeserializer;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

diff --git a/...ce/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvResponse.java b/...ce/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvResponse.java
@@ -22,7 +22,7 @@
 import org.apache.paimon.service.network.messages.MessageBody;
 import org.apache.paimon.service.network.messages.MessageDeserializer;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

diff --git a/...service-client/src/main/java/org/apache/paimon/service/network/AbstractServerHandler.java b/...service-client/src/main/java/org/apache/paimon/service/network/AbstractServerHandler.java
@@ -25,13 +25,14 @@
 import org.apache.paimon.utils.ExceptionUtils;
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFuture;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFutureListener;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandler;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
-import org.apache.flink.shaded.netty4.io.netty.util.ReferenceCountUtil;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelFuture;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelFutureListener;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandler;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.paimon.shade.netty4.io.netty.util.ReferenceCountUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...paimon-service-client/src/main/java/org/apache/paimon/service/network/ChunkedByteBuf.java b/...paimon-service-client/src/main/java/org/apache/paimon/service/network/ChunkedByteBuf.java
@@ -20,11 +20,11 @@
 
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import org.apache.flink.shaded.netty4.io.netty.handler.stream.ChunkedInput;
-import org.apache.flink.shaded.netty4.io.netty.handler.stream.ChunkedWriteHandler;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.paimon.shade.netty4.io.netty.handler.stream.ChunkedInput;
+import org.apache.paimon.shade.netty4.io.netty.handler.stream.ChunkedWriteHandler;
 
 /**
  * A {@link ByteBuf} instance to be consumed in chunks by {@link ChunkedWriteHandler}, respecting

diff --git a/.../paimon-service-client/src/main/java/org/apache/paimon/service/network/ClientHandler.java b/.../paimon-service-client/src/main/java/org/apache/paimon/service/network/ClientHandler.java
@@ -24,10 +24,11 @@
 import org.apache.paimon.service.network.messages.RequestFailure;
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
-import org.apache.flink.shaded.netty4.io.netty.util.ReferenceCountUtil;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.paimon.shade.netty4.io.netty.util.ReferenceCountUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...aimon-service-client/src/main/java/org/apache/paimon/service/network/NettyBufferPool.java b/...aimon-service-client/src/main/java/org/apache/paimon/service/network/NettyBufferPool.java
@@ -18,10 +18,10 @@
 
 package org.apache.paimon.service.network;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import org.apache.flink.shaded.netty4.io.netty.buffer.CompositeByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.buffer.PooledByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.buffer.CompositeByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.PooledByteBufAllocator;
 
 import static org.apache.paimon.utils.Preconditions.checkArgument;
 

diff --git a/.../paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkClient.java b/.../paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkClient.java
@@ -29,18 +29,18 @@
 import org.apache.paimon.utils.Preconditions;
 
 import org.apache.paimon.shade.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.paimon.shade.netty4.io.netty.bootstrap.Bootstrap;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelFutureListener;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelOption;
+import org.apache.paimon.shade.netty4.io.netty.channel.EventLoopGroup;
+import org.apache.paimon.shade.netty4.io.netty.channel.nio.NioEventLoopGroup;
+import org.apache.paimon.shade.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.paimon.shade.netty4.io.netty.channel.socket.nio.NioSocketChannel;
+import org.apache.paimon.shade.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.apache.paimon.shade.netty4.io.netty.handler.stream.ChunkedWriteHandler;
 
-import org.apache.flink.shaded.netty4.io.netty.bootstrap.Bootstrap;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFutureListener;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInitializer;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelOption;
-import org.apache.flink.shaded.netty4.io.netty.channel.EventLoopGroup;
-import org.apache.flink.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
-import org.apache.flink.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import org.apache.flink.shaded.netty4.io.netty.channel.socket.nio.NioSocketChannel;
-import org.apache.flink.shaded.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-import org.apache.flink.shaded.netty4.io.netty.handler.stream.ChunkedWriteHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkServer.java b/.../paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkServer.java
@@ -27,17 +27,17 @@
 import org.apache.paimon.utils.Preconditions;
 
 import org.apache.paimon.shade.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.paimon.shade.netty4.io.netty.bootstrap.ServerBootstrap;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelFuture;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelOption;
+import org.apache.paimon.shade.netty4.io.netty.channel.EventLoopGroup;
+import org.apache.paimon.shade.netty4.io.netty.channel.nio.NioEventLoopGroup;
+import org.apache.paimon.shade.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.paimon.shade.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.apache.paimon.shade.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.apache.paimon.shade.netty4.io.netty.handler.stream.ChunkedWriteHandler;
 
-import org.apache.flink.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFuture;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInitializer;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelOption;
-import org.apache.flink.shaded.netty4.io.netty.channel.EventLoopGroup;
-import org.apache.flink.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
-import org.apache.flink.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import org.apache.flink.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
-import org.apache.flink.shaded.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-import org.apache.flink.shaded.netty4.io.netty.handler.stream.ChunkedWriteHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...imon-service-client/src/main/java/org/apache/paimon/service/network/ServerConnection.java b/...imon-service-client/src/main/java/org/apache/paimon/service/network/ServerConnection.java
@@ -24,10 +24,11 @@
 import org.apache.paimon.utils.FutureUtils;
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.channel.Channel;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFuture;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelFutureListener;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.channel.Channel;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelFuture;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelFutureListener;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...-client/src/main/java/org/apache/paimon/service/network/messages/MessageDeserializer.java b/...-client/src/main/java/org/apache/paimon/service/network/messages/MessageDeserializer.java
@@ -18,7 +18,7 @@
 
 package org.apache.paimon.service.network.messages;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
 
 /**
  * A utility used to deserialize a {@link MessageBody message}.

diff --git a/...ce-client/src/main/java/org/apache/paimon/service/network/messages/MessageSerializer.java b/...ce-client/src/main/java/org/apache/paimon/service/network/messages/MessageSerializer.java
@@ -22,10 +22,10 @@
 import org.apache.paimon.service.network.NetworkServer;
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufAllocator;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufInputStream;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBufOutputStream;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBufInputStream;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBufOutputStream;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

diff --git a/...paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvRequestTest.java b/...paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvRequestTest.java
@@ -21,8 +21,9 @@
 import org.apache.paimon.data.BinaryRow;
 import org.apache.paimon.data.BinaryRowWriter;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.UnpooledByteBufAllocator;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.Random;

diff --git a/...aimon-service-client/src/test/java/org/apache/paimon/service/messages/KvResponseTest.java b/...aimon-service-client/src/test/java/org/apache/paimon/service/messages/KvResponseTest.java
@@ -20,8 +20,9 @@
 
 import org.apache.paimon.data.BinaryRow;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.UnpooledByteBufAllocator;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.Random;

diff --git a/...aimon-service-runtime/src/main/java/org/apache/paimon/service/server/KvServerHandler.java b/...aimon-service-runtime/src/main/java/org/apache/paimon/service/server/KvServerHandler.java
@@ -31,7 +31,7 @@
 import org.apache.paimon.utils.ExceptionUtils;
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandler;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandler;
 
 import java.util.concurrent.CompletableFuture;
 

diff --git a/...on-service-runtime/src/test/java/org/apache/paimon/service/network/ClientHandlerTest.java b/...on-service-runtime/src/test/java/org/apache/paimon/service/network/ClientHandlerTest.java
@@ -24,8 +24,9 @@
 import org.apache.paimon.service.network.messages.MessageBody;
 import org.apache.paimon.service.network.messages.MessageSerializer;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.channel.embedded.EmbeddedChannel;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.channel.embedded.EmbeddedChannel;
+
 import org.junit.jupiter.api.Test;
 
 import java.nio.channels.ClosedChannelException;

diff --git a/...on-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkClientTest.java b/...on-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkClientTest.java
@@ -28,17 +28,18 @@
 import org.apache.paimon.testutils.assertj.PaimonAssertions;
 import org.apache.paimon.utils.ExceptionUtils;
 
-import org.apache.flink.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
-import org.apache.flink.shaded.netty4.io.netty.channel.Channel;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandler;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandlerContext;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
-import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInitializer;
-import org.apache.flink.shaded.netty4.io.netty.channel.nio.NioEventLoopGroup;
-import org.apache.flink.shaded.netty4.io.netty.channel.socket.SocketChannel;
-import org.apache.flink.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
-import org.apache.flink.shaded.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.apache.paimon.shade.netty4.io.netty.bootstrap.ServerBootstrap;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.channel.Channel;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandler;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.paimon.shade.netty4.io.netty.channel.ChannelInitializer;
+import org.apache.paimon.shade.netty4.io.netty.channel.nio.NioEventLoopGroup;
+import org.apache.paimon.shade.netty4.io.netty.channel.socket.SocketChannel;
+import org.apache.paimon.shade.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.apache.paimon.shade.netty4.io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...on-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkServerTest.java b/...on-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkServerTest.java
@@ -26,7 +26,8 @@
 import org.apache.paimon.service.network.stats.ServiceRequestStats;
 import org.apache.paimon.utils.Preconditions;
 
-import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.paimon.shade.netty4.io.netty.buffer.ByteBuf;
+
 import org.junit.jupiter.api.Test;
 
 import java.net.InetAddress;

diff --git a/pom.xml b/pom.xml
@@ -72,10 +72,11 @@ under the License.
 
     <properties>
         <project.build.outputTimestamp>2024-01-26T02:00:20Z</project.build.outputTimestamp>
-        <paimon.shade.version>0.4.0-incubating</paimon.shade.version>
+        <paimon.shade.version>0.6.0-incubating</paimon.shade.version>
         <paimon.shade.jackson.version>2.14.2</paimon.shade.jackson.version>
         <paimon.shade.guava.version>30.1.1-jre</paimon.shade.guava.version>
         <paimon.shade.caffeine.version>2.9.3</paimon.shade.caffeine.version>
+        <paimon.shade.netty.version>4.1.100.Final</paimon.shade.netty.version>
         <antlr4.version>4.8</antlr4.version>
         <hadoop.version>2.8.5</hadoop.version>
         <scala.version>2.12.15</scala.version>

diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
@@ -234,6 +234,10 @@ This file is based on the checkstyle file of Apache Beam.
 			<property name="illegalPkgs" value="com.github.ben-manes.caffeine"/>
 			<message key="import.illegal" value="{0}; Use paimon-shade-caffeine instead."/>
 		</module>
+		<module name="IllegalImport">
+			<property name="illegalPkgs" value="io.netty"/>
+			<message key="import.illegal" value="{0}; Use paimon-shade-netty instead."/>
+		</module>
 
 		<module name="RedundantModifier">
 			<!-- Checks for redundant modifiers on various symbol definitions.