Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 894D218D08 for ; Sat, 30 May 2015 00:42:30 +0000 (UTC) Received: (qmail 66521 invoked by uid 500); 30 May 2015 00:42:30 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 66366 invoked by uid 500); 30 May 2015 00:42:30 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 66197 invoked by uid 99); 30 May 2015 00:42:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 May 2015 00:42:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D6EEE00D5; Sat, 30 May 2015 00:42:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mbertozzi@apache.org To: commits@hbase.apache.org Date: Sat, 30 May 2015 00:42:31 -0000 Message-Id: <2f28e889dc314a89a51c418d9d61cf37@git.apache.org> In-Reply-To: <0357928e8a544f14b4ee5ce5e19a0de0@git.apache.org> References: <0357928e8a544f14b4ee5ce5e19a0de0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] hbase git commit: HBASE-13779 Calling table.exists() before table.get() end up with an empty Result (addendum) 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 Authored: Fri May 29 17:21:20 2015 -0700 Committer: Matteo Bertozzi 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 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