fix

apache · Jan 25, 2024 · 501f13a · 501f13a
1 parent d58c18d
commit 501f13a
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 49 deletions.
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/...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;