PHOENIX-3603 Fix compilation errors against hbase 1.3

zzzppi · Apr 25, 2017 · 5b09901 · 5b09901
1 parent 92b951e
commit 5b09901
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 19 deletions.
diff --git 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>

diff --git 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>

diff --git 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>

diff --git a/.../org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java b/.../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
@@ -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
@@ -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<Get> 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
@@ -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/...test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java b/...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
@@ -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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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>

diff --git 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 -->