Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6BED210006 for ; Sun, 14 Dec 2014 05:19:39 +0000 (UTC) Received: (qmail 76509 invoked by uid 500); 14 Dec 2014 05:19:39 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 76470 invoked by uid 500); 14 Dec 2014 05:19:39 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 76461 invoked by uid 99); 14 Dec 2014 05:19:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Dec 2014 05:19:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DB6AC955458; Sun, 14 Dec 2014 05:19:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: larsh@apache.org To: commits@phoenix.apache.org Date: Sun, 14 Dec 2014 05:19:39 -0000 Message-Id: In-Reply-To: <51f0d59c0193422aad4a1665fc7da867@git.apache.org> References: <51f0d59c0193422aad4a1665fc7da867@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] phoenix git commit: PHOENIX-1470 KEEP_DELETED_CELLS interface changed in HBase 0.98.8 (Jesse Yates) PHOENIX-1470 KEEP_DELETED_CELLS interface changed in HBase 0.98.8 (Jesse Yates) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a72ec92e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a72ec92e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a72ec92e Branch: refs/heads/4.0 Commit: a72ec92ef1f4609ef39e678462778c70c9b7fca3 Parents: 2faa3f4 Author: Lars Hofhansl Authored: Sat Dec 13 21:19:01 2014 -0800 Committer: Lars Hofhansl Committed: Sat Dec 13 21:19:51 2014 -0800 ---------------------------------------------------------------------- .../apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a72ec92e/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index 88a0447..b467004 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -35,6 +35,7 @@ import static org.apache.phoenix.util.TestUtil.TABLE_WITH_SALTING; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -607,16 +608,17 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { descriptor = admin.getTableDescriptor(htableName); assertEquals(3,descriptor.getColumnFamilies().length); HColumnDescriptor cdA = descriptor.getFamily(cfA); - assertTrue(cdA.getKeepDeletedCells()); + assertNotEquals(HColumnDescriptor.DEFAULT_KEEP_DELETED, cdA.getKeepDeletedCells()); assertEquals(DataBlockEncoding.NONE, cdA.getDataBlockEncoding()); // Overriden using WITH assertEquals(1,cdA.getMaxVersions());// Overriden using WITH HColumnDescriptor cdB = descriptor.getFamily(cfB); - assertFalse(cdB.getKeepDeletedCells()); // Allow KEEP_DELETED_CELLS to be false for VEIW + // Allow KEEP_DELETED_CELLS to be false for VIEW + assertEquals(HColumnDescriptor.DEFAULT_KEEP_DELETED, cdA.getKeepDeletedCells()); assertEquals(DataBlockEncoding.NONE, cdB.getDataBlockEncoding()); // Should keep the original value. // CF c should stay the same since it's not a Phoenix cf. HColumnDescriptor cdC = descriptor.getFamily(cfC); assertNotNull("Column family not found", cdC); - assertFalse(cdC.getKeepDeletedCells()); + assertEquals(HColumnDescriptor.DEFAULT_KEEP_DELETED, cdA.getKeepDeletedCells()); assertFalse(SchemaUtil.DEFAULT_DATA_BLOCK_ENCODING == cdC.getDataBlockEncoding()); assertTrue(descriptor.hasCoprocessor(UngroupedAggregateRegionObserver.class.getName())); assertTrue(descriptor.hasCoprocessor(GroupedAggregateRegionObserver.class.getName())); @@ -653,7 +655,7 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { assertFalse(rs.next()); conn2.close(); } - + @SuppressWarnings("deprecation") @Test public void testCreateViewOnExistingTable() throws Exception {