tephra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject [1/3] incubator-tephra git commit: TEPHRA-294 Update TransactionAwareTable to implement interface of Table for 1.3 and 1.4
Date Wed, 15 Aug 2018 15:11:08 GMT
Repository: incubator-tephra
Updated Branches:
  refs/heads/master d0a1c4c29 -> 16bcfefbc


http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/52fd15f0/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/AbstractHBaseTableTest.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/AbstractHBaseTableTest.java
b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/AbstractHBaseTableTest.java
index 560b0fe..179b22e 100644
--- a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/AbstractHBaseTableTest.java
+++ b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/AbstractHBaseTableTest.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.tephra.TxConstants;
 import org.apache.tephra.hbase.coprocessor.TransactionProcessor;
 import org.junit.AfterClass;
@@ -60,7 +60,6 @@ public abstract class AbstractHBaseTableTest {
     conf.setInt("hbase.master.info.port", 0);
     conf.setInt("hbase.regionserver.port", 0);
     conf.setInt("hbase.regionserver.info.port", 0);
-
     testUtil.startMiniCluster();
     hBaseAdmin = testUtil.getHBaseAdmin();
   }
@@ -76,12 +75,12 @@ public abstract class AbstractHBaseTableTest {
     }
   }
 
-  protected static HTable createTable(byte[] tableName, byte[][] columnFamilies) throws Exception
{
+  protected static Table createTable(byte[] tableName, byte[][] columnFamilies) throws Exception
{
     return createTable(tableName, columnFamilies, false,
                        Collections.singletonList(TransactionProcessor.class.getName()));
   }
 
-  protected static HTable createTable(byte[] tableName, byte[][] columnFamilies, boolean
existingData,
+  protected static Table createTable(byte[] tableName, byte[][] columnFamilies, boolean existingData,
                                       List<String> coprocessors) throws Exception {
     HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));
     for (byte[] family : columnFamilies) {
@@ -101,6 +100,6 @@ public abstract class AbstractHBaseTableTest {
     }
     hBaseAdmin.createTable(desc);
     testUtil.waitTableAvailable(tableName, 5000);
-    return new HTable(testUtil.getConfiguration(), tableName);
+    return testUtil.getConnection().getTable(TableName.valueOf(tableName));
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/52fd15f0/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/TransactionAwareHTableTest.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/TransactionAwareHTableTest.java
b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/TransactionAwareHTableTest.java
index 73f9d45..51fbbda 100644
--- a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/TransactionAwareHTableTest.java
+++ b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/TransactionAwareHTableTest.java
@@ -26,17 +26,17 @@ import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Durability;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.OperationWithAttributes;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
@@ -99,7 +99,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest {
   static TransactionManager txManager;
   private TransactionContext transactionContext;
   private TransactionAwareHTable transactionAwareHTable;
-  private HTable hTable;
+  private Table hTable;
   
   @ClassRule
   public static TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -254,7 +254,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
    */
   @Test
   public void testValidTransactionalDelete() throws Exception {
-    try (HTable hTable = createTable(Bytes.toBytes("TestValidTransactionalDelete"),
+    try (Table hTable = createTable(Bytes.toBytes("TestValidTransactionalDelete"),
                                      new byte[][]{TestBytes.family, TestBytes.family2}))
{
       TransactionAwareHTable txTable = new TransactionAwareHTable(hTable);
       TransactionContext txContext = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable);
@@ -394,7 +394,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
    */
   @Test
   public void testAttributesPreserved() throws Exception {
-    HTable hTable = createTable(Bytes.toBytes("TestAttributesPreserved"),
+    Table hTable = createTable(Bytes.toBytes("TestAttributesPreserved"),
         new byte[][]{TestBytes.family, TestBytes.family2}, false,
         Lists.newArrayList(TransactionProcessor.class.getName(), TestRegionObserver.class.getName()));
     try {
@@ -436,7 +436,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
   
   @Test
   public void testFamilyDeleteWithCompaction() throws Exception {
-    HTable hTable = createTable(Bytes.toBytes("TestFamilyDeleteWithCompaction"),
+    Table hTable = createTable(Bytes.toBytes("TestFamilyDeleteWithCompaction"),
                                 new byte[][]{TestBytes.family, TestBytes.family2});
     try {
       TransactionAwareHTable txTable = new TransactionAwareHTable(hTable, ConflictDetection.ROW);
@@ -536,7 +536,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
 
   private void testDeleteRollback(TxConstants.ConflictDetection conflictDetection) throws
Exception {
     String tableName = String.format("%s%s", "TestColFamilyDelete", conflictDetection);
-    HTable hTable = createTable(Bytes.toBytes(tableName), new byte[][]{TestBytes.family});
+    Table hTable = createTable(Bytes.toBytes(tableName), new byte[][]{TestBytes.family});
     try (TransactionAwareHTable txTable = new TransactionAwareHTable(hTable, conflictDetection))
{
       TransactionContext txContext = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable);
       txContext.start();
@@ -572,7 +572,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
 
   @Test
   public void testMultiColumnFamilyRowDeleteRollback() throws Exception {
-    HTable hTable = createTable(Bytes.toBytes("TestMultColFam"), new byte[][] {TestBytes.family,
TestBytes.family2});
+    Table hTable = createTable(Bytes.toBytes("TestMultColFam"), new byte[][] {TestBytes.family,
TestBytes.family2});
     try (TransactionAwareHTable txTable = new TransactionAwareHTable(hTable, TxConstants.ConflictDetection.ROW))
{
       TransactionContext txContext = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable);
       txContext.start();
@@ -604,7 +604,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
 
   @Test
   public void testRowDelete() throws Exception {
-    HTable hTable = createTable(Bytes.toBytes("TestRowDelete"), new byte[][]{TestBytes.family,
TestBytes.family2});
+    Table hTable = createTable(Bytes.toBytes("TestRowDelete"), new byte[][]{TestBytes.family,
TestBytes.family2});
     try (TransactionAwareHTable txTable = new TransactionAwareHTable(hTable, TxConstants.ConflictDetection.ROW))
{
       TransactionContext txContext = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable);
 
@@ -687,7 +687,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
                     .add(TestBytes.family2, TestBytes.qualifier, TestBytes.value)
                     .add(TestBytes.family2, TestBytes.qualifier2, TestBytes.value2));
       txContext.finish();
-
+      
       txContext.start();
       txTable.delete(new Delete(TestBytes.row2).deleteFamily(TestBytes.family));
       txContext.finish();
@@ -781,12 +781,12 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
   @Test
   public void testReadYourWrites() throws Exception {
     // In-progress tx1: started before our main transaction
-    HTable hTable1 = new HTable(testUtil.getConfiguration(), TestBytes.table);
+    Table hTable1 = testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table));
     TransactionAwareHTable txHTable1 = new TransactionAwareHTable(hTable1);
     TransactionContext inprogressTxContext1 = new TransactionContext(new InMemoryTxSystemClient(txManager),
txHTable1);
 
     // In-progress tx2: started while our main transaction is running
-    HTable hTable2 = new HTable(testUtil.getConfiguration(), TestBytes.table);
+    Table hTable2 = testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table));
     TransactionAwareHTable txHTable2 = new TransactionAwareHTable(hTable2);
     TransactionContext inprogressTxContext2 = new TransactionContext(new InMemoryTxSystemClient(txManager),
txHTable2);
 
@@ -838,11 +838,13 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
 
   @Test
   public void testRowLevelConflictDetection() throws Exception {
-    TransactionAwareHTable txTable1 = new TransactionAwareHTable(new HTable(conf, TestBytes.table),
+    TransactionAwareHTable txTable1 = new TransactionAwareHTable(
+            testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table)),
         TxConstants.ConflictDetection.ROW);
     TransactionContext txContext1 = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable1);
 
-    TransactionAwareHTable txTable2 = new TransactionAwareHTable(new HTable(conf, TestBytes.table),
+    TransactionAwareHTable txTable2 = new TransactionAwareHTable(
+            testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table)),
         TxConstants.ConflictDetection.ROW);
     TransactionContext txContext2 = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable2);
 
@@ -949,11 +951,13 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
   @Test
   public void testNoneLevelConflictDetection() throws Exception {
     InMemoryTxSystemClient txClient = new InMemoryTxSystemClient(txManager);
-    TransactionAwareHTable txTable1 = new TransactionAwareHTable(new HTable(conf, TestBytes.table),
+    TransactionAwareHTable txTable1 = new TransactionAwareHTable(
+            testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table)),
         TxConstants.ConflictDetection.NONE);
     TransactionContext txContext1 = new TransactionContext(txClient, txTable1);
 
-    TransactionAwareHTable txTable2 = new TransactionAwareHTable(new HTable(conf, TestBytes.table),
+    TransactionAwareHTable txTable2 = new TransactionAwareHTable(
+            testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table)),
         TxConstants.ConflictDetection.NONE);
     TransactionContext txContext2 = new TransactionContext(txClient, txTable2);
 
@@ -1088,7 +1092,8 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     transactionAwareHTable.put(new Put(TestBytes.row2).add(TestBytes.family, TestBytes.qualifier,
TestBytes.value2));
 
     // check that writes are still not visible to other clients
-    TransactionAwareHTable txTable2 = new TransactionAwareHTable(new HTable(conf, TestBytes.table));
+    TransactionAwareHTable txTable2 = new TransactionAwareHTable(
+            testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table)));
     TransactionContext txContext2 = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable2);
 
     txContext2.start();
@@ -1147,7 +1152,8 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     txClient.invalidate(transactionContext.getCurrentTransaction().getTransactionId());
 
     // check that writes are not visible
-    TransactionAwareHTable txTable2 = new TransactionAwareHTable(new HTable(conf, TestBytes.table));
+    TransactionAwareHTable txTable2 = new TransactionAwareHTable(
+            testUtil.getConnection().getTable(TableName.valueOf(TestBytes.table)));
     TransactionContext txContext2 = new TransactionContext(txClient, txTable2);
     txContext2.start();
     Transaction newTx = txContext2.getCurrentTransaction();
@@ -1183,7 +1189,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     TransactionContext txContext = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable);
 
     // Add some pre-existing, non-transactional data
-    HTable nonTxTable = new HTable(testUtil.getConfiguration(), txTable.getTableName());
+    Table nonTxTable = testUtil.getConnection().getTable(txTable.getName());
     nonTxTable.put(new Put(TestBytes.row).add(TestBytes.family, TestBytes.qualifier, val11));
     nonTxTable.put(new Put(TestBytes.row).add(TestBytes.family, TestBytes.qualifier2, val12));
     nonTxTable.put(new Put(TestBytes.row2).add(TestBytes.family, TestBytes.qualifier, val21));
@@ -1191,7 +1197,6 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     nonTxTable.put(new Put(TestBytes.row4).add(TestBytes.family, TxConstants.FAMILY_DELETE_QUALIFIER,
                                                HConstants.EMPTY_BYTE_ARRAY));
     nonTxTable.put(new Put(TestBytes.row4).add(TestBytes.family, TestBytes.qualifier, HConstants.EMPTY_BYTE_ARRAY));
-    nonTxTable.flushCommits();
 
     // Add transactional data
     txContext.start();
@@ -1282,15 +1287,15 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     txContext.finish();
   }
 
-  private void verifyRow(HTableInterface table, byte[] rowkey, byte[] expectedValue) throws
Exception {
+  private void verifyRow(Table table, byte[] rowkey, byte[] expectedValue) throws Exception
{
     verifyRow(table, new Get(rowkey), expectedValue);
   }
 
-  private void verifyRow(HTableInterface table, Get get, byte[] expectedValue) throws Exception
{
+  private void verifyRow(Table table, Get get, byte[] expectedValue) throws Exception {
     verifyRows(table, get, expectedValue == null ? null : ImmutableList.of(expectedValue));
   }
 
-  private void verifyRows(HTableInterface table, Get get, List<byte[]> expectedValues)
throws Exception {
+  private void verifyRows(Table table, Get get, List<byte[]> expectedValues) throws
Exception {
     Result result = table.get(get);
     if (expectedValues == null) {
       assertTrue(result.isEmpty());
@@ -1310,12 +1315,12 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     }
   }
 
-  private Cell[] getRow(HTableInterface table, Get get) throws Exception {
+  private Cell[] getRow(Table table, Get get) throws Exception {
     Result result = table.get(get);
     return result.rawCells();
   }
 
-  private void verifyScan(HTableInterface table, Scan scan, List<KeyValue> expectedCells)
throws Exception {
+  private void verifyScan(Table table, Scan scan, List<KeyValue> expectedCells) throws
Exception {
     List<Cell> actualCells = new ArrayList<>();
     try (ResultScanner scanner = table.getScanner(scan)) {
       Result[] results = scanner.next(expectedCells.size() + 1);
@@ -1328,7 +1333,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
 
   @Test
   public void testVisibilityAll() throws Exception {
-    HTable nonTxTable =
+    Table nonTxTable =
       createTable(Bytes.toBytes("testVisibilityAll"), new byte[][]{TestBytes.family, TestBytes.family2},
                   true, Collections.singletonList(TransactionProcessor.class.getName()));
     TransactionAwareHTable txTable =
@@ -1500,7 +1505,6 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
     // to prevent Tephra from replacing delete with delete marker
     deleteFamily.setAttribute(TxConstants.TX_ROLLBACK_ATTRIBUTE_KEY, new byte[0]);
     nonTxTable.delete(deleteFamily);
-    nonTxTable.flushCommits();
 
     txContext.start();
     txContext.getCurrentTransaction().setVisibility(Transaction.VisibilityLevel.SNAPSHOT_ALL);
@@ -1712,7 +1716,7 @@ public class TransactionAwareHTableTest extends AbstractHBaseTableTest
{
    * Represents older transaction clients
    */
   private static class OldTransactionAwareHTable extends TransactionAwareHTable {
-    public OldTransactionAwareHTable(HTableInterface hTable) {
+    public OldTransactionAwareHTable(Table hTable) {
       super(hTable);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/52fd15f0/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/DataJanitorStateTest.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/DataJanitorStateTest.java
b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/DataJanitorStateTest.java
index 2e9dc17..031b0f3 100644
--- a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/DataJanitorStateTest.java
+++ b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/DataJanitorStateTest.java
@@ -23,7 +23,6 @@ package org.apache.tephra.hbase.txprune;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.ImmutableSortedSet;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.tephra.TxConstants;
@@ -53,7 +52,7 @@ public class DataJanitorStateTest extends AbstractHBaseTableTest {
   public void beforeTest() throws Exception {
     pruneStateTable = TableName.valueOf(conf.get(TxConstants.TransactionPruning.PRUNE_STATE_TABLE,
                                                  TxConstants.TransactionPruning.DEFAULT_PRUNE_STATE_TABLE));
-    HTable table = createTable(pruneStateTable.getName(), new byte[][]{DataJanitorState.FAMILY},
false,
+    Table table = createTable(pruneStateTable.getName(), new byte[][]{DataJanitorState.FAMILY},
false,
                                // Prune state table is a non-transactional table, hence no
transaction co-processor
                                Collections.<String>emptyList());
     table.close();

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/52fd15f0/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruneTest.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruneTest.java
b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruneTest.java
index 55348b0..e92b4cf 100644
--- a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruneTest.java
+++ b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruneTest.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -90,7 +89,7 @@ public class InvalidListPruneTest extends AbstractHBaseTableTest {
 
     // Do some transactional data operations
     txDataTable1 = TableName.valueOf("invalidListPruneTestTable1");
-    HTable hTable = createTable(txDataTable1.getName(), new byte[][]{family}, false,
+    Table hTable = createTable(txDataTable1.getName(), new byte[][]{family}, false,
                                 Collections.singletonList(TestTransactionProcessor.class.getName()));
     try (TransactionAwareHTable txTable = new TransactionAwareHTable(hTable, TxConstants.ConflictDetection.ROW))
{
       TransactionContext txContext = new TransactionContext(new InMemoryTxSystemClient(txManager),
txTable);
@@ -129,7 +128,7 @@ public class InvalidListPruneTest extends AbstractHBaseTableTest {
   }
 
   private void createPruneStateTable() throws Exception {
-    HTable table = createTable(pruneStateTable.getName(), new byte[][]{DataJanitorState.FAMILY},
false,
+    Table table = createTable(pruneStateTable.getName(), new byte[][]{DataJanitorState.FAMILY},
false,
                                // Prune state table is a non-transactional table, hence no
transaction co-processor
                                Collections.<String>emptyList());
     table.close();
@@ -311,7 +310,7 @@ public class InvalidListPruneTest extends AbstractHBaseTableTest {
 
     // Create an empty table
     TableName txEmptyTable = TableName.valueOf("emptyPruneTestTable");
-    HTable emptyHTable = createTable(txEmptyTable.getName(), new byte[][]{family}, false,
+    Table emptyHTable = createTable(txEmptyTable.getName(), new byte[][]{family}, false,
                                      Collections.singletonList(TestTransactionProcessor.class.getName()));
 
     TransactionPruningPlugin transactionPruningPlugin = new TestTransactionPruningPlugin();

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/52fd15f0/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruningDebugTest.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruningDebugTest.java
b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruningDebugTest.java
index 1476906..aa669e5 100644
--- a/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruningDebugTest.java
+++ b/tephra-hbase-compat-1.4/src/test/java/org/apache/tephra/hbase/txprune/InvalidListPruningDebugTest.java
@@ -30,7 +30,6 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.tephra.TxConstants;
@@ -104,7 +103,7 @@ public class InvalidListPruningDebugTest extends AbstractHBaseTableTest
{
   public static void addData() throws Exception {
     pruneStateTable = TableName.valueOf(conf.get(TxConstants.TransactionPruning.PRUNE_STATE_TABLE,
                                                  TxConstants.TransactionPruning.DEFAULT_PRUNE_STATE_TABLE));
-    HTable table = createTable(pruneStateTable.getName(), new byte[][]{DataJanitorState.FAMILY},
false,
+    Table table = createTable(pruneStateTable.getName(), new byte[][]{DataJanitorState.FAMILY},
false,
                                // Prune state table is a non-transactional table, hence no
transaction co-processor
                                Collections.<String>emptyList());
     table.close();


Mime
View raw message