From f4c061686b4f1a77629ba30a59ab06a97a1a6b82 Mon Sep 17 00:00:00 2001 From: Zach York Date: Wed, 25 Jan 2017 20:42:08 -0800 Subject: [PATCH] PHOENIX-3603 Fix compilation errors against hbase 1.3.0 release --- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- ...playWithIndexWritesAndCompressedWALIT.java | 2 +- .../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 10 +++++++++ .../phoenix/execute/DelegateHTable.java | 22 ++++++++++++++++++- .../ipc/PhoenixIndexRpcSchedulerTest.java | 2 +- .../TestPerRegionIndexWriteCache.java | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml | 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml | 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 48 insertions(+), 18 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 32485e3aa1d..39df09a9bdf 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-assembly Phoenix Assembly diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 81dc0fdab24..211ba2a7679 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-client Phoenix Client diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index bd29110321c..7646fdd3e56 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-core Phoenix Core diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java index 0b48a1a8a18..a55fe7efbab 100644 --- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java +++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java @@ -264,7 +264,7 @@ private HTableDescriptor createBasic3FamilyHTD(final String tableName) { * @throws IOException */ private WAL createWAL(final Configuration c, WALFactory walFactory) throws IOException { - WAL wal = walFactory.getWAL(new byte[]{}); + WAL wal = walFactory.getWAL(new byte[]{}, null); // Set down maximum recovery so we dfsclient doesn't linger retrying something // long gone. diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java index 4fdddf5ba1a..7712cc6a475 100644 --- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java +++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java @@ -115,6 +115,16 @@ public int getActiveRpcHandlerCount() { return this.delegate.getActiveRpcHandlerCount() + this.indexCallExecutor.getActiveHandlerCount() + this.metadataCallExecutor.getActiveHandlerCount(); } + @Override + public long getNumGeneralCallsDropped() { + return delegate.getNumGeneralCallsDropped(); + } + + @Override + public long getNumLifoModeSwitches() { + return delegate.getNumLifoModeSwitches(); + } + @VisibleForTesting public void setIndexExecutorForTesting(RpcExecutor executor) { this.indexCallExecutor = executor; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java index 6b3f9ca4c3c..f45b356d3fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java @@ -279,7 +279,27 @@ public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, Compa return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); } - @Override + @Override + public void setOperationTimeout(int i) { + delegate.setOperationTimeout(i); + } + + @Override + public int getOperationTimeout() { + return delegate.getOperationTimeout(); + } + + @Override + public void setRpcTimeout(int i) { + delegate.setRpcTimeout(i); + } + + @Override + public int getRpcTimeout() { + return delegate.getRpcTimeout(); + } + + @Override public boolean[] existsAll(List gets) throws IOException { return delegate.existsAll(gets); } diff --git a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java index 289b4903fb5..3a2780dcb34 100644 --- a/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java +++ b/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java @@ -93,7 +93,7 @@ private void dispatchCallWithPriority(RpcScheduler scheduler, int priority) thro RequestHeader header = RequestHeader.newBuilder().setPriority(priority).build(); RpcServer server = new RpcServer(null, "test-rpcserver", null, isa, conf, scheduler); RpcServer.Call call = - server.new Call(0, null, null, header, null, null, connection, null, 10, null, null); + server.new Call(0, null, null, header, null, null, connection, null, 10, null, null, 0); Mockito.when(task.getCall()).thenReturn(call); scheduler.dispatch(task); diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java index 35b607eef1d..819c7f6fa37 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java @@ -81,7 +81,7 @@ public void setUp() throws Exception { Random rn = new Random(); tableName = TableName.valueOf("TestPerRegion" + rn.nextInt()); WALFactory walFactory = new WALFactory(TEST_UTIL.getConfiguration(), null, "TestPerRegionIndexWriteCache"); - wal = walFactory.getWAL(Bytes.toBytes("logs")); + wal = walFactory.getWAL(Bytes.toBytes("logs"), null); HTableDescriptor htd = new HTableDescriptor(tableName); HColumnDescriptor a = new HColumnDescriptor(Bytes.toBytes("a")); htd.addFamily(a); diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 5c4f19755b6..e9ea92481bb 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-flume Phoenix - Flume diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index e6d3f869886..2d0ef2b32d0 100644 --- a/phoenix-hive/pom.xml +++ b/phoenix-hive/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-hive Phoenix - Hive diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 6c054e175a8..ba75fee628d 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -15,7 +15,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-pherf diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 18b4711e933..5081ca72721 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-pig Phoenix - Pig diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index aab3aeac797..6ec99866a49 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-queryserver-client Phoenix Query Server Client diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index d6790072596..501f85a9c98 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-queryserver Phoenix Query Server diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 075a0050e2c..587f001b3cd 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-server Phoenix Server diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index 914a43e6391..2a725070498 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark/pom.xml @@ -28,7 +28,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-spark Phoenix - Spark diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 27648922aec..d6cda67df6d 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT phoenix-tracing-webapp diff --git a/pom.xml b/pom.xml index d47a6b83239..eeadf2ae7e5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.apache.phoenix phoenix - 4.10.0-HBase-1.2-SNAPSHOT + 4.10.0-HBase-1.3-SNAPSHOT pom Apache Phoenix A SQL layer over HBase @@ -64,7 +64,7 @@ ${project.basedir} - 1.2.0 + 1.3.0 2.7.1