Skip to content

Commit

Permalink
PHOENIX-3603 Fix compilation errors against hbase 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@z-york @apurtell
z-york authored and apurtell committed Apr 25, 2017
1 parent 92b951e commit 5b09901
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 19 deletions.
2 changes: 1 addition & 1 deletion phoenix-assembly/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-client/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java
View file
Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
View file
Expand Up @@ -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;
Expand Down
22 changes: 21 additions & 1 deletion phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java
View file
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/test/java/org/apache/hadoop/hbase/ipc/PhoenixIndexRpcSchedulerTest.java
View file
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java
View file
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion phoenix-flume/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-hive/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-kafka/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-pherf/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-pig/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-queryserver-client/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-queryserver/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-server/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-spark/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-tracing-webapp/pom.xml
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down

0 comments on commit 5b09901

Please sign in to comment.