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:02:00 UTC
[1/2] hbase git commit: Revert "HBASE-19651 Remove LimitInputStream"
Repository: hbase
Updated Branches:
refs/heads/branch-2 4c19e1f4e -> 88c749394
Revert "HBASE-19651 Remove LimitInputStream"
Revert to fix author.
This reverts commit 4c19e1f4e35c170865d103a75f50844ba69c1ffe.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e7da907c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e7da907c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e7da907c
Branch: refs/heads/branch-2
Commit: e7da907c3cc685f36c3884b23cc5d1f7a12743b4
Parents: 4c19e1f
Author: Michael Stack <st...@apache.org>
Authored: Fri Jan 5 16:59:59 2018 -0600
Committer: Michael Stack <st...@apache.org>
Committed: Fri Jan 5 16:59:59 2018 -0600
----------------------------------------------------------------------
NOTICE.txt | 1 +
.../org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 3 +--
hbase-common/src/main/appended-resources/META-INF/NOTICE | 7 +++++++
.../hadoop/hbase/regionserver/wal/ProtobufLogReader.java | 5 ++---
4 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e7da907c/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 9c238be..7959857 100755
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -39,6 +39,7 @@ Licensed under the Apache License v2.0 as a part of the Bootstrap project.
--
This product includes portions of the Guava project v14 and v21, specifically
+'hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java'
'hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java'
'hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java'
http://git-wip-us.apache.org/repos/asf/hbase/blob/e7da907c/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index b26802f..f0a5d16 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -106,7 +106,6 @@ import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.yetus.audience.InterfaceAudience;
-import org.apache.hbase.thirdparty.com.google.common.io.ByteStreams;
import org.apache.hbase.thirdparty.com.google.gson.JsonArray;
import org.apache.hbase.thirdparty.com.google.gson.JsonElement;
import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;
@@ -2610,7 +2609,7 @@ public final class ProtobufUtil {
final int firstByte = in.read();
if (firstByte != -1) {
final int size = CodedInputStream.readRawVarint32(firstByte, in);
- final InputStream limitedInput = ByteStreams.limit(in, size);
+ final InputStream limitedInput = new BoundedInputStream(in, size);
final CodedInputStream codedInput = CodedInputStream.newInstance(limitedInput);
codedInput.setSizeLimit(size);
builder.mergeFrom(codedInput);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e7da907c/hbase-common/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/appended-resources/META-INF/NOTICE b/hbase-common/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..9176ece
--- /dev/null
+++ b/hbase-common/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,7 @@
+--
+This product includes portions of the Guava project v14, specifically
+'hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java'
+
+Copyright (C) 2007 The Guava Authors
+
+Licensed under the Apache License, Version 2.0
http://git-wip-us.apache.org/repos/asf/hbase/blob/e7da907c/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 ebb6079..7babb55 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
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.commons.io.input.BoundedInputStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FileSystem;
@@ -40,11 +41,9 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.wal.WAL.Entry;
import org.apache.yetus.audience.InterfaceAudience;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.hbase.thirdparty.com.google.common.io.ByteStreams;
import org.apache.hbase.thirdparty.com.google.protobuf.CodedInputStream;
import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;
@@ -351,7 +350,7 @@ public class ProtobufLogReader extends ReaderBase {
"inputStream.available()= " + this.inputStream.available() + ", " +
"entry size= " + size + " at offset = " + this.inputStream.getPos());
}
- ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),
+ ProtobufUtil.mergeFrom(builder, new BoundedInputStream(this.inputStream, size),
(int)size);
} catch (InvalidProtocolBufferException ipbe) {
throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +
[2/2] hbase git commit: HBASE-19651 Remove LimitInputStream
Posted by st...@apache.org.
HBASE-19651 Remove LimitInputStream
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/88c74939
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/88c74939
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/88c74939
Branch: refs/heads/branch-2
Commit: 88c74939484b3138cf677f4feac6528ea5d855ce
Parents: e7da907
Author: Beluga Behr <da...@gmail.com>
Authored: Fri Jan 5 16:59:29 2018 -0600
Committer: Michael Stack <st...@apache.org>
Committed: Fri Jan 5 17:01:50 2018 -0600
----------------------------------------------------------------------
NOTICE.txt | 1 -
.../org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 3 ++-
hbase-common/src/main/appended-resources/META-INF/NOTICE | 7 -------
.../hadoop/hbase/regionserver/wal/ProtobufLogReader.java | 7 ++++++-
4 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/88c74939/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 7959857..9c238be 100755
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -39,7 +39,6 @@ Licensed under the Apache License v2.0 as a part of the Bootstrap project.
--
This product includes portions of the Guava project v14 and v21, specifically
-'hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java'
'hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java'
'hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java'
http://git-wip-us.apache.org/repos/asf/hbase/blob/88c74939/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index f0a5d16..b26802f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -106,6 +106,7 @@ import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.hbase.thirdparty.com.google.common.io.ByteStreams;
import org.apache.hbase.thirdparty.com.google.gson.JsonArray;
import org.apache.hbase.thirdparty.com.google.gson.JsonElement;
import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;
@@ -2609,7 +2610,7 @@ public final class ProtobufUtil {
final int firstByte = in.read();
if (firstByte != -1) {
final int size = CodedInputStream.readRawVarint32(firstByte, in);
- final InputStream limitedInput = new BoundedInputStream(in, size);
+ final InputStream limitedInput = ByteStreams.limit(in, size);
final CodedInputStream codedInput = CodedInputStream.newInstance(limitedInput);
codedInput.setSizeLimit(size);
builder.mergeFrom(codedInput);
http://git-wip-us.apache.org/repos/asf/hbase/blob/88c74939/hbase-common/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/appended-resources/META-INF/NOTICE b/hbase-common/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 9176ece..0000000
--- a/hbase-common/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
---
-This product includes portions of the Guava project v14, specifically
-'hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java'
-
-Copyright (C) 2007 The Guava Authors
-
-Licensed under the Apache License, Version 2.0
http://git-wip-us.apache.org/repos/asf/hbase/blob/88c74939/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 7babb55..cf35124 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
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.io.input.BoundedInputStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FileSystem;
@@ -41,9 +40,11 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.wal.WAL.Entry;
import org.apache.yetus.audience.InterfaceAudience;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.hbase.thirdparty.com.google.common.io.ByteStreams;
import org.apache.hbase.thirdparty.com.google.protobuf.CodedInputStream;
import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;
@@ -350,7 +351,11 @@ 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=" +