Changes for CDH 5.14.x
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2b22c298 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2b22c298 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2b22c298 Branch: refs/heads/4.x-cdh5.14 Commit: 2b22c2986111b7e11edf7d89cd7707b0412772ee Parents: 6b5ff31 Author: Pedro Boado <pbo...@apache.org> Authored: Sat Mar 10 17:54:04 2018 +0000 Committer: Pedro Boado <pbo...@apache.org> Committed: Tue May 1 22:52:28 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/2b22c298/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 55a9a6e..c013cf0 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-assembly</artifactId> <name>Phoenix Assembly</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 2454de6..6de0f65 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-client</artifactId> <name>Phoenix Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index e1f8e2a..d17facf 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-core</artifactId> <name>Phoenix Core</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/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/2b22c298/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index d61a9aa..e0532cb 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-flume</artifactId> <name>Phoenix - Flume</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-hive/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 809fbea..170888d 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-hive</artifactId> <name>Phoenix - Hive</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index af6b4fe..33d8fa8 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-kafka</artifactId> <name>Phoenix - Kafka</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index 81e124a..46e1649 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-load-balancer</artifactId> <name>Phoenix Load Balancer</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-parcel/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml index 4615e61..c4145b8 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-parcel</artifactId> <name>Phoenix Parcels for CDH</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 7831f35..b5f9bdc 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-pherf</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index e5d0d52..915134d 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-pig</artifactId> <name>Phoenix - Pig</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 83cfde6..1a4ffd8 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.14.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/2b22c298/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index 7180b18..6da44d6 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver</artifactId> <name>Phoenix Query Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 01a7bc3..fc5d435 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-server</artifactId> <name>Phoenix Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index a45d4b5..90d9110 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-spark</artifactId> <name>Phoenix - Spark</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/phoenix-tracing-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 93edc43..3966b8a 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.14.2-SNAPSHOT</version> </parent> <artifactId>phoenix-tracing-webapp</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2b22c298/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 970428a..34074fb 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.14.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.14.2</version> </parent> <scm>