You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/11/28 20:18:59 UTC
hbase git commit: HBASE-19363 Tests under TestCheckAndMutate are
identical
Repository: hbase
Updated Branches:
refs/heads/master b5a01685f -> 520b9efc2
HBASE-19363 Tests under TestCheckAndMutate are identical
Remove testCheckAndMutateUsingNewComparisonOperatorInstead
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/520b9efc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/520b9efc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/520b9efc
Branch: refs/heads/master
Commit: 520b9efc2de34b3b02ee86bad7ccb6e169788fc1
Parents: b5a0168
Author: Peter Somogyi <ps...@cloudera.com>
Authored: Tue Nov 28 14:55:01 2017 +0100
Committer: Michael Stack <st...@apache.org>
Committed: Tue Nov 28 12:18:51 2017 -0800
----------------------------------------------------------------------
.../hadoop/hbase/client/TestCheckAndMutate.java | 39 --------------------
1 file changed, 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/520b9efc/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
index 5c39925..5e0791a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.client;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -46,17 +45,11 @@ public class TestCheckAndMutate {
@Rule
public TestName name = new TestName();
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.startMiniCluster();
}
- /**
- * @throws java.lang.Exception
- */
@AfterClass
public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniCluster();
@@ -154,36 +147,4 @@ public class TestCheckAndMutate {
}
}
- @Test
- public void testCheckAndMutateUsingNewComparisonOperatorInstead() throws Throwable {
- try (Table table = createTable()) {
- // put one row
- putOneRow(table);
- // get row back and assert the values
- getOneRowAndAssertAllExist(table);
-
- // put the same row again with C column deleted
- RowMutations rm = makeRowMutationsWithColumnCDeleted();
- boolean res = table.checkAndMutate(ROWKEY, FAMILY, Bytes.toBytes("A"),
- CompareOperator.EQUAL, Bytes.toBytes("a"), rm);
- assertTrue(res);
-
- // get row back and assert the values
- getOneRowAndAssertAllButCExist(table);
-
- //Test that we get a region level exception
- try {
- rm = getBogusRowMutations();
- table.checkAndMutate(ROWKEY, FAMILY, Bytes.toBytes("A"), CompareOperator.EQUAL,
- Bytes.toBytes("a"), rm);
- fail("Expected NoSuchColumnFamilyException");
- } catch (RetriesExhaustedWithDetailsException e) {
- try {
- throw e.getCause(0);
- } catch (NoSuchColumnFamilyException e1) {
- // expected
- }
- }
- }
- }
}