You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2015/05/30 02:42:30 UTC
[1/5] hbase git commit: HBASE-13779 Calling table.exists() before
table.get() end up with an empty Result (addendum)
Repository: hbase
Updated Branches:
refs/heads/0.98 4c5af52e9 -> 1bde01392
refs/heads/branch-1 518a29140 -> adbc3dd09
refs/heads/branch-1.0 003b909f0 -> ff6c2f7f1
refs/heads/branch-1.1 e23daa71a -> 3b2c1a0f9
refs/heads/master e0cf811b3 -> 749dda6ac
HBASE-13779 Calling table.exists() before table.get() end up with an empty Result (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ff6c2f7f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ff6c2f7f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ff6c2f7f
Branch: refs/heads/branch-1.0
Commit: ff6c2f7f1648b3beaa6dea09ae87961ab96e0af4
Parents: 003b909
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri May 29 17:21:20 2015 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri May 29 17:41:13 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/Get.java | 6 ++-
.../org/apache/hadoop/hbase/client/HTable.java | 2 +-
.../org/apache/hadoop/hbase/client/TestGet.java | 40 +++++++++++++++++++-
3 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff6c2f7f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index 32e3114..6ba25db 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -99,7 +99,11 @@ public class Get extends Query
*/
public Get(Get get) {
this(get.getRow());
- this.filter = get.getFilter();
+ // from Query
+ this.setFilter(get.getFilter());
+ this.setReplicaId(get.getReplicaId());
+ this.setConsistency(get.getConsistency());
+ // from Get
this.cacheBlocks = get.getCacheBlocks();
this.maxVersions = get.getMaxVersions();
this.storeLimit = get.getMaxResultsPerColumnFamily();
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff6c2f7f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index 689e827..d64af7a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -860,7 +860,7 @@ public class HTable implements HTableInterface, RegionLocator {
*/
@Override
public Result get(final Get get) throws IOException {
- return get(get, false);
+ return get(get, get.isCheckExistenceOnly());
}
private Result get(Get get, final boolean checkExistenceOnly) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff6c2f7f/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index 1f8ad49..fdb07d0 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -41,6 +41,8 @@ import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.security.access.Permission;
+import org.apache.hadoop.hbase.security.visibility.Authorizations;
import org.apache.hadoop.hbase.util.Base64;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
@@ -154,12 +156,48 @@ public class TestGet {
Set<byte[]> qualifiers = get.getFamilyMap().get(family);
Assert.assertEquals(1, qualifiers.size());
}
-
+
@Test
public void TestGetRowFromGetCopyConstructor() throws Exception {
Get get = new Get(ROW);
+ get.setFilter(null);
+ get.setAuthorizations(new Authorizations("foo"));
+ get.setACL("u", new Permission(Permission.Action.READ));
+ get.setConsistency(Consistency.TIMELINE);
+ get.setReplicaId(2);
+ get.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
+ get.setCheckExistenceOnly(true);
+ get.setClosestRowBefore(true);
+ get.setTimeRange(3, 4);
+ get.setMaxVersions(11);
+ get.setMaxResultsPerColumnFamily(10);
+ get.setRowOffsetPerColumnFamily(11);
+ get.setCacheBlocks(true);
+
Get copyGet = new Get(get);
assertEquals(0, Bytes.compareTo(get.getRow(), copyGet.getRow()));
+
+ // from OperationWithAttributes
+ assertEquals(get.getId(), copyGet.getId());
+
+ // from Query class
+ assertEquals(get.getFilter(), copyGet.getFilter());
+ assertTrue(get.getAuthorizations().toString().equals(copyGet.getAuthorizations().toString()));
+ assertTrue(Bytes.equals(get.getACL(), copyGet.getACL()));
+ assertEquals(get.getConsistency(), copyGet.getConsistency());
+ assertEquals(get.getReplicaId(), copyGet.getReplicaId());
+ assertEquals(get.getIsolationLevel(), copyGet.getIsolationLevel());
+
+ // from Get class
+ assertEquals(get.isCheckExistenceOnly(), copyGet.isCheckExistenceOnly());
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertTrue(get.getTimeRange().equals(copyGet.getTimeRange()));
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertEquals(get.getMaxVersions(), copyGet.getMaxVersions());
+ assertEquals(get.getMaxResultsPerColumnFamily(), copyGet.getMaxResultsPerColumnFamily());
+ assertEquals(get.getRowOffsetPerColumnFamily(), copyGet.getRowOffsetPerColumnFamily());
+ assertEquals(get.getCacheBlocks(), copyGet.getCacheBlocks());
+ assertEquals(get.getId(), copyGet.getId());
}
@Test
[4/5] hbase git commit: HBASE-13779 Calling table.exists() before
table.get() end up with an empty Result (addendum)
Posted by mb...@apache.org.
HBASE-13779 Calling table.exists() before table.get() end up with an empty Result (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1bde0139
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1bde0139
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1bde0139
Branch: refs/heads/0.98
Commit: 1bde01392f1532a43a010384fe7df37286c20251
Parents: 4c5af52
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri May 29 17:14:18 2015 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri May 29 17:41:45 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/HTable.java | 2 +-
.../org/apache/hadoop/hbase/client/TestGet.java | 36 +++++++++++++++++++-
2 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1bde0139/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index a6d1d55..744c8e8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -809,7 +809,7 @@ public class HTable implements HTableInterface {
*/
@Override
public Result get(final Get get) throws IOException {
- return get(get, false);
+ return get(get, get.isCheckExistenceOnly());
}
private Result get(Get get, final boolean checkExistenceOnly) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/1bde0139/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index 1f8ad49..a08ddee 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -41,6 +41,8 @@ import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.security.access.Permission;
+import org.apache.hadoop.hbase.security.visibility.Authorizations;
import org.apache.hadoop.hbase.util.Base64;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
@@ -154,12 +156,44 @@ public class TestGet {
Set<byte[]> qualifiers = get.getFamilyMap().get(family);
Assert.assertEquals(1, qualifiers.size());
}
-
+
@Test
public void TestGetRowFromGetCopyConstructor() throws Exception {
Get get = new Get(ROW);
+ get.setFilter(null);
+ get.setAuthorizations(new Authorizations("foo"));
+ get.setACL("u", new Permission(Permission.Action.READ));
+ get.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
+ get.setCheckExistenceOnly(true);
+ get.setClosestRowBefore(true);
+ get.setTimeRange(3, 4);
+ get.setMaxVersions(11);
+ get.setMaxResultsPerColumnFamily(10);
+ get.setRowOffsetPerColumnFamily(11);
+ get.setCacheBlocks(true);
+
Get copyGet = new Get(get);
assertEquals(0, Bytes.compareTo(get.getRow(), copyGet.getRow()));
+
+ // from OperationWithAttributes
+ assertEquals(get.getId(), copyGet.getId());
+
+ // from Query class
+ assertEquals(get.getFilter(), copyGet.getFilter());
+ assertTrue(get.getAuthorizations().toString().equals(copyGet.getAuthorizations().toString()));
+ assertTrue(Bytes.equals(get.getACL(), copyGet.getACL()));
+ assertEquals(get.getIsolationLevel(), copyGet.getIsolationLevel());
+
+ // from Get class
+ assertEquals(get.isCheckExistenceOnly(), copyGet.isCheckExistenceOnly());
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertTrue(get.getTimeRange().equals(copyGet.getTimeRange()));
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertEquals(get.getMaxVersions(), copyGet.getMaxVersions());
+ assertEquals(get.getMaxResultsPerColumnFamily(), copyGet.getMaxResultsPerColumnFamily());
+ assertEquals(get.getRowOffsetPerColumnFamily(), copyGet.getRowOffsetPerColumnFamily());
+ assertEquals(get.getCacheBlocks(), copyGet.getCacheBlocks());
+ assertEquals(get.getId(), copyGet.getId());
}
@Test
[5/5] hbase git commit: HBASE-13779 Calling table.exists() before
table.get() end up with an empty Result (addendum)
Posted by mb...@apache.org.
HBASE-13779 Calling table.exists() before table.get() end up with an empty Result (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/adbc3dd0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/adbc3dd0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/adbc3dd0
Branch: refs/heads/branch-1
Commit: adbc3dd0971336c3e7947215c2ba16600da2788f
Parents: 518a291
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri May 29 17:21:20 2015 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri May 29 17:42:11 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/Get.java | 6 ++-
.../org/apache/hadoop/hbase/client/HTable.java | 2 +-
.../org/apache/hadoop/hbase/client/TestGet.java | 40 +++++++++++++++++++-
3 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/adbc3dd0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index 32e3114..6ba25db 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -99,7 +99,11 @@ public class Get extends Query
*/
public Get(Get get) {
this(get.getRow());
- this.filter = get.getFilter();
+ // from Query
+ this.setFilter(get.getFilter());
+ this.setReplicaId(get.getReplicaId());
+ this.setConsistency(get.getConsistency());
+ // from Get
this.cacheBlocks = get.getCacheBlocks();
this.maxVersions = get.getMaxVersions();
this.storeLimit = get.getMaxResultsPerColumnFamily();
http://git-wip-us.apache.org/repos/asf/hbase/blob/adbc3dd0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index c59be3c..ec675b4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -842,7 +842,7 @@ public class HTable implements HTableInterface, RegionLocator {
*/
@Override
public Result get(final Get get) throws IOException {
- return get(get, false);
+ return get(get, get.isCheckExistenceOnly());
}
private Result get(Get get, final boolean checkExistenceOnly) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/adbc3dd0/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index 1f8ad49..fdb07d0 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -41,6 +41,8 @@ import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.security.access.Permission;
+import org.apache.hadoop.hbase.security.visibility.Authorizations;
import org.apache.hadoop.hbase.util.Base64;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
@@ -154,12 +156,48 @@ public class TestGet {
Set<byte[]> qualifiers = get.getFamilyMap().get(family);
Assert.assertEquals(1, qualifiers.size());
}
-
+
@Test
public void TestGetRowFromGetCopyConstructor() throws Exception {
Get get = new Get(ROW);
+ get.setFilter(null);
+ get.setAuthorizations(new Authorizations("foo"));
+ get.setACL("u", new Permission(Permission.Action.READ));
+ get.setConsistency(Consistency.TIMELINE);
+ get.setReplicaId(2);
+ get.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
+ get.setCheckExistenceOnly(true);
+ get.setClosestRowBefore(true);
+ get.setTimeRange(3, 4);
+ get.setMaxVersions(11);
+ get.setMaxResultsPerColumnFamily(10);
+ get.setRowOffsetPerColumnFamily(11);
+ get.setCacheBlocks(true);
+
Get copyGet = new Get(get);
assertEquals(0, Bytes.compareTo(get.getRow(), copyGet.getRow()));
+
+ // from OperationWithAttributes
+ assertEquals(get.getId(), copyGet.getId());
+
+ // from Query class
+ assertEquals(get.getFilter(), copyGet.getFilter());
+ assertTrue(get.getAuthorizations().toString().equals(copyGet.getAuthorizations().toString()));
+ assertTrue(Bytes.equals(get.getACL(), copyGet.getACL()));
+ assertEquals(get.getConsistency(), copyGet.getConsistency());
+ assertEquals(get.getReplicaId(), copyGet.getReplicaId());
+ assertEquals(get.getIsolationLevel(), copyGet.getIsolationLevel());
+
+ // from Get class
+ assertEquals(get.isCheckExistenceOnly(), copyGet.isCheckExistenceOnly());
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertTrue(get.getTimeRange().equals(copyGet.getTimeRange()));
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertEquals(get.getMaxVersions(), copyGet.getMaxVersions());
+ assertEquals(get.getMaxResultsPerColumnFamily(), copyGet.getMaxResultsPerColumnFamily());
+ assertEquals(get.getRowOffsetPerColumnFamily(), copyGet.getRowOffsetPerColumnFamily());
+ assertEquals(get.getCacheBlocks(), copyGet.getCacheBlocks());
+ assertEquals(get.getId(), copyGet.getId());
}
@Test
[3/5] hbase git commit: HBASE-13779 Calling table.exists() before
table.get() end up with an empty Result (addendum)
Posted by mb...@apache.org.
HBASE-13779 Calling table.exists() before table.get() end up with an empty Result (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/749dda6a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/749dda6a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/749dda6a
Branch: refs/heads/master
Commit: 749dda6aca0562ed902b25d125d2c47139b1c989
Parents: e0cf811
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri May 29 17:21:20 2015 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri May 29 17:41:33 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/Get.java | 6 ++-
.../org/apache/hadoop/hbase/client/HTable.java | 2 +-
.../org/apache/hadoop/hbase/client/TestGet.java | 40 +++++++++++++++++++-
3 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/749dda6a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index 272b7a6..abf6b1c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -99,7 +99,11 @@ public class Get extends Query
*/
public Get(Get get) {
this(get.getRow());
- this.filter = get.getFilter();
+ // from Query
+ this.setFilter(get.getFilter());
+ this.setReplicaId(get.getReplicaId());
+ this.setConsistency(get.getConsistency());
+ // from Get
this.cacheBlocks = get.getCacheBlocks();
this.maxVersions = get.getMaxVersions();
this.storeLimit = get.getMaxResultsPerColumnFamily();
http://git-wip-us.apache.org/repos/asf/hbase/blob/749dda6a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index 59fce15..686aaa8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -684,7 +684,7 @@ public class HTable implements HTableInterface {
*/
@Override
public Result get(final Get get) throws IOException {
- return get(get, false);
+ return get(get, get.isCheckExistenceOnly());
}
private Result get(Get get, final boolean checkExistenceOnly) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/749dda6a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index fd1ba50..0e18ecf 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -40,6 +40,8 @@ import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.security.access.Permission;
+import org.apache.hadoop.hbase.security.visibility.Authorizations;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Base64;
@@ -155,12 +157,48 @@ public class TestGet {
Set<byte[]> qualifiers = get.getFamilyMap().get(family);
Assert.assertEquals(1, qualifiers.size());
}
-
+
@Test
public void TestGetRowFromGetCopyConstructor() throws Exception {
Get get = new Get(ROW);
+ get.setFilter(null);
+ get.setAuthorizations(new Authorizations("foo"));
+ get.setACL("u", new Permission(Permission.Action.READ));
+ get.setConsistency(Consistency.TIMELINE);
+ get.setReplicaId(2);
+ get.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
+ get.setCheckExistenceOnly(true);
+ get.setClosestRowBefore(true);
+ get.setTimeRange(3, 4);
+ get.setMaxVersions(11);
+ get.setMaxResultsPerColumnFamily(10);
+ get.setRowOffsetPerColumnFamily(11);
+ get.setCacheBlocks(true);
+
Get copyGet = new Get(get);
assertEquals(0, Bytes.compareTo(get.getRow(), copyGet.getRow()));
+
+ // from OperationWithAttributes
+ assertEquals(get.getId(), copyGet.getId());
+
+ // from Query class
+ assertEquals(get.getFilter(), copyGet.getFilter());
+ assertTrue(get.getAuthorizations().toString().equals(copyGet.getAuthorizations().toString()));
+ assertTrue(Bytes.equals(get.getACL(), copyGet.getACL()));
+ assertEquals(get.getConsistency(), copyGet.getConsistency());
+ assertEquals(get.getReplicaId(), copyGet.getReplicaId());
+ assertEquals(get.getIsolationLevel(), copyGet.getIsolationLevel());
+
+ // from Get class
+ assertEquals(get.isCheckExistenceOnly(), copyGet.isCheckExistenceOnly());
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertTrue(get.getTimeRange().equals(copyGet.getTimeRange()));
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertEquals(get.getMaxVersions(), copyGet.getMaxVersions());
+ assertEquals(get.getMaxResultsPerColumnFamily(), copyGet.getMaxResultsPerColumnFamily());
+ assertEquals(get.getRowOffsetPerColumnFamily(), copyGet.getRowOffsetPerColumnFamily());
+ assertEquals(get.getCacheBlocks(), copyGet.getCacheBlocks());
+ assertEquals(get.getId(), copyGet.getId());
}
@Test
[2/5] hbase git commit: HBASE-13779 Calling table.exists() before
table.get() end up with an empty Result (addendum)
Posted by mb...@apache.org.
HBASE-13779 Calling table.exists() before table.get() end up with an empty Result (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3b2c1a0f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3b2c1a0f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3b2c1a0f
Branch: refs/heads/branch-1.1
Commit: 3b2c1a0f92d1bc8340ae00aa4aa9e1fb17e46b5c
Parents: e23daa7
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri May 29 17:21:20 2015 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri May 29 17:41:22 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/Get.java | 6 ++-
.../org/apache/hadoop/hbase/client/HTable.java | 2 +-
.../org/apache/hadoop/hbase/client/TestGet.java | 40 +++++++++++++++++++-
3 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3b2c1a0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index 32e3114..6ba25db 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -99,7 +99,11 @@ public class Get extends Query
*/
public Get(Get get) {
this(get.getRow());
- this.filter = get.getFilter();
+ // from Query
+ this.setFilter(get.getFilter());
+ this.setReplicaId(get.getReplicaId());
+ this.setConsistency(get.getConsistency());
+ // from Get
this.cacheBlocks = get.getCacheBlocks();
this.maxVersions = get.getMaxVersions();
this.storeLimit = get.getMaxResultsPerColumnFamily();
http://git-wip-us.apache.org/repos/asf/hbase/blob/3b2c1a0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index c59be3c..ec675b4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -842,7 +842,7 @@ public class HTable implements HTableInterface, RegionLocator {
*/
@Override
public Result get(final Get get) throws IOException {
- return get(get, false);
+ return get(get, get.isCheckExistenceOnly());
}
private Result get(Get get, final boolean checkExistenceOnly) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/3b2c1a0f/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index 1f8ad49..fdb07d0 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -41,6 +41,8 @@ import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.security.access.Permission;
+import org.apache.hadoop.hbase.security.visibility.Authorizations;
import org.apache.hadoop.hbase.util.Base64;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
@@ -154,12 +156,48 @@ public class TestGet {
Set<byte[]> qualifiers = get.getFamilyMap().get(family);
Assert.assertEquals(1, qualifiers.size());
}
-
+
@Test
public void TestGetRowFromGetCopyConstructor() throws Exception {
Get get = new Get(ROW);
+ get.setFilter(null);
+ get.setAuthorizations(new Authorizations("foo"));
+ get.setACL("u", new Permission(Permission.Action.READ));
+ get.setConsistency(Consistency.TIMELINE);
+ get.setReplicaId(2);
+ get.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
+ get.setCheckExistenceOnly(true);
+ get.setClosestRowBefore(true);
+ get.setTimeRange(3, 4);
+ get.setMaxVersions(11);
+ get.setMaxResultsPerColumnFamily(10);
+ get.setRowOffsetPerColumnFamily(11);
+ get.setCacheBlocks(true);
+
Get copyGet = new Get(get);
assertEquals(0, Bytes.compareTo(get.getRow(), copyGet.getRow()));
+
+ // from OperationWithAttributes
+ assertEquals(get.getId(), copyGet.getId());
+
+ // from Query class
+ assertEquals(get.getFilter(), copyGet.getFilter());
+ assertTrue(get.getAuthorizations().toString().equals(copyGet.getAuthorizations().toString()));
+ assertTrue(Bytes.equals(get.getACL(), copyGet.getACL()));
+ assertEquals(get.getConsistency(), copyGet.getConsistency());
+ assertEquals(get.getReplicaId(), copyGet.getReplicaId());
+ assertEquals(get.getIsolationLevel(), copyGet.getIsolationLevel());
+
+ // from Get class
+ assertEquals(get.isCheckExistenceOnly(), copyGet.isCheckExistenceOnly());
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertTrue(get.getTimeRange().equals(copyGet.getTimeRange()));
+ assertEquals(get.isClosestRowBefore(), copyGet.isClosestRowBefore());
+ assertEquals(get.getMaxVersions(), copyGet.getMaxVersions());
+ assertEquals(get.getMaxResultsPerColumnFamily(), copyGet.getMaxResultsPerColumnFamily());
+ assertEquals(get.getRowOffsetPerColumnFamily(), copyGet.getRowOffsetPerColumnFamily());
+ assertEquals(get.getCacheBlocks(), copyGet.getCacheBlocks());
+ assertEquals(get.getId(), copyGet.getId());
}
@Test