HBASE-18271 Shade netty Purge mention of netty-all. Add in hbase-thirdparty hbase-shaded-netty instead. s/io.netty/org.apache.hadoop.hbase.shaded.io.netty/ everywhere in hbase.
Also set a system property when running tests and when starting hbase; required by netty so can find the relocation files in the bundled .so. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c6ac04ab Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c6ac04ab Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c6ac04ab Branch: refs/heads/HBASE-14070.HLC Commit: c6ac04ab39dafad8ebc7033b852f535a932d4ce6 Parents: 923195c Author: Michael Stack <st...@apache.org> Authored: Wed Aug 2 14:47:51 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Sun Aug 13 12:46:21 2017 -0700 ---------------------------------------------------------------------- bin/hbase | 12 ++++- hbase-client/pom.xml | 4 +- .../client/AsyncAdminRequestRetryingCaller.java | 2 +- .../client/AsyncBatchRpcRetryingCaller.java | 2 +- .../hbase/client/AsyncConnectionImpl.java | 2 +- .../hadoop/hbase/client/AsyncHBaseAdmin.java | 4 +- .../AsyncMasterRequestRpcRetryingCaller.java | 2 +- .../hadoop/hbase/client/AsyncRegionLocator.java | 4 +- .../hbase/client/AsyncRpcRetryingCaller.java | 2 +- .../client/AsyncRpcRetryingCallerFactory.java | 2 +- .../AsyncScanSingleRegionRpcRetryingCaller.java | 4 +- .../AsyncServerRequestRpcRetryingCaller.java | 2 +- .../AsyncSingleRequestRpcRetryingCaller.java | 2 +- .../hbase/client/ClusterStatusListener.java | 20 ++++----- .../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 4 +- .../hadoop/hbase/ipc/AbstractRpcClient.java | 2 +- .../hbase/ipc/BufferCallBeforeInitHandler.java | 6 +-- .../java/org/apache/hadoop/hbase/ipc/Call.java | 2 +- .../hadoop/hbase/ipc/CellBlockBuilder.java | 6 +-- .../hbase/ipc/DefaultNettyEventLoopConfig.java | 10 ++--- .../apache/hadoop/hbase/ipc/NettyRpcClient.java | 10 ++--- .../hbase/ipc/NettyRpcClientConfigHelper.java | 4 +- .../hadoop/hbase/ipc/NettyRpcConnection.java | 34 +++++++-------- .../hadoop/hbase/ipc/NettyRpcDuplexHandler.java | 16 +++---- .../apache/hadoop/hbase/ipc/RpcConnection.java | 6 +-- .../hbase/security/CryptoAESUnwrapHandler.java | 10 ++--- .../hbase/security/CryptoAESWrapHandler.java | 16 +++---- .../NettyHBaseRpcConnectionHeaderHandler.java | 12 ++--- .../hbase/security/NettyHBaseSaslRpcClient.java | 4 +- .../NettyHBaseSaslRpcClientHandler.java | 8 ++-- .../hbase/security/SaslChallengeDecoder.java | 6 +-- .../hbase/security/SaslUnwrapHandler.java | 10 ++--- .../hadoop/hbase/security/SaslWrapHandler.java | 16 +++---- .../hbase/client/example/HttpProxyExample.java | 44 +++++++++---------- hbase-prefix-tree/pom.xml | 8 ++-- hbase-rsgroup/pom.xml | 4 +- hbase-server/pom.xml | 7 +-- .../hbase/io/asyncfs/AsyncFSOutputHelper.java | 4 +- .../asyncfs/FanOutOneBlockAsyncDFSOutput.java | 32 +++++++------- .../FanOutOneBlockAsyncDFSOutputHelper.java | 46 ++++++++++---------- .../FanOutOneBlockAsyncDFSOutputSaslHelper.java | 38 ++++++++-------- .../apache/hadoop/hbase/ipc/NettyRpcServer.java | 30 ++++++------- .../ipc/NettyRpcServerPreambleHandler.java | 8 ++-- .../hbase/ipc/NettyRpcServerRequestDecoder.java | 8 ++-- .../ipc/NettyRpcServerResponseEncoder.java | 8 ++-- .../hbase/ipc/NettyServerRpcConnection.java | 4 +- .../hbase/mapreduce/TableMapReduceUtil.java | 2 +- .../hbase/master/ClusterStatusPublisher.java | 30 ++++++------- .../hbase/regionserver/wal/AsyncFSWAL.java | 6 +-- .../wal/AsyncProtobufLogWriter.java | 4 +- .../wal/SecureAsyncProtobufLogWriter.java | 4 +- .../hbase/util/NettyEventLoopGroupConfig.java | 20 ++++----- .../hadoop/hbase/wal/AsyncFSWALProvider.java | 12 ++--- .../hbase/wal/NettyAsyncFSWALConfigHelper.java | 4 +- .../TestFanOutOneBlockAsyncDFSOutput.java | 10 ++--- .../hbase/io/asyncfs/TestLocalAsyncOutput.java | 8 ++-- .../TestSaslFanOutOneBlockAsyncDFSOutput.java | 10 ++--- .../apache/hadoop/hbase/ipc/TestNettyIPC.java | 8 ++-- .../hbase/regionserver/wal/TestAsyncFSWAL.java | 8 ++-- .../regionserver/wal/TestAsyncProtobufLog.java | 8 ++-- .../regionserver/wal/TestAsyncWALReplay.java | 8 ++-- pom.xml | 19 +++++--- 62 files changed, 330 insertions(+), 318 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/bin/hbase ---------------------------------------------------------------------- diff --git a/bin/hbase b/bin/hbase index d7a8069..7eeaf2d 100755 --- a/bin/hbase +++ b/bin/hbase @@ -473,8 +473,16 @@ fi HEAP_SETTINGS="$JAVA_HEAP_MAX $JAVA_OFFHEAP_MAX" # Exec unless HBASE_NOEXEC is set. export CLASSPATH +# Netty is shaded in hbase. The shaded netty is pulled in with org.apache.hbase.thirdparty:hbase-shaded-netty. +# It has a .so in it. Shading requires rename of the .so and then passing a system property so netty finds the +# renamed .so and associates it w/ the relocated netty files. +# So we can find the relocated .so, we need to add a system property pointing at new location. Trick is from: +# https://stackoverflow.com/questions/33825743/rename-files-inside-a-jar-using-some-maven-plugin +# See toward the end of this issue for how to pass config: https://github.com/netty/netty/issues/6665 +# +NETTY_PROP="-Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded." if [ "${HBASE_NOEXEC}" != "" ]; then - "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_OPTS $CLASS "$@" + "$JAVA" -Dproc_$COMMAND "$NETTY_PROP" -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_OPTS $CLASS "$@" else - exec "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_OPTS $CLASS "$@" + exec "$JAVA" -Dproc_$COMMAND "$NETTY_PROP" -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_OPTS $CLASS "$@" fi http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 747391a..45c43e9 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -160,8 +160,8 @@ <artifactId>protobuf-java</artifactId> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <groupId>org.apache.hbase.thirdparty</groupId> + <artifactId>hbase-shaded-netty</artifactId> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java index afb72ea..2871c4d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdminRequestRetryingCaller.java @@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import java.util.concurrent.CompletableFuture; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.ipc.HBaseRpcController; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java index 9b362d1..c52fd2f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncBatchRpcRetryingCaller.java @@ -24,7 +24,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.resetController; import static org.apache.hadoop.hbase.client.ConnectionUtils.translateException; import static org.apache.hadoop.hbase.util.CollectionUtils.computeIfAbsent; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java index 8611de5..9913af9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java @@ -23,7 +23,7 @@ import static org.apache.hadoop.hbase.client.NonceGenerator.CLIENT_NONCES_ENABLE import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java index fbd8690..097f22a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; -import io.netty.util.Timeout; -import io.netty.util.TimerTask; +import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; +import org.apache.hadoop.hbase.shaded.io.netty.util.TimerTask; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java index e2a3fee..7a598d7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMasterRequestRpcRetryingCaller.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java index 1114e2c..153bea4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegionLocator.java @@ -21,8 +21,8 @@ import static org.apache.hadoop.hbase.TableName.META_TABLE_NAME; import static org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil.findException; import static org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil.isMetaClearingException; -import io.netty.util.HashedWheelTimer; -import io.netty.util.Timeout; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java index c753383..3b01fe0 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java @@ -23,7 +23,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.SLEEP_DELTA_NS; import static org.apache.hadoop.hbase.client.ConnectionUtils.getPauseTime; import static org.apache.hadoop.hbase.client.ConnectionUtils.resetController; import static org.apache.hadoop.hbase.client.ConnectionUtils.translateException; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java index 729fb94..1aa3fbd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java @@ -21,7 +21,7 @@ import static org.apache.hadoop.hbase.shaded.com.google.common.base.Precondition import static org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull; import static org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.util.List; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java index 89b3afc..02a4357 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java @@ -30,8 +30,8 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMet import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; -import io.netty.util.HashedWheelTimer; -import io.netty.util.Timeout; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java index 72241ea..40aa9be 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncServerRequestRpcRetryingCaller.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java index e1c06d7..5071ec3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncSingleRequestRpcRetryingCaller.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.client; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java index 240587b..9364944 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterStatusListener.java @@ -20,16 +20,16 @@ package org.apache.hadoop.hbase.client; -import io.netty.bootstrap.Bootstrap; -import io.netty.buffer.ByteBufInputStream; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.DatagramChannel; -import io.netty.channel.socket.DatagramPacket; -import io.netty.channel.socket.nio.NioDatagramChannel; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.Bootstrap; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufInputStream; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.DatagramChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.DatagramPacket; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioDatagramChannel; import java.io.Closeable; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java index 03f64fc..0070e0e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java @@ -42,8 +42,8 @@ import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.Message; import com.google.protobuf.RpcChannel; -import io.netty.util.Timeout; -import io.netty.util.TimerTask; +import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; +import org.apache.hadoop.hbase.shaded.io.netty.util.TimerTask; import java.util.stream.Stream; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java index 55895f2..7925505 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController; import org.apache.hadoop.hbase.shaded.com.google.protobuf.ServiceException; import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback; -import io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; import java.io.IOException; import java.net.InetSocketAddress; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.java index c628c31..221d57f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.channel.ChannelDuplexHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPromise; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelDuplexHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPromise; import java.io.IOException; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/Call.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/Call.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/Call.java index 04d7238..b286c0e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/Call.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/Call.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.util.Timeout; +import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors; import org.apache.hadoop.hbase.shaded.com.google.protobuf.Message; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CellBlockBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CellBlockBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CellBlockBuilder.java index d00490b..7ec313e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CellBlockBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CellBlockBuilder.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.ByteBufOutputStream; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufAllocator; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufOutputStream; import java.io.ByteArrayInputStream; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DefaultNettyEventLoopConfig.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DefaultNettyEventLoopConfig.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DefaultNettyEventLoopConfig.java index f710d54..efc74e4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DefaultNettyEventLoopConfig.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DefaultNettyEventLoopConfig.java @@ -17,11 +17,11 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.channel.Channel; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.util.concurrent.DefaultThreadFactory; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.DefaultThreadFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Pair; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClient.java index cde453f..2fea562 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClient.java @@ -17,11 +17,11 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.channel.Channel; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.util.concurrent.DefaultThreadFactory; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.DefaultThreadFactory; import java.io.IOException; import java.net.SocketAddress; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java index a8aca52..0e12f27 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcClientConfigHelper.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.ipc; import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; -import io.netty.channel.Channel; -import io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java index c879990..54e2b2c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java @@ -22,26 +22,26 @@ import static org.apache.hadoop.hbase.ipc.CallEvent.Type.TIMEOUT; import static org.apache.hadoop.hbase.ipc.IPCUtil.setCancelled; import static org.apache.hadoop.hbase.ipc.IPCUtil.toIOE; -import io.netty.handler.timeout.ReadTimeoutHandler; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.ReadTimeoutHandler; import org.apache.hadoop.hbase.security.NettyHBaseRpcConnectionHeaderHandler; import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcCallback; -import io.netty.bootstrap.Bootstrap; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufOutputStream; -import io.netty.buffer.Unpooled; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelOption; -import io.netty.channel.ChannelPipeline; -import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.handler.timeout.IdleStateHandler; -import io.netty.util.ReferenceCountUtil; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.FutureListener; -import io.netty.util.concurrent.Promise; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.Bootstrap; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufOutputStream; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelFuture; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelFutureListener; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateHandler; +import org.apache.hadoop.hbase.shaded.io.netty.util.ReferenceCountUtil; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Future; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.FutureListener; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Promise; import java.io.IOException; import java.util.concurrent.Executors; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.java index 78964d6..f904b4f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.java @@ -21,14 +21,14 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.Message; import org.apache.hadoop.hbase.shaded.com.google.protobuf.Message.Builder; import org.apache.hadoop.hbase.shaded.com.google.protobuf.TextFormat; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufInputStream; -import io.netty.buffer.ByteBufOutputStream; -import io.netty.channel.ChannelDuplexHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPromise; -import io.netty.handler.timeout.IdleStateEvent; -import io.netty.util.concurrent.PromiseCombiner; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufInputStream; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufOutputStream; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelDuplexHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPromise; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateEvent; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.PromiseCombiner; import java.io.IOException; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java index 98d2256..d3558ee 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcConnection.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.util.HashedWheelTimer; -import io.netty.util.Timeout; -import io.netty.util.TimerTask; +import org.apache.hadoop.hbase.shaded.io.netty.util.HashedWheelTimer; +import org.apache.hadoop.hbase.shaded.io.netty.util.Timeout; +import org.apache.hadoop.hbase.shaded.io.netty.util.TimerTask; import java.io.IOException; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESUnwrapHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESUnwrapHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESUnwrapHandler.java index 31abeba..dab9098 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESUnwrapHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESUnwrapHandler.java @@ -18,16 +18,16 @@ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.crypto.aes.CryptoAES; /** * Unwrap messages with Crypto AES. Should be placed after a - * {@link io.netty.handler.codec.LengthFieldBasedFrameDecoder} + * io.netty.handler.codec.LengthFieldBasedFrameDecoder */ @InterfaceAudience.Private public class CryptoAESUnwrapHandler extends SimpleChannelInboundHandler<ByteBuf> { http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESWrapHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESWrapHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESWrapHandler.java index 6c74ed8..47e1905 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESWrapHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/CryptoAESWrapHandler.java @@ -18,14 +18,14 @@ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.CoalescingBufferQueue; -import io.netty.util.ReferenceCountUtil; -import io.netty.util.concurrent.PromiseCombiner; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandlerAdapter; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPromise; +import org.apache.hadoop.hbase.shaded.io.netty.channel.CoalescingBufferQueue; +import org.apache.hadoop.hbase.shaded.io.netty.util.ReferenceCountUtil; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.PromiseCombiner; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.crypto.aes.CryptoAES; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseRpcConnectionHeaderHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseRpcConnectionHeaderHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseRpcConnectionHeaderHandler.java index 5608874..c515e83 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseRpcConnectionHeaderHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseRpcConnectionHeaderHandler.java @@ -18,12 +18,12 @@ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.util.concurrent.Promise; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Promise; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.crypto.aes.CryptoAES; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClient.java index 9ae31a4..937fccd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClient.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hbase.security; -import io.netty.channel.ChannelPipeline; -import io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.LengthFieldBasedFrameDecoder; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClientHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClientHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClientHandler.java index 4525aef..2f64ae2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClientHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClientHandler.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.util.concurrent.Promise; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Promise; import java.io.IOException; import java.security.PrivilegedExceptionAction; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslChallengeDecoder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslChallengeDecoder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslChallengeDecoder.java index d818097..b156251 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslChallengeDecoder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslChallengeDecoder.java @@ -17,9 +17,9 @@ */ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.ByteToMessageDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.ByteToMessageDecoder; import java.io.IOException; import java.util.List; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUnwrapHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUnwrapHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUnwrapHandler.java index e631478..2171647 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUnwrapHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslUnwrapHandler.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; import javax.security.sasl.SaslClient; @@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * Unwrap sasl messages. Should be placed after a - * {@link io.netty.handler.codec.LengthFieldBasedFrameDecoder} + * io.netty.handler.codec.LengthFieldBasedFrameDecoder */ @InterfaceAudience.Private public class SaslUnwrapHandler extends SimpleChannelInboundHandler<ByteBuf> { http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslWrapHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslWrapHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslWrapHandler.java index 14ecf2e..fb03737 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslWrapHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslWrapHandler.java @@ -17,14 +17,14 @@ */ package org.apache.hadoop.hbase.security; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; -import io.netty.channel.CoalescingBufferQueue; -import io.netty.util.ReferenceCountUtil; -import io.netty.util.concurrent.PromiseCombiner; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandlerAdapter; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPromise; +import org.apache.hadoop.hbase.shaded.io.netty.channel.CoalescingBufferQueue; +import org.apache.hadoop.hbase.shaded.io.netty.util.ReferenceCountUtil; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.PromiseCombiner; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java index c940c2a..bb83bac 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java @@ -20,28 +20,28 @@ package org.apache.hadoop.hbase.client.example; import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions; import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; -import io.netty.bootstrap.ServerBootstrap; -import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.channel.group.ChannelGroup; -import io.netty.channel.group.DefaultChannelGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.handler.codec.http.DefaultFullHttpResponse; -import io.netty.handler.codec.http.FullHttpRequest; -import io.netty.handler.codec.http.HttpHeaderNames; -import io.netty.handler.codec.http.HttpObjectAggregator; -import io.netty.handler.codec.http.HttpResponseStatus; -import io.netty.handler.codec.http.HttpServerCodec; -import io.netty.handler.codec.http.HttpVersion; -import io.netty.handler.codec.http.QueryStringDecoder; -import io.netty.util.concurrent.GlobalEventExecutor; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.ServerBootstrap; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelInitializer; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.group.ChannelGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.group.DefaultChannelGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioServerSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.DefaultFullHttpResponse; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.FullHttpRequest; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.HttpHeaderNames; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.HttpObjectAggregator; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.HttpResponseStatus; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.HttpServerCodec; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.HttpVersion; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.http.QueryStringDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.GlobalEventExecutor; import java.io.IOException; import java.net.InetSocketAddress; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-prefix-tree/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index b851331..a44a59e 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -116,12 +116,12 @@ <artifactId>hbase-shaded-miscellaneous</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.apache.hbase.thirdparty</groupId> + <artifactId>hbase-shaded-netty</artifactId> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-rsgroup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index a3e710c..bbb489d 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -164,8 +164,8 @@ <artifactId>protobuf-java</artifactId> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <groupId>org.apache.hbase.thirdparty</groupId> + <artifactId>hbase-shaded-netty</artifactId> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 647d531..e377874 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -264,6 +264,7 @@ </properties> <systemPropertyVariables> <test.build.webapps>target/test-classes/webapps</test.build.webapps> + <org.apache.hadoop.hbase.shaded.io.netty.packagePrefix>org.apache.hadoop.hbase.shaded.</org.apache.hadoop.hbase.shaded.io.netty.packagePrefix> </systemPropertyVariables> </configuration> </plugin> @@ -522,10 +523,6 @@ <artifactId>jamon-runtime</artifactId> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> @@ -832,7 +829,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>3.6.2.Final</version> + <version>${netty.hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java index 5c2d4bf..653e0ca 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutputHelper.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.io.asyncfs; import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java index a493565..5fcbe96 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutput.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hbase.io.asyncfs; -import static io.netty.handler.timeout.IdleState.READER_IDLE; -import static io.netty.handler.timeout.IdleState.WRITER_IDLE; +import static org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleState.READER_IDLE; +import static org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleState.WRITER_IDLE; import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.HEART_BEAT_SEQNO; import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.READ_TIMEOUT; import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHelper.completeFile; @@ -27,20 +27,20 @@ import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputHel import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandler.Sharable; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.EventLoop; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.protobuf.ProtobufDecoder; -import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; -import io.netty.handler.timeout.IdleStateEvent; -import io.netty.handler.timeout.IdleStateHandler; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.Promise; -import io.netty.util.concurrent.PromiseCombiner; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufAllocator; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandler.Sharable; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.protobuf.ProtobufDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateEvent; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateHandler; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Future; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Promise; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.PromiseCombiner; import java.io.IOException; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java index 85b71e5..16412d3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputHelper.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hbase.io.asyncfs; -import static io.netty.channel.ChannelOption.CONNECT_TIMEOUT_MILLIS; -import static io.netty.handler.timeout.IdleState.READER_IDLE; +import static org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption.CONNECT_TIMEOUT_MILLIS; +import static org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleState.READER_IDLE; import static org.apache.hadoop.fs.CreateFlag.CREATE; import static org.apache.hadoop.fs.CreateFlag.OVERWRITE; import static org.apache.hadoop.hbase.io.asyncfs.FanOutOneBlockAsyncDFSOutputSaslHelper.createEncryptor; @@ -32,27 +32,27 @@ import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; import org.apache.hadoop.hbase.shaded.com.google.common.collect.ImmutableMap; import com.google.protobuf.CodedOutputStream; -import io.netty.bootstrap.Bootstrap; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.ByteBufOutputStream; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.EventLoop; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.protobuf.ProtobufDecoder; -import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; -import io.netty.handler.timeout.IdleStateEvent; -import io.netty.handler.timeout.IdleStateHandler; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.FutureListener; -import io.netty.util.concurrent.Promise; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.Bootstrap; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufAllocator; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufOutputStream; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.PooledByteBufAllocator; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelFuture; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelFutureListener; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelInitializer; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.protobuf.ProtobufDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateEvent; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateHandler; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Future; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.FutureListener; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Promise; import java.io.IOException; import java.lang.reflect.InvocationTargetException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java index c1e4c24..bc6ab3c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.io.asyncfs; -import static io.netty.handler.timeout.IdleState.READER_IDLE; +import static org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleState.READER_IDLE; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_ENCRYPT_DATA_TRANSFER_CIPHER_SUITES_KEY; import org.apache.hadoop.hbase.shaded.com.google.common.base.Charsets; @@ -26,24 +26,24 @@ import org.apache.hadoop.hbase.shaded.com.google.common.collect.ImmutableSet; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps; import com.google.protobuf.CodedOutputStream; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufOutputStream; -import io.netty.buffer.CompositeByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.Channel; -import io.netty.channel.ChannelDuplexHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.ChannelPromise; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.handler.codec.MessageToByteEncoder; -import io.netty.handler.codec.protobuf.ProtobufDecoder; -import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; -import io.netty.handler.timeout.IdleStateEvent; -import io.netty.handler.timeout.IdleStateHandler; -import io.netty.util.concurrent.Promise; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBufOutputStream; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.CompositeByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelDuplexHandler; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandlerAdapter; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPromise; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.MessageToByteEncoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.protobuf.ProtobufDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateEvent; +import org.apache.hadoop.hbase.shaded.io.netty.handler.timeout.IdleStateHandler; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.Promise; import java.io.IOException; import java.lang.reflect.Field; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java index fafc53f..ffd6d6e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java @@ -17,21 +17,21 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelOption; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.ServerChannel; -import io.netty.channel.group.ChannelGroup; -import io.netty.channel.group.DefaultChannelGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.handler.codec.FixedLengthFrameDecoder; -import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.util.concurrent.DefaultThreadFactory; -import io.netty.util.concurrent.GlobalEventExecutor; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.ServerBootstrap; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelInitializer; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ServerChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.group.ChannelGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.group.DefaultChannelGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioServerSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.FixedLengthFrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.DefaultThreadFactory; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.GlobalEventExecutor; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerPreambleHandler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerPreambleHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerPreambleHandler.java index 3754d44..07cf6c6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerPreambleHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerPreambleHandler.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.SimpleChannelInboundHandler; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPipeline; +import org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerRequestDecoder.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerRequestDecoder.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerRequestDecoder.java index a40e9d3..fde8e46 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerRequestDecoder.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerRequestDecoder.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.channel.group.ChannelGroup; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelInboundHandlerAdapter; +import org.apache.hadoop.hbase.shaded.io.netty.channel.group.ChannelGroup; import org.apache.hadoop.hbase.classification.InterfaceAudience; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerResponseEncoder.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerResponseEncoder.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerResponseEncoder.java index b5b6a6b..5c106f8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerResponseEncoder.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServerResponseEncoder.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundHandlerAdapter; -import io.netty.channel.ChannelPromise; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandlerAdapter; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelPromise; import org.apache.hadoop.hbase.classification.InterfaceAudience; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyServerRpcConnection.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyServerRpcConnection.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyServerRpcConnection.java index 61e12ab..35ce4c7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyServerRpcConnection.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyServerRpcConnection.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hbase.ipc; -import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.ByteBuf; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; import java.io.IOException; import java.net.InetAddress; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 61244cc..ff458ff 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -792,7 +792,7 @@ public class TableMapReduceUtil { prefixTreeCodecClass, // hbase-prefix-tree (if null will be skipped) // pull necessary dependencies org.apache.zookeeper.ZooKeeper.class, - io.netty.channel.Channel.class, + org.apache.hadoop.hbase.shaded.io.netty.channel.Channel.class, com.google.protobuf.Message.class, org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists.class, org.apache.htrace.Trace.class, http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java index 2c903fb..31a8ba2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java @@ -21,21 +21,21 @@ package org.apache.hadoop.hbase.master; -import io.netty.bootstrap.Bootstrap; -import io.netty.bootstrap.ChannelFactory; -import io.netty.buffer.Unpooled; -import io.netty.channel.Channel; -import io.netty.channel.ChannelException; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.DatagramChannel; -import io.netty.channel.socket.DatagramPacket; -import io.netty.channel.socket.InternetProtocolFamily; -import io.netty.channel.socket.nio.NioDatagramChannel; -import io.netty.handler.codec.MessageToMessageEncoder; -import io.netty.util.internal.StringUtil; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.Bootstrap; +import org.apache.hadoop.hbase.shaded.io.netty.bootstrap.ChannelFactory; +import org.apache.hadoop.hbase.shaded.io.netty.buffer.Unpooled; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelException; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerContext; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOption; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.DatagramChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.DatagramPacket; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.InternetProtocolFamily; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioDatagramChannel; +import org.apache.hadoop.hbase.shaded.io.netty.handler.codec.MessageToMessageEncoder; +import org.apache.hadoop.hbase.shaded.io.netty.util.internal.StringUtil; import java.io.Closeable; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java index e8d1f92..a4b6b3c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java @@ -24,9 +24,9 @@ import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.Sequence; import com.lmax.disruptor.Sequencer; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; -import io.netty.util.concurrent.SingleThreadEventExecutor; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.SingleThreadEventExecutor; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java index fa7eddd..9221fc4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncProtobufLogWriter.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureAsyncProtobufLogWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureAsyncProtobufLogWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureAsyncProtobufLogWriter.java index 22c8aa8..1e43726 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureAsyncProtobufLogWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureAsyncProtobufLogWriter.java @@ -25,8 +25,8 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.io.crypto.Encryptor; import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALHeader; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class SecureAsyncProtobufLogWriter extends AsyncProtobufLogWriter { http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/util/NettyEventLoopGroupConfig.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/NettyEventLoopGroupConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/NettyEventLoopGroupConfig.java index 30caf72..83a7122 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/NettyEventLoopGroupConfig.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/NettyEventLoopGroupConfig.java @@ -17,16 +17,16 @@ */ package org.apache.hadoop.hbase.util; -import io.netty.channel.Channel; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.ServerChannel; -import io.netty.channel.epoll.EpollEventLoopGroup; -import io.netty.channel.epoll.EpollServerSocketChannel; -import io.netty.channel.epoll.EpollSocketChannel; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.util.concurrent.DefaultThreadFactory; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.ServerChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.epoll.EpollEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.epoll.EpollServerSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.epoll.EpollSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioServerSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.DefaultThreadFactory; import java.util.concurrent.ThreadFactory; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java index f0f1671..ac7a4f8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/AsyncFSWALProvider.java @@ -19,12 +19,12 @@ package org.apache.hadoop.hbase.wal; import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.util.concurrent.DefaultThreadFactory; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.util.concurrent.DefaultThreadFactory; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/NettyAsyncFSWALConfigHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/NettyAsyncFSWALConfigHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/NettyAsyncFSWALConfigHelper.java index 273fc37..5b29dbd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/NettyAsyncFSWALConfigHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/NettyAsyncFSWALConfigHelper.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.wal; import com.google.common.base.Preconditions; -import io.netty.channel.Channel; -import io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java index 43a279e..4377196 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestFanOutOneBlockAsyncDFSOutput.java @@ -24,11 +24,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; import java.io.FileNotFoundException; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java index 4da778e..1fb5d37 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java @@ -20,10 +20,10 @@ package org.apache.hadoop.hbase.io.asyncfs; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import io.netty.channel.Channel; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; import java.io.IOException; import java.util.concurrent.ExecutionException; http://git-wip-us.apache.org/repos/asf/hbase/blob/c6ac04ab/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java index 7e67a90..8e5df03 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java @@ -31,11 +31,11 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIP import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL_KEY; -import io.netty.channel.Channel; -import io.netty.channel.EventLoop; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioSocketChannel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.Channel; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoop; +import org.apache.hadoop.hbase.shaded.io.netty.channel.EventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.nio.NioEventLoopGroup; +import org.apache.hadoop.hbase.shaded.io.netty.channel.socket.nio.NioSocketChannel; import java.io.File; import java.io.IOException;