You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2018/01/16 00:16:00 UTC
phoenix git commit: PHOENIX-4076 Move master branch up to HBase
1.4.0. (Andrew Purtell and Lars Hofhansl)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.3 27d658282 -> 0b81cb150
PHOENIX-4076 Move master branch up to HBase 1.4.0. (Andrew Purtell and Lars Hofhansl)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0b81cb15
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0b81cb15
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0b81cb15
Branch: refs/heads/4.x-HBase-1.3
Commit: 0b81cb150ad1ba4535f14aa9e0f55777117e202b
Parents: 27d6582
Author: Lars Hofhansl <la...@apache.org>
Authored: Mon Jan 15 16:13:54 2018 -0800
Committer: Lars Hofhansl <la...@apache.org>
Committed: Mon Jan 15 16:15:25 2018 -0800
----------------------------------------------------------------------
phoenix-assembly/pom.xml | 2 +-
phoenix-client/pom.xml | 2 +-
phoenix-core/pom.xml | 2 +-
.../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 30 ++++++++++++++++++
.../controller/ClientRpcControllerFactory.java | 18 +++++------
.../ipc/controller/IndexRpcController.java | 8 ++---
...erRegionServerIndexRpcControllerFactory.java | 18 +++++------
...egionServerMetadataRpcControllerFactory.java | 17 +++++------
.../ipc/controller/MetadataRpcController.java | 8 ++---
.../IndexHalfStoreFileReaderGenerator.java | 7 +++--
.../LocalIndexStoreFileScanner.java | 4 +--
.../DelegateRegionCoprocessorEnvironment.java | 6 ++++
.../coprocessor/DelegateRegionObserver.java | 32 ++++++++++++++++++--
.../coprocessor/PhoenixAccessController.java | 4 +--
.../PhoenixMetaDataCoprocessorHost.java | 6 ++++
.../apache/phoenix/execute/DelegateHTable.java | 20 ++++++++++++
.../apache/phoenix/iterate/SnapshotScanner.java | 6 ++++
.../transaction/OmidTransactionTable.java | 24 +++++++++++++++
.../transaction/TephraTransactionTable.java | 28 +++++++++++++----
.../index/write/TestWALRecoveryCaching.java | 3 +-
phoenix-flume/pom.xml | 2 +-
phoenix-hive/pom.xml | 2 +-
phoenix-kafka/pom.xml | 2 +-
phoenix-load-balancer/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 | 6 ++--
32 files changed, 204 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 2ce4871..b7fb04c 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-assembly</artifactId>
<name>Phoenix Assembly</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index c209435..8d78d6b 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-client</artifactId>
<name>Phoenix Client</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index c90946a..7fa3072 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-core</artifactId>
<name>Phoenix Core</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/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 7712cc6..888084d 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
@@ -134,6 +134,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/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/ClientRpcControllerFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/ClientRpcControllerFactory.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/ClientRpcControllerFactory.java
index 5a7dcc2..9d926b5 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/ClientRpcControllerFactory.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/ClientRpcControllerFactory.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.CellScanner;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
+import org.apache.hadoop.hbase.ipc.HBaseRpcController;
import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
/**
@@ -36,25 +36,25 @@ public class ClientRpcControllerFactory extends RpcControllerFactory {
}
@Override
- public PayloadCarryingRpcController newController() {
- PayloadCarryingRpcController delegate = super.newController();
+ public HBaseRpcController newController() {
+ HBaseRpcController delegate = super.newController();
return getController(delegate);
}
@Override
- public PayloadCarryingRpcController newController(CellScanner cellScanner) {
- PayloadCarryingRpcController delegate = super.newController(cellScanner);
+ public HBaseRpcController newController(CellScanner cellScanner) {
+ HBaseRpcController delegate = super.newController(cellScanner);
return getController(delegate);
}
@Override
- public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) {
- PayloadCarryingRpcController delegate = super.newController(cellIterables);
+ public HBaseRpcController newController(List<CellScannable> cellIterables) {
+ HBaseRpcController delegate = super.newController(cellIterables);
return getController(delegate);
}
- private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) {
- return new MetadataRpcController(delegate, conf);
+ private HBaseRpcController getController(HBaseRpcController delegate) {
+ return new MetadataRpcController(delegate, conf);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/IndexRpcController.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/IndexRpcController.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/IndexRpcController.java
index 86c4490..b8976ce 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/IndexRpcController.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/IndexRpcController.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.ipc.controller;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.ipc.DelegatingPayloadCarryingRpcController;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
+import org.apache.hadoop.hbase.ipc.DelegatingHBaseRpcController;
+import org.apache.hadoop.hbase.ipc.HBaseRpcController;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -31,12 +31,12 @@ import com.google.protobuf.RpcController;
* {@link RpcController} that sets the appropriate priority of RPC calls destined for Phoenix index
* tables.
*/
-class IndexRpcController extends DelegatingPayloadCarryingRpcController {
+class IndexRpcController extends DelegatingHBaseRpcController {
private final int priority;
private final String tracingTableName;
- public IndexRpcController(PayloadCarryingRpcController delegate, Configuration conf) {
+ public IndexRpcController(HBaseRpcController delegate, Configuration conf) {
super(delegate);
this.priority = PhoenixRpcSchedulerFactory.getIndexPriority(conf);
this.tracingTableName = conf.get(QueryServices.TRACING_STATS_TABLE_NAME_ATTRIB,
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerIndexRpcControllerFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerIndexRpcControllerFactory.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerIndexRpcControllerFactory.java
index 89b49b7..c586233 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerIndexRpcControllerFactory.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerIndexRpcControllerFactory.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
+import org.apache.hadoop.hbase.ipc.HBaseRpcController;
import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
/**
@@ -39,26 +39,26 @@ public class InterRegionServerIndexRpcControllerFactory extends RpcControllerFac
}
@Override
- public PayloadCarryingRpcController newController() {
- PayloadCarryingRpcController delegate = super.newController();
+ public HBaseRpcController newController() {
+ HBaseRpcController delegate = super.newController();
return getController(delegate);
}
@Override
- public PayloadCarryingRpcController newController(CellScanner cellScanner) {
- PayloadCarryingRpcController delegate = super.newController(cellScanner);
+ public HBaseRpcController newController(CellScanner cellScanner) {
+ HBaseRpcController delegate = super.newController(cellScanner);
return getController(delegate);
}
@Override
- public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) {
- PayloadCarryingRpcController delegate = super.newController(cellIterables);
+ public HBaseRpcController newController(List<CellScannable> cellIterables) {
+ HBaseRpcController delegate = super.newController(cellIterables);
return getController(delegate);
}
- private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) {
+ private HBaseRpcController getController(HBaseRpcController delegate) {
// construct a chain of controllers: metadata, index and standard controller
- IndexRpcController indexRpcController = new IndexRpcController(delegate, conf);
+ HBaseRpcController indexRpcController = new IndexRpcController(delegate, conf);
return new MetadataRpcController(indexRpcController, conf);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerMetadataRpcControllerFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerMetadataRpcControllerFactory.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerMetadataRpcControllerFactory.java
index ec4583b..98c5ecf 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerMetadataRpcControllerFactory.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerMetadataRpcControllerFactory.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
+import org.apache.hadoop.hbase.ipc.HBaseRpcController;
import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
/**
@@ -37,25 +37,24 @@ public class InterRegionServerMetadataRpcControllerFactory extends RpcController
}
@Override
- public PayloadCarryingRpcController newController() {
- PayloadCarryingRpcController delegate = super.newController();
+ public HBaseRpcController newController() {
+ HBaseRpcController delegate = super.newController();
return getController(delegate);
}
@Override
- public PayloadCarryingRpcController newController(CellScanner cellScanner) {
- PayloadCarryingRpcController delegate = super.newController(cellScanner);
+ public HBaseRpcController newController(CellScanner cellScanner) {
+ HBaseRpcController delegate = super.newController(cellScanner);
return getController(delegate);
}
@Override
- public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) {
- PayloadCarryingRpcController delegate = super.newController(cellIterables);
+ public HBaseRpcController newController(List<CellScannable> cellIterables) {
+ HBaseRpcController delegate = super.newController(cellIterables);
return getController(delegate);
}
- private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) {
- // construct a chain of controllers: metadata and delegate controller
+ private HBaseRpcController getController(HBaseRpcController delegate) {
return new MetadataRpcController(delegate, conf);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/MetadataRpcController.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/MetadataRpcController.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/MetadataRpcController.java
index e8fab25..cbeabaa 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/MetadataRpcController.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/controller/MetadataRpcController.java
@@ -21,8 +21,8 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.ipc.DelegatingPayloadCarryingRpcController;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
+import org.apache.hadoop.hbase.ipc.DelegatingHBaseRpcController;
+import org.apache.hadoop.hbase.ipc.HBaseRpcController;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import org.apache.phoenix.util.SchemaUtil;
@@ -34,7 +34,7 @@ import com.google.protobuf.RpcController;
* {@link RpcController} that sets the appropriate priority of RPC calls destined for Phoenix SYSTEM
* tables
*/
-class MetadataRpcController extends DelegatingPayloadCarryingRpcController {
+class MetadataRpcController extends DelegatingHBaseRpcController {
private int priority;
// list of system tables
@@ -53,7 +53,7 @@ class MetadataRpcController extends DelegatingPayloadCarryingRpcController {
.getNameAsString())
.build();
- public MetadataRpcController(PayloadCarryingRpcController delegate,
+ public MetadataRpcController(HBaseRpcController delegate,
Configuration conf) {
super(delegate);
this.priority = PhoenixRpcSchedulerFactory.getMetadataPriority(conf);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 88154a7..67564cd 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -222,7 +222,7 @@ public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver {
if (reader instanceof IndexHalfStoreFileReader) {
newScanners.add(new LocalIndexStoreFileScanner(reader, reader.getScanner(
scan.getCacheBlocks(), scanUsePread, false), true, reader.getHFileReader()
- .hasMVCCInfo(), store.getSmallestReadPoint()));
+ .hasMVCCInfo(), store.getSmallestReadPoint(), scanner.getScannerOrder(), false));
} else {
newScanners.add(((StoreFileScanner) scanner));
}
@@ -362,14 +362,15 @@ public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver {
final List<StoreFileScanner> scanners = StoreFileScanner.getScannersForStoreFiles(nonReferenceStoreFiles, scan.getCacheBlocks(), scanUsePread, readPt);
keyValueScanners.addAll(scanners);
for (StoreFile sf : referenceStoreFiles) {
+ long scannerOrder = 0;
if (sf.getReader() instanceof IndexHalfStoreFileReader) {
keyValueScanners.add(new LocalIndexStoreFileScanner(sf.getReader(), sf.getReader()
.getScanner(scan.getCacheBlocks(), scanUsePread, false), true, sf
- .getReader().getHFileReader().hasMVCCInfo(), readPt));
+ .getReader().getHFileReader().hasMVCCInfo(), readPt, scannerOrder++, false));
} else {
keyValueScanners.add(new StoreFileScanner(sf.getReader(), sf.getReader()
.getScanner(scan.getCacheBlocks(), scanUsePread, false), true, sf
- .getReader().getHFileReader().hasMVCCInfo(), readPt));
+ .getReader().getHFileReader().hasMVCCInfo(), readPt, scannerOrder++, false));
}
}
keyValueScanners.addAll(((HStore) store).memstore.getScanners(readPt));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexStoreFileScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexStoreFileScanner.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexStoreFileScanner.java
index 3a80698..19c868d 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexStoreFileScanner.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexStoreFileScanner.java
@@ -39,8 +39,8 @@ public class LocalIndexStoreFileScanner extends StoreFileScanner{
private IndexHalfStoreFileReader reader;
private boolean changeBottomKeys;
public LocalIndexStoreFileScanner(Reader reader, HFileScanner hfs, boolean useMVCC,
- boolean hasMVCC, long readPt) {
- super(reader, hfs, useMVCC, hasMVCC, readPt);
+ boolean hasMVCC, long readPt, long scannerOrder, boolean canOptimizeForNonNullColumn) {
+ super(reader, hfs, useMVCC, hasMVCC, readPt, scannerOrder, canOptimizeForNonNullColumn);
this.reader = ((IndexHalfStoreFileReader)super.getReader());
this.changeBottomKeys =
this.reader.getRegionInfo().getStartKey().length == 0
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java
index 380212e..a173251 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
+import org.apache.hadoop.hbase.metrics.MetricRegistry;
import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
@@ -111,4 +112,9 @@ public class DelegateRegionCoprocessorEnvironment implements RegionCoprocessorEn
return delegate.getSharedData();
}
+ @Override
+ public MetricRegistry getMetricRegistryForRegionServer() {
+ return delegate.getMetricRegistryForRegionServer();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
index 59b2271..9724126 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
@@ -678,7 +678,33 @@ public class DelegateRegionObserver implements RegionObserver {
throws IOException {
return delegate.postInstantiateDeleteTracker(ctx, delTracker);
}
-
-
-
+
+ @Override
+ public InternalScanner preFlushScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c,
+ Store store, KeyValueScanner memstoreScanner, InternalScanner s, long readPoint)
+ throws IOException {
+ return delegate.preFlushScannerOpen(c, store, memstoreScanner, s, readPoint);
+ }
+
+ @Override
+ public InternalScanner preCompactScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c,
+ Store store, List<? extends KeyValueScanner> scanners, ScanType scanType,
+ long earliestPutTs, InternalScanner s, CompactionRequest request, long readPoint)
+ throws IOException {
+ return delegate.preCompactScannerOpen(c, store, scanners, scanType, earliestPutTs, s, request,
+ readPoint);
+ }
+
+ @Override
+ public void preCommitStoreFile(ObserverContext<RegionCoprocessorEnvironment> ctx, byte[] family,
+ List<Pair<Path, Path>> pairs) throws IOException {
+ delegate.preCommitStoreFile(ctx, family, pairs);
+ }
+
+ @Override
+ public void postCommitStoreFile(ObserverContext<RegionCoprocessorEnvironment> ctx,
+ byte[] family, Path srcPath, Path dstPath) throws IOException {
+ delegate.postCommitStoreFile(ctx, family, srcPath, dstPath);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
index a4bc857..6a3d603 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
@@ -43,7 +43,7 @@ import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.coprocessor.BaseMasterAndRegionObserver;
import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
+import org.apache.hadoop.hbase.ipc.HBaseRpcController;
import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos;
@@ -412,7 +412,7 @@ public class PhoenixAccessController extends BaseMetaDataEndpointObserver {
builder.setType(AccessControlProtos.Permission.Type.Table);
AccessControlProtos.GetUserPermissionsRequest request = builder.build();
- PayloadCarryingRpcController controller = ((ClusterConnection)connection)
+ HBaseRpcController controller = ((ClusterConnection)connection)
.getRpcControllerFactory().newController();
((AccessControlService.Interface)service).getUserPermissions(controller, request,
new RpcCallback<AccessControlProtos.GetUserPermissionsResponse>() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixMetaDataCoprocessorHost.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixMetaDataCoprocessorHost.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixMetaDataCoprocessorHost.java
index 15b0020..27311dc 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixMetaDataCoprocessorHost.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixMetaDataCoprocessorHost.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
+import org.apache.hadoop.hbase.metrics.MetricRegistry;
import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
@@ -138,6 +139,11 @@ public class PhoenixMetaDataCoprocessorHost
public ConcurrentMap<String, Object> getSharedData() {
return env.getSharedData();
}
+
+ @Override
+ public MetricRegistry getMetricRegistryForRegionServer() {
+ return env.getMetricRegistryForRegionServer();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java
----------------------------------------------------------------------
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 f45b356..d88860d 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
@@ -317,4 +317,24 @@ public class DelegateHTable implements HTableInterface {
return delegate.checkAndDelete(row, family, qualifier, compareOp, value, delete);
}
+ @Override
+ public int getReadRpcTimeout() {
+ return delegate.getReadRpcTimeout();
+ }
+
+ @Override
+ public void setReadRpcTimeout(int readRpcTimeout) {
+ delegate.setReadRpcTimeout(readRpcTimeout);
+ }
+
+ @Override
+ public int getWriteRpcTimeout() {
+ return delegate.getWriteRpcTimeout();
+ }
+
+ @Override
+ public void setWriteRpcTimeout(int writeRpcTimeout) {
+ delegate.setWriteRpcTimeout(writeRpcTimeout);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
index 68592ef..46329a2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
+import org.apache.hadoop.hbase.metrics.MetricRegistry;
import org.apache.hadoop.hbase.regionserver.*;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
import org.apache.phoenix.schema.PTable;
@@ -178,6 +179,11 @@ public class SnapshotScanner extends AbstractClientScanner {
public ClassLoader getClassLoader() {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public MetricRegistry getMetricRegistryForRegionServer() {
+ throw new UnsupportedOperationException();
+ }
};
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index 0957e56..afbf6ab 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -361,4 +361,28 @@ public class OmidTransactionTable implements PhoenixTransactionalTable {
}
+ @Override
+ public int getReadRpcTimeout() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public void setReadRpcTimeout(int readRpcTimeout) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public int getWriteRpcTimeout() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public void setWriteRpcTimeout(int writeRpcTimeout) {
+ // TODO Auto-generated method stub
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java
index c191d8d..55785be 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java
@@ -329,22 +329,38 @@ public class TephraTransactionTable implements PhoenixTransactionalTable {
}
@Override
+ public int getOperationTimeout() {
+ return 0;
+ }
+
+ @Override
public void setOperationTimeout(int i) {
-// transactionAwareHTable.setOperationTimeout(i);
}
@Override
- public int getOperationTimeout() {
- return 0; //transactionAwareHTable.getOperationTimeout();
+ public int getRpcTimeout() {
+ return 0;
}
@Override
public void setRpcTimeout(int i) {
-// transactionAwareHTable.setRpcTimeout(i);
}
@Override
- public int getRpcTimeout() {
- return 0; //transactionAwareHTable.getRpcTimeout();
+ public int getReadRpcTimeout() {
+ return 0;
+ }
+
+ @Override
+ public void setReadRpcTimeout(int readRpcTimeout) {
+ }
+
+ @Override
+ public int getWriteRpcTimeout() {
+ return 0;
+ }
+
+ @Override
+ public void setWriteRpcTimeout(int writeRpcTimeout) {
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
index 017470a..d3af9cd 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java
@@ -72,6 +72,7 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
/**
@@ -313,7 +314,7 @@ public class TestWALRecoveryCaching {
// force reassign the regions from the table
for (Region region : online) {
- cluster.getMaster().assignRegion(region.getRegionInfo());
+ cluster.getMaster().getAssignmentManager().assign(Lists.newArrayList(region.getRegionInfo()));
}
LOG.info("Starting region server:" + server.getHostname());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-flume/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index cd957b2..357bc2d 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-flume</artifactId>
<name>Phoenix - Flume</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-hive/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml
index 0e55812..8fbc447 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-hive</artifactId>
<name>Phoenix - Hive</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml
index a1b7251..0144080 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-kafka</artifactId>
<name>Phoenix - Kafka</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml
index 8aa2b04..ec4a1ad 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-load-balancer</artifactId>
<name>Phoenix Load Balancer</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 304469e..9487060 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-pherf</artifactId>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index fa512e2..6bbfd60 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-pig</artifactId>
<name>Phoenix - Pig</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index aaeace2..575cbba 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-queryserver-client</artifactId>
<name>Phoenix Query Server Client</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 2cb33fe..c201c4e 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-queryserver</artifactId>
<name>Phoenix Query Server</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-server/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index e0baeb1..ba05953 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-server</artifactId>
<name>Phoenix Server</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index f9a58cf..a17580a 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-spark</artifactId>
<name>Phoenix - Spark</name>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/phoenix-tracing-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 1b944c6..4ce06a5 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
</parent>
<artifactId>phoenix-tracing-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0b81cb15/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7b6b052..88bf3c3 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-HBase-1.3-SNAPSHOT</version>
+ <version>4.14.0-HBase-1.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Phoenix</name>
<description>A SQL layer over HBase</description>
@@ -66,8 +66,8 @@
<top.dir>${project.basedir}</top.dir>
<!-- Hadoop Versions -->
- <hbase.version>1.3.1</hbase.version>
- <hadoop-two.version>2.7.1</hadoop-two.version>
+ <hbase.version>1.4.0</hbase.version>
+ <hadoop-two.version>2.7.5</hadoop-two.version>
<!-- Dependency versions -->
<commons-cli.version>1.2</commons-cli.version>