Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 0b81cb150 -> f408f65aa
Revert "PHOENIX-4076 Move master branch up to HBase 1.4.0. (Andrew Purtell and Lars Hofhansl)" This reverts commit 0b81cb150ad1ba4535f14aa9e0f55777117e202b. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f408f65a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f408f65a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f408f65a Branch: refs/heads/4.x-HBase-1.3 Commit: f408f65aa873bf09095855247ee14ca1f886e363 Parents: 0b81cb1 Author: Lars Hofhansl <la...@apache.org> Authored: Mon Jan 15 16:16:30 2018 -0800 Committer: Lars Hofhansl <la...@apache.org> Committed: Mon Jan 15 16:16:30 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, 69 insertions(+), 204 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index b7fb04c..2ce4871 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-assembly</artifactId> <name>Phoenix Assembly</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 8d78d6b..c209435 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-client</artifactId> <name>Phoenix Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 7fa3072..c90946a 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-core</artifactId> <name>Phoenix Core</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 888084d..7712cc6 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,36 +134,6 @@ 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/f408f65a/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 9d926b5..5a7dcc2 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.HBaseRpcController; +import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; /** @@ -36,25 +36,25 @@ public class ClientRpcControllerFactory extends RpcControllerFactory { } @Override - public HBaseRpcController newController() { - HBaseRpcController delegate = super.newController(); + public PayloadCarryingRpcController newController() { + PayloadCarryingRpcController delegate = super.newController(); return getController(delegate); } @Override - public HBaseRpcController newController(CellScanner cellScanner) { - HBaseRpcController delegate = super.newController(cellScanner); + public PayloadCarryingRpcController newController(CellScanner cellScanner) { + PayloadCarryingRpcController delegate = super.newController(cellScanner); return getController(delegate); } @Override - public HBaseRpcController newController(List<CellScannable> cellIterables) { - HBaseRpcController delegate = super.newController(cellIterables); + public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) { + PayloadCarryingRpcController delegate = super.newController(cellIterables); return getController(delegate); } - private HBaseRpcController getController(HBaseRpcController delegate) { - return new MetadataRpcController(delegate, conf); + private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) { + return new MetadataRpcController(delegate, conf); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 b8976ce..86c4490 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.DelegatingHBaseRpcController; -import org.apache.hadoop.hbase.ipc.HBaseRpcController; +import org.apache.hadoop.hbase.ipc.DelegatingPayloadCarryingRpcController; +import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; 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 DelegatingHBaseRpcController { +class IndexRpcController extends DelegatingPayloadCarryingRpcController { private final int priority; private final String tracingTableName; - public IndexRpcController(HBaseRpcController delegate, Configuration conf) { + public IndexRpcController(PayloadCarryingRpcController 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/f408f65a/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 c586233..89b49b7 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.HBaseRpcController; +import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; /** @@ -39,26 +39,26 @@ public class InterRegionServerIndexRpcControllerFactory extends RpcControllerFac } @Override - public HBaseRpcController newController() { - HBaseRpcController delegate = super.newController(); + public PayloadCarryingRpcController newController() { + PayloadCarryingRpcController delegate = super.newController(); return getController(delegate); } @Override - public HBaseRpcController newController(CellScanner cellScanner) { - HBaseRpcController delegate = super.newController(cellScanner); + public PayloadCarryingRpcController newController(CellScanner cellScanner) { + PayloadCarryingRpcController delegate = super.newController(cellScanner); return getController(delegate); } @Override - public HBaseRpcController newController(List<CellScannable> cellIterables) { - HBaseRpcController delegate = super.newController(cellIterables); + public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) { + PayloadCarryingRpcController delegate = super.newController(cellIterables); return getController(delegate); } - private HBaseRpcController getController(HBaseRpcController delegate) { + private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) { // construct a chain of controllers: metadata, index and standard controller - HBaseRpcController indexRpcController = new IndexRpcController(delegate, conf); + IndexRpcController indexRpcController = new IndexRpcController(delegate, conf); return new MetadataRpcController(indexRpcController, conf); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 98c5ecf..ec4583b 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.HBaseRpcController; +import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; /** @@ -37,24 +37,25 @@ public class InterRegionServerMetadataRpcControllerFactory extends RpcController } @Override - public HBaseRpcController newController() { - HBaseRpcController delegate = super.newController(); + public PayloadCarryingRpcController newController() { + PayloadCarryingRpcController delegate = super.newController(); return getController(delegate); } @Override - public HBaseRpcController newController(CellScanner cellScanner) { - HBaseRpcController delegate = super.newController(cellScanner); + public PayloadCarryingRpcController newController(CellScanner cellScanner) { + PayloadCarryingRpcController delegate = super.newController(cellScanner); return getController(delegate); } @Override - public HBaseRpcController newController(List<CellScannable> cellIterables) { - HBaseRpcController delegate = super.newController(cellIterables); + public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) { + PayloadCarryingRpcController delegate = super.newController(cellIterables); return getController(delegate); } - private HBaseRpcController getController(HBaseRpcController delegate) { + private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) { + // construct a chain of controllers: metadata and delegate controller return new MetadataRpcController(delegate, conf); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 cbeabaa..e8fab25 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.DelegatingHBaseRpcController; -import org.apache.hadoop.hbase.ipc.HBaseRpcController; +import org.apache.hadoop.hbase.ipc.DelegatingPayloadCarryingRpcController; +import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; 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 DelegatingHBaseRpcController { +class MetadataRpcController extends DelegatingPayloadCarryingRpcController { private int priority; // list of system tables @@ -53,7 +53,7 @@ class MetadataRpcController extends DelegatingHBaseRpcController { .getNameAsString()) .build(); - public MetadataRpcController(HBaseRpcController delegate, + public MetadataRpcController(PayloadCarryingRpcController delegate, Configuration conf) { super(delegate); this.priority = PhoenixRpcSchedulerFactory.getMetadataPriority(conf); http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 67564cd..88154a7 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(), scanner.getScannerOrder(), false)); + .hasMVCCInfo(), store.getSmallestReadPoint())); } else { newScanners.add(((StoreFileScanner) scanner)); } @@ -362,15 +362,14 @@ 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, scannerOrder++, false)); + .getReader().getHFileReader().hasMVCCInfo(), readPt)); } else { keyValueScanners.add(new StoreFileScanner(sf.getReader(), sf.getReader() .getScanner(scan.getCacheBlocks(), scanUsePread, false), true, sf - .getReader().getHFileReader().hasMVCCInfo(), readPt, scannerOrder++, false)); + .getReader().getHFileReader().hasMVCCInfo(), readPt)); } } keyValueScanners.addAll(((HStore) store).memstore.getScanners(readPt)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 19c868d..3a80698 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, long scannerOrder, boolean canOptimizeForNonNullColumn) { - super(reader, hfs, useMVCC, hasMVCC, readPt, scannerOrder, canOptimizeForNonNullColumn); + boolean hasMVCC, long readPt) { + super(reader, hfs, useMVCC, hasMVCC, readPt); this.reader = ((IndexHalfStoreFileReader)super.getReader()); this.changeBottomKeys = this.reader.getRegionInfo().getStartKey().length == 0 http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 a173251..380212e 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,7 +27,6 @@ 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; @@ -112,9 +111,4 @@ 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/f408f65a/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 9724126..59b2271 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,33 +678,7 @@ 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/f408f65a/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 6a3d603..a4bc857 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.HBaseRpcController; +import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; 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(); - HBaseRpcController controller = ((ClusterConnection)connection) + PayloadCarryingRpcController 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/f408f65a/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 27311dc..15b0020 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,7 +31,6 @@ 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; @@ -139,11 +138,6 @@ 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/f408f65a/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 d88860d..f45b356 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,24 +317,4 @@ 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/f408f65a/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 46329a2..68592ef 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,7 +28,6 @@ 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; @@ -179,11 +178,6 @@ 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/f408f65a/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 afbf6ab..0957e56 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,28 +361,4 @@ 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/f408f65a/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 55785be..c191d8d 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,38 +329,22 @@ public class TephraTransactionTable implements PhoenixTransactionalTable { } @Override - public int getOperationTimeout() { - return 0; - } - - @Override public void setOperationTimeout(int i) { +// transactionAwareHTable.setOperationTimeout(i); } @Override - public int getRpcTimeout() { - return 0; + public int getOperationTimeout() { + return 0; //transactionAwareHTable.getOperationTimeout(); } @Override public void setRpcTimeout(int i) { +// transactionAwareHTable.setRpcTimeout(i); } @Override - public int getReadRpcTimeout() { - return 0; - } - - @Override - public void setReadRpcTimeout(int readRpcTimeout) { - } - - @Override - public int getWriteRpcTimeout() { - return 0; - } - - @Override - public void setWriteRpcTimeout(int writeRpcTimeout) { + public int getRpcTimeout() { + return 0; //transactionAwareHTable.getRpcTimeout(); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/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 d3af9cd..017470a 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,7 +72,6 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import com.google.common.collect.Lists; import com.google.common.collect.Multimap; /** @@ -314,7 +313,7 @@ public class TestWALRecoveryCaching { // force reassign the regions from the table for (Region region : online) { - cluster.getMaster().getAssignmentManager().assign(Lists.newArrayList(region.getRegionInfo())); + cluster.getMaster().assignRegion(region.getRegionInfo()); } LOG.info("Starting region server:" + server.getHostname()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 357bc2d..cd957b2 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-flume</artifactId> <name>Phoenix - Flume</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-hive/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 8fbc447..0e55812 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-hive</artifactId> <name>Phoenix - Hive</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 0144080..a1b7251 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-kafka</artifactId> <name>Phoenix - Kafka</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-load-balancer/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index ec4a1ad..8aa2b04 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-load-balancer</artifactId> <name>Phoenix Load Balancer</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 9487060..304469e 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-pherf</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 6bbfd60..fa512e2 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-pig</artifactId> <name>Phoenix - Pig</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 575cbba..aaeace2 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver-client</artifactId> <name>Phoenix Query Server Client</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index c201c4e..2cb33fe 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-queryserver</artifactId> <name>Phoenix Query Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index ba05953..e0baeb1 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-server</artifactId> <name>Phoenix Server</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index a17580a..f9a58cf 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-spark</artifactId> <name>Phoenix - Spark</name> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/phoenix-tracing-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 4ce06a5..1b944c6 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-SNAPSHOT</version> </parent> <artifactId>phoenix-tracing-webapp</artifactId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/f408f65a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 88bf3c3..7b6b052 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.4-SNAPSHOT</version> + <version>4.14.0-HBase-1.3-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.4.0</hbase.version> - <hadoop-two.version>2.7.5</hadoop-two.version> + <hbase.version>1.3.1</hbase.version> + <hadoop-two.version>2.7.1</hadoop-two.version> <!-- Dependency versions --> <commons-cli.version>1.2</commons-cli.version>
