You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/01/05 23:28:45 UTC
hbase git commit: HBASE-19651 Remove LimitInputStream;
AMENDMENT: fix compile
Repository: hbase
Updated Branches:
refs/heads/branch-2 88c749394 -> ce80e8e38
HBASE-19651 Remove LimitInputStream; AMENDMENT: fix compile
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ce80e8e3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ce80e8e3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ce80e8e3
Branch: refs/heads/branch-2
Commit: ce80e8e38f1f0bc53fb4d7182c18ba9101a46fca
Parents: 88c7493
Author: Michael Stack <st...@apache.org>
Authored: Fri Jan 5 17:28:40 2018 -0600
Committer: Michael Stack <st...@apache.org>
Committed: Fri Jan 5 17:28:40 2018 -0600
----------------------------------------------------------------------
.../apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ce80e8e3/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
index cf35124..ebb6079 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
@@ -351,11 +351,7 @@ public class ProtobufLogReader extends ReaderBase {
"inputStream.available()= " + this.inputStream.available() + ", " +
"entry size= " + size + " at offset = " + this.inputStream.getPos());
}
-<<<<<<< HEAD
- ProtobufUtil.mergeFrom(builder, new BoundedInputStream(this.inputStream, size),
-=======
ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),
->>>>>>> a30d9fe8d9... HBASE-19651 Remove LimitInputStream
(int)size);
} catch (InvalidProtocolBufferException ipbe) {
throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +