Changes for CDH 5.13.x
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/44095393 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/44095393 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/44095393 Branch: refs/heads/4.x-cdh5.13 Commit: 44095393019968f1a0ee05c73df980b9bb6bf8bf Parents: f3defc4 Author: Pedro Boado <pbo...@apache.org> Authored: Sat Mar 10 17:54:04 2018 +0000 Committer: Pedro Boado <pbo...@apache.org> Committed: Fri Apr 6 22:17:09 2018 +0100 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- .../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 34 ++++++++++++++++++-- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-load-balancer/pom.xml | 2 +- phoenix-parcel/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 +-- 17 files changed, 49 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 55a9a6e..f0cd238 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-assembly</artifactId> <name>Phoenix Assembly</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 2454de6..b4da311 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-client</artifactId> <name>Phoenix Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index b07cbbb..08e1459 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-core</artifactId> <name>Phoenix Core</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/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..d1f05f8 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 @@ -124,6 +124,36 @@ public class PhoenixRpcScheduler extends RpcScheduler { public void setMetadataExecutorForTesting(RpcExecutor executor) { this.metadataCallExecutor = executor; } - - + + @Override + public int getReadQueueLength() { + return delegate.getReadQueueLength(); + } + + @Override + public int getWriteQueueLength() { + return delegate.getWriteQueueLength(); + } + + @Override + public int getScanQueueLength() { + return delegate.getScanQueueLength(); + } + + @Override + public int getActiveReadRpcHandlerCount() { + return delegate.getActiveReadRpcHandlerCount(); + } + + @Override + public int getActiveWriteRpcHandlerCount() { + return delegate.getActiveWriteRpcHandlerCount(); + } + + @Override + public int getActiveScanRpcHandlerCount() { + return delegate.getActiveScanRpcHandlerCount(); + } + + } http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 0883e5e..925b26f 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-flume</artifactId> <name>Phoenix - Flume</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-hive/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 809fbea..5cff64d 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-hive</artifactId> <name>Phoenix - Hive</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 8718f5f..c527da1 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-kafka</artifactId> <name>Phoenix - Kafka</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index 81e124a..d3fb735 100644 --- a/phoenix-load-balancer/pom.xml +++ b/phoenix-load-balancer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-load-balancer</artifactId> <name>Phoenix Load Balancer</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-parcel/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml index 5e6fccc..b4201b2 100644 --- a/phoenix-parcel/pom.xml +++ b/phoenix-parcel/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix</artifactId> - <version>4.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-parcel</artifactId> <name>Phoenix Parcels for CDH</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 7831f35..05656d9 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-pherf</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index e5d0d52..70fe1e6 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-pig</artifactId> <name>Phoenix - Pig</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 83cfde6..b10faa1 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver-client</artifactId> <name>Phoenix Query Server Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index 7180b18..bd9108c 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver</artifactId> <name>Phoenix Query Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 01a7bc3..4fb05e8 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-server</artifactId> <name>Phoenix Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index a45d4b5..3e738cd 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-spark</artifactId> <name>Phoenix - Spark</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/phoenix-tracing-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 93edc43..852add3 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> </parent> <artifactId>phoenix-tracing-webapp</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/44095393/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 73964c0..f3a8ee4 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.14.0-cdh5.11.2-SNAPSHOT</version> + <version>4.14.0-cdh5.13.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Phoenix</name> <description>A SQL layer over HBase</description> @@ -86,7 +86,7 @@ <parent> <groupId>com.cloudera.cdh</groupId> <artifactId>cdh-root</artifactId> - <version>5.11.2</version> + <version>5.13.2</version> </parent> <scm>
