[1/3] hbase git commit: HBASE-18826 Use HStore instead of Store in our own code base and remove unnecessary methods in Store interface
Repository: hbase
Updated Branches:
refs/heads/branch-2 f73a3a6fb -> d26b8f8dd
http://git-wip-us.apache.org/repos/asf/hbase/blob/d26b8f8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
index d93152a..7edcf54 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
@@ -99,7 +99,7 @@ public class TestKeepDeletes {
// keep 3 versions, rows do not expire
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
3,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
Put p = new Put(T1, ts);
@@ -241,7 +241,7 @@ public class TestKeepDeletes {
// KEEP_DELETED_CELLS is NOT enabled
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
3,
HConstants.FOREVER, KeepDeletedCells.FALSE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
Put p = new Put(T1, ts);
@@ -408,7 +408,7 @@ public class TestKeepDeletes {
public void testDeleteMarkerExpirationEmptyStore() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
@@ -451,7 +451,7 @@ public class TestKeepDeletes {
public void testDeleteMarkerExpiration() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
@@ -514,7 +514,7 @@ public class TestKeepDeletes {
public void testWithOldRow() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
@@ -674,7 +674,7 @@ public class TestKeepDeletes {
public void testDeleteMarkerVersioning() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
Put p = new Put(T1, ts);
@@ -818,7 +818,7 @@ public class TestKeepDeletes {
public void testWithMinVersions() throws Exception {
HTableDescriptor htd =
hbu.createTableDescriptor(name.getMethodName(), 3, 1000, 1,
KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime() - 2000; // 2s in the past
@@ -897,7 +897,7 @@ public class TestKeepDeletes {
public void testWithTTL() throws Exception {
HTableDescriptor htd =
hbu.createTableDescriptor(name.getMethodName(), 1, 1000, 1,
KeepDeletedCells.TTL);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime() - 2000; // 2s in the past
@@ -945,7 +945,7 @@ public class TestKeepDeletes {
}
- private int countDeleteMarkers(Region region) throws IOException {
+ private int countDeleteMarkers(HRegion region) throws IOException {
Scan s = new Scan();
s.setRaw(true);
// use max versions from the store(s)
http://git-wip-us.apache.org/repos/asf/hbase/blob/d26b8f8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
index 0c33bdb..71f18c0 100644
---
[1/3] hbase git commit: HBASE-18826 Use HStore instead of Store in our own code base and remove unnecessary methods in Store interface
Repository: hbase
Updated Branches:
refs/heads/master 0cf15fadd -> 7f4c3b356
http://git-wip-us.apache.org/repos/asf/hbase/blob/7f4c3b35/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
index d93152a..7edcf54 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
@@ -99,7 +99,7 @@ public class TestKeepDeletes {
// keep 3 versions, rows do not expire
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
3,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
Put p = new Put(T1, ts);
@@ -241,7 +241,7 @@ public class TestKeepDeletes {
// KEEP_DELETED_CELLS is NOT enabled
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
3,
HConstants.FOREVER, KeepDeletedCells.FALSE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
Put p = new Put(T1, ts);
@@ -408,7 +408,7 @@ public class TestKeepDeletes {
public void testDeleteMarkerExpirationEmptyStore() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
@@ -451,7 +451,7 @@ public class TestKeepDeletes {
public void testDeleteMarkerExpiration() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
@@ -514,7 +514,7 @@ public class TestKeepDeletes {
public void testWithOldRow() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
@@ -674,7 +674,7 @@ public class TestKeepDeletes {
public void testDeleteMarkerVersioning() throws Exception {
HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0,
1,
HConstants.FOREVER, KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime();
Put p = new Put(T1, ts);
@@ -818,7 +818,7 @@ public class TestKeepDeletes {
public void testWithMinVersions() throws Exception {
HTableDescriptor htd =
hbu.createTableDescriptor(name.getMethodName(), 3, 1000, 1,
KeepDeletedCells.TRUE);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime() - 2000; // 2s in the past
@@ -897,7 +897,7 @@ public class TestKeepDeletes {
public void testWithTTL() throws Exception {
HTableDescriptor htd =
hbu.createTableDescriptor(name.getMethodName(), 1, 1000, 1,
KeepDeletedCells.TTL);
-Region region = hbu.createLocalHRegion(htd, null, null);
+HRegion region = hbu.createLocalHRegion(htd, null, null);
long ts = EnvironmentEdgeManager.currentTime() - 2000; // 2s in the past
@@ -945,7 +945,7 @@ public class TestKeepDeletes {
}
- private int countDeleteMarkers(Region region) throws IOException {
+ private int countDeleteMarkers(HRegion region) throws IOException {
Scan s = new Scan();
s.setRaw(true);
// use max versions from the store(s)
http://git-wip-us.apache.org/repos/asf/hbase/blob/7f4c3b35/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
index 0c33bdb..71f18c0 100644
---
