From e987fa22f91f7ca5fd0ab8be0b8bb944c016d971 Mon Sep 17 00:00:00 2001 From: jie Date: Fri, 20 Oct 2017 16:49:45 +0800 Subject: [PATCH] update --- README.md | 1 + .../end2end/NamespaceSchemaMappingIT.java | 10 ++- .../apache/phoenix/end2end/UseSchemaIT.java | 5 +- .../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 30 +++++++ .../phoenix/execute/DelegateHTable.java | 25 +++++- phoenix-pig/pom.xml | 1 - pom.xml | 87 ++++++++++++++++--- 7 files changed, 141 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 6f886e16e78..4b8c53780c2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + ![logo](http://phoenix.apache.org/images/logo.png) [Apache Phoenix](http://phoenix.apache.org/) is a SQL skin over HBase delivered as a client-embedded JDBC driver targeting low latency queries over HBase data. Visit the Apache Phoenix website [here](http://phoenix.apache.org/). diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java index 0dfd5505e3c..6d9ca80732f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java @@ -63,10 +63,12 @@ public void testBackWardCompatibility() throws Exception { String hbaseFullTableName = schemaName + ":" + tableName; HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin(); admin.createNamespace(NamespaceDescriptor.create(namespace).build()); - admin.createTable(new HTableDescriptor(TableName.valueOf(namespace, tableName)) - .addFamily(new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES))); - admin.createTable(new HTableDescriptor(TableName.valueOf(phoenixFullTableName)) - .addFamily(new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES))); + HTableDescriptor descriptor = new HTableDescriptor(TableName.valueOf(namespace, tableName)); + descriptor.addFamily(new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES)); + admin.createTable(descriptor); + HTableDescriptor descriptor2 = new HTableDescriptor(TableName.valueOf(phoenixFullTableName)); + descriptor2.addFamily(new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES)); + admin.createTable(descriptor2); Put put = new Put(PVarchar.INSTANCE.toBytes(phoenixFullTableName)); put.addColumn(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES, QueryConstants.EMPTY_COLUMN_BYTES, diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java index 07ae77e2314..f3112f6e156 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java @@ -167,8 +167,9 @@ public void testMappedView() throws Exception { Connection conn = DriverManager.getConnection(getUrl(), props); HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(), TestUtil.TEST_PROPERTIES).getAdmin(); admin.createNamespace(NamespaceDescriptor.create(schema).build()); - admin.createTable(new HTableDescriptor(fullTablename) - .addFamily(new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES))); + HTableDescriptor d = new HTableDescriptor(fullTablename); + d.addFamily(new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES)); + admin.createTable(d); Put put = new Put(PVarchar.INSTANCE.toBytes(fullTablename)); put.addColumn(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES, QueryConstants.EMPTY_COLUMN_BYTES, QueryConstants.EMPTY_COLUMN_VALUE_BYTES); 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..0ec7ee7d7f6 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,36 @@ public int getActiveRpcHandlerCount() { return this.delegate.getActiveRpcHandlerCount() + this.indexCallExecutor.getActiveHandlerCount() + this.metadataCallExecutor.getActiveHandlerCount(); } + @Override + public int getWriteQueueLength() { + return this.delegate.getWriteQueueLength(); + } + + @Override + public int getReadQueueLength() { + return this.delegate.getReadQueueLength(); + } + + @Override + public int getScanQueueLength() { + return this.delegate.getScanQueueLength(); + } + + @Override + public int getActiveWriteRpcHandlerCount() { + return this.delegate.getActiveWriteRpcHandlerCount(); + } + + @Override + public int getActiveReadRpcHandlerCount() { + return this.delegate.getActiveReadRpcHandlerCount(); + } + + @Override + public int getActiveScanRpcHandlerCount() { + return this.delegate.getActiveScanRpcHandlerCount(); + } + @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..5b6da086ccd 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,30 @@ public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, Compa return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); } - @Override + private int operationTimeout = 0; + private int rpcTimeout = 0; + + @Override + public void setOperationTimeout(int i) { + this.operationTimeout = i; + } + + @Override + public int getOperationTimeout() { + return operationTimeout; + } + + @Override + public void setRpcTimeout(int i) { + this.rpcTimeout = i; + } + + @Override + public int getRpcTimeout() { + return rpcTimeout; + } + + @Override public boolean[] existsAll(List gets) throws IOException { return delegate.existsAll(gets); } diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 82823471a5f..6d217dfea4e 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -54,7 +54,6 @@ org.apache.pig pig - h2 org.apache.hbase diff --git a/pom.xml b/pom.xml index 7c2e929d7bc..88ecf6fa465 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ - apache release - https://repository.apache.org/content/repositories/releases/ + cloudera + https://repository.cloudera.com/artifactory/cloudera-repos/ @@ -65,14 +65,14 @@ ${project.basedir} - 1.2.3 - 2.7.1 + 1.2.0-cdh5.12.1 + 2.6.0-cdh5.12.1 1.2 - 1.2.1 - 2.7.1 - 0.13.0 + 1.1.0-cdh5.12.1 + 2.6.0-cdh5.12.1 + 0.12.0-cdh5.12.1 1.9.2 3.5.2 1.2.17 @@ -85,7 +85,7 @@ 1.0 1.2.0 13.0.1 - 1.4.0 + 1.6.0-cdh5.12.1 0.9.0.0 1.3.9-1 1.0-1 @@ -101,7 +101,7 @@ 1.10.0 8.1.7.v20120910 0.12.0-incubating - 2.0.2 + 2.2.0 2.11.8 2.11 @@ -592,6 +592,10 @@ org.apache.hadoop hadoop-hdfs + + org.apache.hadoop + hadoop-core + @@ -605,6 +609,10 @@ org.jruby jruby-complete + + org.apache.hadoop + hadoop-core + @@ -616,6 +624,12 @@ org.apache.hbase hbase-common ${hbase.version} + + + org.apache.hadoop + hadoop-core + + org.apache.hbase @@ -623,11 +637,23 @@ ${hbase.version} test-jar test + + + org.apache.hadoop + hadoop-core + + org.apache.hbase hbase-client ${hbase.version} + + + org.apache.hadoop + hadoop-core + + org.apache.hbase @@ -635,11 +661,23 @@ ${hbase.version} test-jar test + + + org.apache.hadoop + hadoop-core + + org.apache.hbase hbase-server ${hbase.version} + + + org.apache.hadoop + hadoop-core + + org.apache.hbase @@ -647,11 +685,23 @@ ${hbase.version} test-jar test + + + org.apache.hadoop + hadoop-core + + org.apache.hbase hbase-hadoop-compat ${hbase.version} + + + org.apache.hadoop + hadoop-core + + org.apache.hbase @@ -659,12 +709,24 @@ ${hbase.version} test-jar test + + + org.apache.hadoop + hadoop-core + + org.apache.hbase hbase-hadoop2-compat ${hbase.version} test + + + org.apache.hadoop + hadoop-core + + org.apache.hbase @@ -672,6 +734,12 @@ ${hbase.version} test-jar test + + + org.apache.hadoop + hadoop-core + + @@ -748,7 +816,6 @@ org.apache.pig pig ${pig.version} - h2 org.xerial.snappy