Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 c85e06581 -> 693fa6598
http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java index f6e00cc..b302210 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java @@ -47,8 +47,8 @@ import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.VersionInfo; +import org.apache.phoenix.hbase.index.IndexTableName; import org.apache.phoenix.hbase.index.StubAbortable; -import org.apache.phoenix.hbase.index.TableName; import org.apache.phoenix.hbase.index.exception.IndexWriteException; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.junit.Rule; @@ -60,7 +60,7 @@ import org.mockito.stubbing.Answer; public class TestIndexWriter { private static final Log LOG = LogFactory.getLog(TestIndexWriter.class); @Rule - public TableName testName = new TableName(); + public IndexTableName testName = new IndexTableName(); private final byte[] row = Bytes.toBytes("row"); @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java index 8573fb1..1fe0342 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java @@ -37,8 +37,8 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.VersionInfo; +import org.apache.phoenix.hbase.index.IndexTableName; import org.apache.phoenix.hbase.index.StubAbortable; -import org.apache.phoenix.hbase.index.TableName; import org.apache.phoenix.hbase.index.table.HTableInterfaceReference; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.junit.Rule; @@ -54,7 +54,7 @@ public class TestParalleIndexWriter { private static final Log LOG = LogFactory.getLog(TestParalleIndexWriter.class); @Rule - public TableName test = new TableName(); + public IndexTableName test = new IndexTableName(); private final byte[] row = Bytes.toBytes("row"); @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java index 2377ff1..79bc295 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java @@ -37,8 +37,8 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.VersionInfo; +import org.apache.phoenix.hbase.index.IndexTableName; import org.apache.phoenix.hbase.index.StubAbortable; -import org.apache.phoenix.hbase.index.TableName; import org.apache.phoenix.hbase.index.table.HTableInterfaceReference; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.junit.Rule; @@ -54,7 +54,7 @@ public class TestParalleWriterIndexCommitter { private static final Log LOG = LogFactory.getLog(TestParalleWriterIndexCommitter.class); @Rule - public TableName test = new TableName(); + public IndexTableName test = new IndexTableName(); private final byte[] row = Bytes.toBytes("row"); @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java index 62cb24e..4f1eea6 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java @@ -39,9 +39,9 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -58,9 +58,9 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; +import org.apache.phoenix.hbase.index.IndexTableName; import org.apache.phoenix.hbase.index.IndexTestingUtils; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.TableName; import org.apache.phoenix.hbase.index.covered.ColumnGroup; import org.apache.phoenix.hbase.index.covered.CoveredColumn; import org.apache.phoenix.hbase.index.covered.CoveredColumnIndexSpecifierBuilder; @@ -90,7 +90,7 @@ public class TestWALRecoveryCaching { private static final long TIMEOUT = ONE_MIN; @Rule - public TableName testTable = new TableName(); + public IndexTableName testTable = new IndexTableName(); private String getIndexTableName() { return this.testTable.getTableNameString() + "_index"; @@ -161,7 +161,7 @@ public class TestWALRecoveryCaching { // start the cluster with 2 rs util.startMiniCluster(2); - HBaseAdmin admin = util.getHBaseAdmin(); + Admin admin = util.getHBaseAdmin(); // setup the index byte[] family = Bytes.toBytes("family"); byte[] qual = Bytes.toBytes("qualifier"); http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 326efa3..1133826 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -115,7 +115,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestingUtility; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory; import org.apache.hadoop.hbase.regionserver.RSRpcServices; import org.apache.hadoop.hbase.util.Bytes; @@ -1524,7 +1524,7 @@ public abstract class BaseTest { */ private static void disableAndDropNonSystemTables() throws Exception { if (driver == null) return; - HBaseAdmin admin = driver.getConnectionQueryServices(null, null).getAdmin(); + Admin admin = driver.getConnectionQueryServices(null, null).getAdmin(); try { HTableDescriptor[] tables = admin.listTables(); for (HTableDescriptor table : tables) { @@ -1538,7 +1538,7 @@ public abstract class BaseTest { } } - private static void disableAndDropTable(final HBaseAdmin admin, final TableName tableName) + private static void disableAndDropTable(final Admin admin, final TableName tableName) throws Exception { Future<Void> future = null; boolean success = false; http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java index 4708ffb..0570826 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Mutation; import org.apache.phoenix.exception.PhoenixIOException; import org.apache.phoenix.util.ReadOnlyProps; @@ -52,7 +52,7 @@ public class ConnectionQueryServicesImplTest { doNothing().when(cqs).createSysMutexTable(any(HBaseAdmin.class), any(ReadOnlyProps.class)); // Spoof out this call so that ensureSystemTablesUpgrade() will return-fast. - when(cqs.getSystemTableNames(any(HBaseAdmin.class))).thenReturn(Collections.<TableName> emptyList()); + when(cqs.getSystemTableNames(any(Admin.class))).thenReturn(Collections.<TableName> emptyList()); // Throw a special exception to check on later doThrow(PHOENIX_IO_EXCEPTION).when(cqs).ensureNamespaceCreated(anyString()); @@ -64,7 +64,7 @@ public class ConnectionQueryServicesImplTest { // Should be called after upgradeSystemTables() // Proves that execution proceeded - verify(cqs).getSystemTableNames(any(HBaseAdmin.class)); + verify(cqs).getSystemTableNames(any(Admin.class)); try { // Verifies that the exception is propagated back to the caller http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java index b6f1bef..fcc0261 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java @@ -56,8 +56,9 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -796,9 +797,9 @@ public class TestUtil { mutationState.commit(); } - HBaseAdmin hbaseAdmin = services.getAdmin(); - hbaseAdmin.flush(tableName); - hbaseAdmin.majorCompact(tableName); + Admin hbaseAdmin = services.getAdmin(); + hbaseAdmin.flush(TableName.valueOf(tableName)); + hbaseAdmin.majorCompact(TableName.valueOf(tableName)); hbaseAdmin.close(); boolean compactionDone = false; @@ -821,8 +822,8 @@ public class TestUtil { // need to run compaction after the next txn snapshot has been written so that compaction can remove deleted rows if (!compactionDone && table.isTransactional()) { hbaseAdmin = services.getAdmin(); - hbaseAdmin.flush(tableName); - hbaseAdmin.majorCompact(tableName); + hbaseAdmin.flush(TableName.valueOf(tableName)); + hbaseAdmin.majorCompact(TableName.valueOf(tableName)); hbaseAdmin.close(); } } @@ -972,9 +973,9 @@ public class TestUtil { } final int retries = 10; int numTries = 10; - try (HBaseAdmin admin = services.getAdmin()) { - admin.modifyTable(Bytes.toBytes(tableName), descriptor); - while (!admin.getTableDescriptor(Bytes.toBytes(tableName)).equals(descriptor) + try (Admin admin = services.getAdmin()) { + admin.modifyTable(TableName.valueOf(tableName), descriptor); + while (!admin.getTableDescriptor(TableName.valueOf(tableName)).equals(descriptor) && numTries > 0) { numTries--; if (numTries == 0) { @@ -997,9 +998,9 @@ public class TestUtil { } final int retries = 10; int numTries = retries; - try (HBaseAdmin admin = services.getAdmin()) { - admin.modifyTable(Bytes.toBytes(tableName), descriptor); - while (!admin.getTableDescriptor(Bytes.toBytes(tableName)).equals(descriptor) + try (Admin admin = services.getAdmin()) { + admin.modifyTable(TableName.valueOf(tableName), descriptor); + while (!admin.getTableDescriptor(TableName.valueOf(tableName)).equals(descriptor) && numTries > 0) { numTries--; if (numTries == 0) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java ---------------------------------------------------------------------- diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java index 867d1ad..01e106f 100644 --- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java +++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java @@ -38,7 +38,8 @@ import org.apache.flume.conf.Configurables; import org.apache.flume.event.EventBuilder; import org.apache.flume.lifecycle.LifecycleState; import org.apache.flume.sink.DefaultSinkFactory; -import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; import org.apache.phoenix.flume.serializer.CustomSerializer; @@ -186,9 +187,9 @@ public class PhoenixSinkIT extends BaseHBaseManagedTimeIT { sink.setChannel(channel); sink.start(); - HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin(); + Admin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin(); try { - boolean exists = admin.tableExists(fullTableName); + boolean exists = admin.tableExists(TableName.valueOf(fullTableName)); Assert.assertTrue(exists); }finally { admin.close(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/693fa659/phoenix-hive/src/main/java/org/apache/phoenix/hive/util/PhoenixUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-hive/src/main/java/org/apache/phoenix/hive/util/PhoenixUtil.java b/phoenix-hive/src/main/java/org/apache/phoenix/hive/util/PhoenixUtil.java index 9dcb3ef..d763fae 100644 --- a/phoenix-hive/src/main/java/org/apache/phoenix/hive/util/PhoenixUtil.java +++ b/phoenix-hive/src/main/java/org/apache/phoenix/hive/util/PhoenixUtil.java @@ -24,8 +24,8 @@ import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult; import org.apache.phoenix.hive.constants.PhoenixStorageHandlerConstants; import org.apache.phoenix.jdbc.PhoenixConnection; @@ -170,7 +170,7 @@ public class PhoenixUtil { } public static void flush(Connection conn, String tableName) throws SQLException { - try (HBaseAdmin admin = ((PhoenixConnection) conn).getQueryServices().getAdmin()) { + try (Admin admin = ((PhoenixConnection) conn).getQueryServices().getAdmin()) { admin.flush(TableName.valueOf(tableName)); } catch (IOException e) { throw new SQLException(e);
