Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18673 Some more unwanted reference to unshaded PB classes

This commit is contained in:
Michael Stack 2017-08-24 16:31:31 -07:00
parent 81ccef83be
commit 608888698c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
View File

@ -44,8 +44,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.wal.WAL.Entry; import org.apache.hadoop.hbase.wal.WAL.Entry;
import com.google.protobuf.CodedInputStream; import org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream;
import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
/** /**
* A Protobuf based WAL has the following structure: * A Protobuf based WAL has the following structure:

5
hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
View File

@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
import org.apache.hadoop.hbase.shaded.com.google.common.collect.Multimap; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Multimap;
import org.apache.hadoop.hbase.shaded.com.google.common.collect.Ordering; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Ordering;
import org.apache.hadoop.hbase.shaded.com.google.common.collect.TreeMultimap; import org.apache.hadoop.hbase.shaded.com.google.common.collect.TreeMultimap;
import com.google.protobuf.ServiceException;
import java.io.Closeable; import java.io.Closeable;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -745,7 +744,7 @@ public class HBaseFsck extends Configured implements Closeable {
* @return 0 on success, non-zero on failure * @return 0 on success, non-zero on failure
*/ */
public int onlineHbck() public int onlineHbck()
throws IOException, KeeperException, InterruptedException, ServiceException { throws IOException, KeeperException, InterruptedException {
// print hbase server version // print hbase server version
errors.print("Version: " + status.getHBaseVersion()); errors.print("Version: " + status.getHBaseVersion());
@ -4841,7 +4840,7 @@ public class HBaseFsck extends Configured implements Closeable {
public HBaseFsck exec(ExecutorService exec, String[] args) throws KeeperException, IOException, public HBaseFsck exec(ExecutorService exec, String[] args) throws KeeperException, IOException,
ServiceException, InterruptedException { InterruptedException {
long sleepBeforeRerun = DEFAULT_SLEEP_BEFORE_RERUN; long sleepBeforeRerun = DEFAULT_SLEEP_BEFORE_RERUN;
boolean checkCorruptHFiles = false; boolean checkCorruptHFiles = false;