From 8b18e3b187d52647a78d4482c5b219d5bbbee4a8 Mon Sep 17 00:00:00 2001 From: yuzelin <747884505@qq.com> Date: Thu, 25 Jan 2024 13:59:40 +0800 Subject: [PATCH] fix --- .../paimon/service/messages/KvRequest.java | 2 +- .../paimon/service/messages/KvResponse.java | 2 +- .../network/AbstractServerHandler.java | 15 ++++++------ .../service/network/ChunkedByteBuf.java | 10 ++++---- .../paimon/service/network/ClientHandler.java | 9 ++++---- .../service/network/NettyBufferPool.java | 8 +++---- .../paimon/service/network/NetworkClient.java | 22 +++++++++--------- .../paimon/service/network/NetworkServer.java | 20 ++++++++-------- .../service/network/ServerConnection.java | 9 ++++---- .../network/messages/MessageDeserializer.java | 2 +- .../network/messages/MessageSerializer.java | 8 +++---- .../service/messages/KvRequestTest.java | 5 ++-- .../service/messages/KvResponseTest.java | 5 ++-- .../service/server/KvServerHandler.java | 2 +- .../service/network/ClientHandlerTest.java | 5 ++-- .../service/network/NetworkClientTest.java | 23 ++++++++++--------- .../service/network/NetworkServerTest.java | 3 ++- 17 files changed, 79 insertions(+), 71 deletions(-) diff --git a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvRequest.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvRequest.java index 085521addb57..02beef8d8987 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvRequest.java +++ b/paimon-service/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/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvResponse.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvResponse.java index 01cb3df469c6..2958ba6719a2 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/messages/KvResponse.java +++ b/paimon-service/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/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/AbstractServerHandler.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/AbstractServerHandler.java index c10d91f89da3..c636fe14b2c9 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/AbstractServerHandler.java +++ b/paimon-service/paimon-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/paimon-service-client/src/main/java/org/apache/paimon/service/network/ChunkedByteBuf.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ChunkedByteBuf.java index 5c7184f4a354..158eae5123eb 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ChunkedByteBuf.java +++ b/paimon-service/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/paimon-service-client/src/main/java/org/apache/paimon/service/network/ClientHandler.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ClientHandler.java index c2cb278ec64a..ce62807eb626 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ClientHandler.java +++ b/paimon-service/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/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NettyBufferPool.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NettyBufferPool.java index c057ef9c6f7c..151308d0edc5 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NettyBufferPool.java +++ b/paimon-service/paimon-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/paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkClient.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkClient.java index 39bcd8c4b0b6..7838df7254b0 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkClient.java +++ b/paimon-service/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/paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkServer.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkServer.java index 38df44025b79..8653ba516970 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/NetworkServer.java +++ b/paimon-service/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/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ServerConnection.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ServerConnection.java index 898f349124e6..934e7fa27a5e 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/ServerConnection.java +++ b/paimon-service/paimon-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/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/messages/MessageDeserializer.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/messages/MessageDeserializer.java index 9894de463b59..baaa1f90e898 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/messages/MessageDeserializer.java +++ b/paimon-service/paimon-service-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/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/messages/MessageSerializer.java b/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/messages/MessageSerializer.java index c520338b4bce..838131e5f057 100644 --- a/paimon-service/paimon-service-client/src/main/java/org/apache/paimon/service/network/messages/MessageSerializer.java +++ b/paimon-service/paimon-service-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/paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvRequestTest.java b/paimon-service/paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvRequestTest.java index f5093504c10b..cd826ce6d7b8 100644 --- a/paimon-service/paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvRequestTest.java +++ b/paimon-service/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/paimon-service/paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvResponseTest.java b/paimon-service/paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvResponseTest.java index 9682adf63153..4e0ccb13b41a 100644 --- a/paimon-service/paimon-service-client/src/test/java/org/apache/paimon/service/messages/KvResponseTest.java +++ b/paimon-service/paimon-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/paimon-service/paimon-service-runtime/src/main/java/org/apache/paimon/service/server/KvServerHandler.java b/paimon-service/paimon-service-runtime/src/main/java/org/apache/paimon/service/server/KvServerHandler.java index 4acf23ccba92..10ee02507a7e 100644 --- a/paimon-service/paimon-service-runtime/src/main/java/org/apache/paimon/service/server/KvServerHandler.java +++ b/paimon-service/paimon-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/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/ClientHandlerTest.java b/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/ClientHandlerTest.java index aa9fa7dff71d..9b5f91cc9d6e 100644 --- a/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/ClientHandlerTest.java +++ b/paimon-service/paimon-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/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkClientTest.java b/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkClientTest.java index ca1f3a427419..39e070fbee1e 100644 --- a/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkClientTest.java +++ b/paimon-service/paimon-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/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkServerTest.java b/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkServerTest.java index 3724230677bc..da126f2109c1 100644 --- a/paimon-service/paimon-service-runtime/src/test/java/org/apache/paimon/service/network/NetworkServerTest.java +++ b/paimon-service/paimon-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;