Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 25d3c1369 -> b3edf3903
PHOENIX-4452 change usage of WALKey to WALKeyImpl due HBASE-19134 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b3edf390 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b3edf390 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b3edf390 Branch: refs/heads/5.x-HBase-2.0 Commit: b3edf390353c19b8b4c5de2cca35a97457743768 Parents: 25d3c13 Author: Sergey Soldatov <s...@apache.org> Authored: Tue Dec 12 10:12:49 2017 -0800 Committer: Sergey Soldatov <s...@apache.org> Committed: Tue Dec 12 13:45:30 2017 -0800 ---------------------------------------------------------------------- .../replication/SystemCatalogWALEntryFilterIT.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3edf390/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java b/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java index bb10ae0..ae8b797 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilterIT.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.wal.WAL; import org.apache.hadoop.hbase.wal.WALEdit; -import org.apache.hadoop.hbase.wal.WALKey; +import org.apache.hadoop.hbase.wal.WALKeyImpl; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.mapreduce.util.ConnectionUtil; @@ -73,7 +73,7 @@ public class SystemCatalogWALEntryFilterIT extends ParallelStatsDisabledIT { private static final String DROP_TENANT_VIEW_SQL = "DROP VIEW IF EXISTS " + TENANT_VIEW_NAME; private static final String DROP_NONTENANT_VIEW_SQL = "DROP VIEW IF EXISTS " + NONTENANT_VIEW_NAME; private static PTable catalogTable; - private static WALKey walKey = null; + private static WALKeyImpl walKey = null; private static TableName systemCatalogTableName = TableName.valueOf(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME); @@ -89,7 +89,7 @@ public class SystemCatalogWALEntryFilterIT extends ParallelStatsDisabledIT { ensureTableCreated(getUrl(), TestUtil.ENTITY_HISTORY_TABLE_NAME); connection.createStatement().execute(CREATE_TENANT_VIEW_SQL); catalogTable = PhoenixRuntime.getTable(connection, PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME); - walKey = new WALKey(REGION, TableName.valueOf(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME), 0, 0, uuid); + walKey = new WALKeyImpl(REGION, TableName.valueOf(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME), 0, 0, uuid); }; Assert.assertNotNull(catalogTable); try (java.sql.Connection connection = @@ -115,7 +115,7 @@ public class SystemCatalogWALEntryFilterIT extends ParallelStatsDisabledIT { @Test public void testOtherTablesAutoPass() throws Exception { //Cell is nonsense but we should auto pass because the table name's not System.Catalog - WAL.Entry entry = new WAL.Entry(new WALKey(REGION, + WAL.Entry entry = new WAL.Entry(new WALKeyImpl(REGION, TableName.valueOf(TestUtil.ENTITY_HISTORY_TABLE_NAME), System.currentTimeMillis()), new WALEdit()); entry.getEdit().add(CellUtil.createCell(Bytes.toBytes("foo"))); SystemCatalogWALEntryFilter filter = new SystemCatalogWALEntryFilter(); @@ -232,7 +232,7 @@ public class SystemCatalogWALEntryFilterIT extends ParallelStatsDisabledIT { } Assert.assertTrue("Didn't retrieve any cells from SYSTEM.CATALOG", edit.getCells().size() > 0); - WALKey key = new WALKey(REGION, tableName, 0, 0, uuid); + WALKeyImpl key = new WALKeyImpl(REGION, tableName, 0, 0, uuid); entry = new WAL.Entry(key, edit); } return entry;
