PHOENIX-3603 Fix compilation errors against hbase 1.3
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5b099014 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5b099014 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5b099014 Branch: refs/heads/omid Commit: 5b099014446865c12779f3882fd8b407496717ea Parents: 92b951e Author: Zach York <[email protected]> Authored: Wed Jan 25 20:42:08 2017 -0800 Committer: Andrew Purtell <[email protected]> Committed: Tue Apr 25 15:14:43 2017 -0700 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- ...ReplayWithIndexWritesAndCompressedWALIT.java | 2 +- .../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 10 +++++++++ .../apache/phoenix/execute/DelegateHTable.java | 22 +++++++++++++++++++- .../hbase/ipc/PhoenixIndexRpcSchedulerTest.java | 2 +- .../recovery/TestPerRegionIndexWriteCache.java | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/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 ++-- 19 files changed, 49 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index a6f6f64..829ce7b 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-assembly</artifactId> <name>Phoenix Assembly</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index fb0520c..f436345 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-client</artifactId> <name>Phoenix Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 9d6e0f4..58162b6 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-core</artifactId> <name>Phoenix Core</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java ---------------------------------------------------------------------- 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 0b48a1a..a55fe7e 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 @@ public class WALReplayWithIndexWritesAndCompressedWALIT { * @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. http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java ---------------------------------------------------------------------- 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 4fdddf5..7712cc6 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 class PhoenixRpcScheduler extends RpcScheduler { 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; http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java ---------------------------------------------------------------------- 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 6b3f9ca..f45b356 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 class DelegateHTable implements HTableInterface { 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<Get> gets) throws IOException { return delegate.existsAll(gets); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java ---------------------------------------------------------------------- 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 289b490..3a2780d 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 @@ public class PhoenixIndexRpcSchedulerTest { 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); http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java ---------------------------------------------------------------------- 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 35b607e..819c7f6 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 class TestPerRegionIndexWriteCache { 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); http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 809f7fd..b579b23 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-flume</artifactId> <name>Phoenix - Flume</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-hive/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 72b3c39..03ce99c 100644 --- a/phoenix-hive/pom.xml +++ b/phoenix-hive/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-hive</artifactId> <name>Phoenix - Hive</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 5559e5e..36ea91d 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-kafka</artifactId> <name>Phoenix - Kafka</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index ecf8251..9fa9942 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-pherf</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index e191397..def9d1e 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-pig</artifactId> <name>Phoenix - Pig</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 432f854..60fc140 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver-client</artifactId> <name>Phoenix Query Server Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index dc2a1ab..2ce45fc 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver</artifactId> <name>Phoenix Query Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 6204e99..2d9103d 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-server</artifactId> <name>Phoenix Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index 612300f..2eac5ad 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-spark</artifactId> <name>Phoenix - Spark</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/phoenix-tracing-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 35f70ad..08a4ffd 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-tracing-webapp</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b099014/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 248a244..1674358 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.11.0-HBase-1.2-SNAPSHOT</version> + <version>4.11.0-HBase-1.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Phoenix</name> <description>A SQL layer over HBase</description> @@ -65,7 +65,7 @@ <top.dir>${project.basedir}</top.dir> <!-- Hadoop Versions --> - <hbase.version>1.2.3</hbase.version> + <hbase.version>1.3.1</hbase.version> <hadoop-two.version>2.7.1</hadoop-two.version> <!-- Dependency versions -->
