hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-17239 Add UnsafeByteOperations#wrap(ByteInput, int offset, int len) API Addendum to make pb compile work again.
Date Mon, 05 Dec 2016 19:56:25 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 319060580 -> 1f8d8bfa8


HBASE-17239 Add UnsafeByteOperations#wrap(ByteInput, int offset, int len) API
Addendum to make pb compile work again.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1f8d8bfa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f8d8bfa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f8d8bfa

Branch: refs/heads/master
Commit: 1f8d8bfa8b3fbc60705afa5b74318daff81c6fd3
Parents: 3190605
Author: Michael Stack <stack@apache.org>
Authored: Mon Dec 5 11:55:10 2016 -0800
Committer: Michael Stack <stack@apache.org>
Committed: Mon Dec 5 11:56:19 2016 -0800

----------------------------------------------------------------------
 .../src/main/patches/HBASE-17239.patch          | 25 --------------------
 1 file changed, 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/1f8d8bfa/hbase-protocol-shaded/src/main/patches/HBASE-17239.patch
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/patches/HBASE-17239.patch b/hbase-protocol-shaded/src/main/patches/HBASE-17239.patch
index 2d84063..6765eca 100644
--- a/hbase-protocol-shaded/src/main/patches/HBASE-17239.patch
+++ b/hbase-protocol-shaded/src/main/patches/HBASE-17239.patch
@@ -42,28 +42,3 @@ index 3d53f2e..ad99372 100644
     * Writes the given {@link ByteString} to the provided {@link ByteOutput}. Calling this
method may
     * result in multiple operations on the target {@link ByteOutput}
     * (i.e. for roped {@link ByteString}s).
-diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
-index 0c8f34f..ee44c68 100644
---- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
-+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
-@@ -1908,8 +1908,8 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver
{
-       if (buf.hasArray()) {
-         this.connectionHeader = ConnectionHeader.parseFrom(buf.array());
-       } else {
--        CodedInputStream cis = CodedInputStream
--            .newInstance(new ByteBuffByteInput(buf, 0, buf.limit()), true);
-+        CodedInputStream cis = UnsafeByteOperations
-+            .unsafeWrap(new ByteBuffByteInput(buf, 0, buf.limit()), 0, buf.limit()).newCodedInput();
-         cis.enableAliasing(true);
-         this.connectionHeader = ConnectionHeader.parseFrom(cis);
-       }
-@@ -2151,7 +2151,8 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver
{
-       if (buf.hasArray()) {
-         cis = UnsafeByteOperations.unsafeWrap(buf.array(), 0, buf.limit()).newCodedInput();
-       } else {
--        cis = CodedInputStream.newInstance(new ByteBuffByteInput(buf, 0, buf.limit()), true);
-+        cis = UnsafeByteOperations
-+            .unsafeWrap(new ByteBuffByteInput(buf, 0, buf.limit()), 0, buf.limit()).newCodedInput();
-       }
-       cis.enableAliasing(true);
-       int headerSize = cis.readRawVarint32();


Mime
View raw message