Repository: hbase Updated Branches: refs/heads/master 86df89b01 -> 3f1f58726
HBASE-17087 Enable Aliasing for CodedInputStream created by ByteInputByteString#newCodedInput. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3f1f5872 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f1f5872 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f1f5872 Branch: refs/heads/master Commit: 3f1f587266d999eba3adcf7986e68c4fa0f42a82 Parents: 86df89b Author: anoopsamjohn <anoopsamj...@gmail.com> Authored: Tue Nov 15 10:57:41 2016 +0530 Committer: anoopsamjohn <anoopsamj...@gmail.com> Committed: Tue Nov 15 10:57:41 2016 +0530 ---------------------------------------------------------------------- .../com/google/protobuf/ByteInputByteString.java | 4 +++- .../src/main/patches/HBASE-17087.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3f1f5872/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java index 1949602..30de4ec 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java @@ -244,6 +244,8 @@ final class ByteInputByteString extends ByteString.LeafByteString { public CodedInputStream newCodedInput() { // We trust CodedInputStream not to modify the bytes, or to give anyone // else access to them. - return CodedInputStream.newInstance(buffer, offset, length, true); + CodedInputStream cis = CodedInputStream.newInstance(buffer, offset, length, true); + cis.enableAliasing(true); + return cis; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/3f1f5872/hbase-protocol-shaded/src/main/patches/HBASE-17087.patch ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/patches/HBASE-17087.patch b/hbase-protocol-shaded/src/main/patches/HBASE-17087.patch new file mode 100644 index 0000000..3826efe --- /dev/null +++ b/hbase-protocol-shaded/src/main/patches/HBASE-17087.patch @@ -0,0 +1,14 @@ +diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java +index 1949602..30de4ec 100644 +--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java ++++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteInputByteString.java +@@ -244,6 +244,8 @@ final class ByteInputByteString extends ByteString.LeafByteString { + public CodedInputStream newCodedInput() { + // We trust CodedInputStream not to modify the bytes, or to give anyone + // else access to them. +- return CodedInputStream.newInstance(buffer, offset, length, true); ++ CodedInputStream cis = CodedInputStream.newInstance(buffer, offset, length, true); ++ cis.enableAliasing(true); ++ return cis; + } + }
