You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2017/08/13 22:07:23 UTC
hbase git commit: HBASE-18589 branch-1.4 build compile is broken
Repository: hbase
Updated Branches:
refs/heads/branch-1.4 aaece0ba5 -> 5ecb1588f
HBASE-18589 branch-1.4 build compile is broken
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5ecb1588
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5ecb1588
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5ecb1588
Branch: refs/heads/branch-1.4
Commit: 5ecb1588f96c7d9fdcd01e53106d3ec3a22aa581
Parents: aaece0b
Author: Jerry He <je...@apache.org>
Authored: Sun Aug 13 15:06:55 2017 -0700
Committer: Jerry He <je...@apache.org>
Committed: Sun Aug 13 15:06:55 2017 -0700
----------------------------------------------------------------------
.../hadoop/hbase/snapshot/TestRegionSnapshotTask.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ecb1588/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java
index 403b1e6..21853d3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRegionSnapshotTask.java
@@ -27,7 +27,6 @@ import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;
-import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos;
import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
import org.apache.hadoop.hbase.regionserver.HRegion;
@@ -109,9 +108,9 @@ public class TestRegionSnapshotTask {
List<HRegion> hRegions = TEST_UTIL.getHBaseCluster().getRegions(tableName);
- final HBaseProtos.SnapshotDescription snapshot = HBaseProtos.SnapshotDescription.newBuilder()
+ final SnapshotProtos.SnapshotDescription snapshot = SnapshotProtos.SnapshotDescription.newBuilder()
.setTable(tableName.getNameAsString())
- .setType(HBaseProtos.SnapshotDescription.Type.FLUSH)
+ .setType(SnapshotProtos.SnapshotDescription.Type.FLUSH)
.setName("test_table_snapshot")
.setVersion(SnapshotManifestV2.DESCRIPTOR_VERSION)
.build();
@@ -161,7 +160,7 @@ public class TestRegionSnapshotTask {
SnapshotReferenceUtil.verifySnapshot(conf, fs, manifest);
}
- private void addRegionToSnapshot(HBaseProtos.SnapshotDescription snapshot,
+ private void addRegionToSnapshot(SnapshotProtos.SnapshotDescription snapshot,
HRegion region, SnapshotManifest manifest) throws Exception {
LOG.info("Adding region to snapshot: " + region.getRegionInfo().getRegionNameAsString());
Path workingDir = SnapshotDescriptionUtils.getWorkingSnapshotDir(snapshot, rootDir);
@@ -171,7 +170,7 @@ public class TestRegionSnapshotTask {
}
private SnapshotManifest.RegionVisitor createRegionVisitorWithDelay(
- HBaseProtos.SnapshotDescription desc, Path workingDir) {
+ SnapshotProtos.SnapshotDescription desc, Path workingDir) {
return new SnapshotManifestV2.ManifestBuilder(conf, fs, workingDir) {
@Override
public void storeFile(final SnapshotProtos.SnapshotRegionManifest.Builder region,