Repository: hbase Updated Branches: refs/heads/branch-2 a797fe0da -> a977055ec
http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java index 3b7f1f8..07fc179 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java @@ -71,6 +71,7 @@ import org.apache.hadoop.hbase.regionserver.ScanType; import org.apache.hadoop.hbase.regionserver.ScannerContext; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreFile; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.testclassification.CoprocessorTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles; @@ -416,7 +417,7 @@ public class TestRegionObserverInterface { @Override public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment> e, Store store, - final InternalScanner scanner, final ScanType scanType) { + final InternalScanner scanner, final ScanType scanType, CompactionRequest request) { return new InternalScanner() { @Override public boolean next(List<Cell> results) throws IOException { @@ -455,7 +456,7 @@ public class TestRegionObserverInterface { @Override public void postCompact(ObserverContext<RegionCoprocessorEnvironment> e, Store store, - StoreFile resultFile) { + StoreFile resultFile, CompactionRequest request) { lastCompaction = EnvironmentEdgeManager.currentTime(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java index e9bf09b..8ab0175 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java @@ -61,6 +61,7 @@ import org.apache.hadoop.hbase.regionserver.ScannerContext; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreScanner; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.regionserver.throttle.ThroughputController; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.testclassification.CoprocessorTests; @@ -139,7 +140,8 @@ public class TestRegionObserverScannerOpenHook { @Override public InternalScanner preFlushScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, - Store store, List<KeyValueScanner> scanners, InternalScanner s) throws IOException { + Store store, List<KeyValueScanner> scanners, InternalScanner s, long readPoint) + throws IOException { scanners.forEach(KeyValueScanner::close); return NO_DATA; } @@ -153,7 +155,8 @@ public class TestRegionObserverScannerOpenHook { @Override public InternalScanner preCompactScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, Store store, List<? extends KeyValueScanner> scanners, ScanType scanType, - long earliestPutTs, InternalScanner s) throws IOException { + long earliestPutTs, InternalScanner s, CompactionRequest request, long readPoint) + throws IOException { scanners.forEach(KeyValueScanner::close); return NO_DATA; } http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java index defac7b..5179b84 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java @@ -74,6 +74,7 @@ import org.apache.hadoop.hbase.quotas.QuotaUtil; import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreFile; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.snapshot.RestoreSnapshotException; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; @@ -459,8 +460,8 @@ public class TestNamespaceAuditor { volatile CountDownLatch postCompact; @Override - public void postCompact(ObserverContext<RegionCoprocessorEnvironment> e, - Store store, StoreFile resultFile) throws IOException { + public void postCompact(ObserverContext<RegionCoprocessorEnvironment> e, Store store, + StoreFile resultFile, CompactionRequest request) throws IOException { postCompact.countDown(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/NoOpScanPolicyObserver.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/NoOpScanPolicyObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/NoOpScanPolicyObserver.java index 5423578..fcc3d4a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/NoOpScanPolicyObserver.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/NoOpScanPolicyObserver.java @@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.client.TestFromClientSideWithCoprocessor; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionObserver; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; /** * RegionObserver that just reimplements the default behavior, @@ -44,7 +45,8 @@ public class NoOpScanPolicyObserver implements RegionObserver { */ @Override public InternalScanner preFlushScannerOpen(final ObserverContext<RegionCoprocessorEnvironment> c, - Store store, List<KeyValueScanner> scanners, InternalScanner s) throws IOException { + Store store, List<KeyValueScanner> scanners, InternalScanner s, long readPoint) + throws IOException { ScanInfo oldSI = store.getScanInfo(); ScanInfo scanInfo = new ScanInfo(oldSI.getConfiguration(), store.getColumnFamilyDescriptor(), oldSI.getTtl(), oldSI.getTimeToPurgeDeletes(), oldSI.getComparator()); @@ -59,7 +61,7 @@ public class NoOpScanPolicyObserver implements RegionObserver { public InternalScanner preCompactScannerOpen( final ObserverContext<RegionCoprocessorEnvironment> c, Store store, List<? extends KeyValueScanner> scanners, ScanType scanType, long earliestPutTs, - InternalScanner s) throws IOException { + InternalScanner s, CompactionRequest request, long readPoint) throws IOException { // this demonstrates how to override the scanners default behavior ScanInfo oldSI = store.getScanInfo(); ScanInfo scanInfo = new ScanInfo(oldSI.getConfiguration(), store.getColumnFamilyDescriptor(), @@ -69,8 +71,8 @@ public class NoOpScanPolicyObserver implements RegionObserver { } @Override - public KeyValueScanner preStoreScannerOpen(final ObserverContext<RegionCoprocessorEnvironment> c, - Store store, final Scan scan, final NavigableSet<byte[]> targetCols, KeyValueScanner s) + public KeyValueScanner preStoreScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, + Store store, Scan scan, NavigableSet<byte[]> targetCols, KeyValueScanner s, long readPoint) throws IOException { Region r = c.getEnvironment().getRegion(); return scan.isReversed() ? new ReversedStoreScanner(store, http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java index 49b0a72..ea14962 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java @@ -67,6 +67,7 @@ import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.regionserver.wal.TestWALActionsListener; import org.apache.hadoop.hbase.wal.WALEdit; import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; @@ -252,9 +253,8 @@ public class TestHRegionServerBulkLoad { public static class MyObserver implements RegionObserver { static int sleepDuration; @Override - public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment> e, - final Store store, final InternalScanner scanner, final ScanType scanType) - throws IOException { + public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment> e, Store store, + InternalScanner scanner, ScanType scanType, CompactionRequest request) throws IOException { try { Thread.sleep(sleepDuration); } catch (InterruptedException ie) { http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java index 97b1633..bf36821 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java @@ -902,7 +902,7 @@ public class TestAccessController extends SecureTestUtil { @Override public Object run() throws Exception { ACCESS_CONTROLLER.preCompact(ObserverContext.createAndPrepare(RCP_ENV, null), null, null, - ScanType.COMPACT_RETAIN_DELETES); + ScanType.COMPACT_RETAIN_DELETES, null); return null; } }; http://git-wip-us.apache.org/repos/asf/hbase/blob/a977055e/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java index 9ea8686..656a0c7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java @@ -57,6 +57,7 @@ import org.apache.hadoop.hbase.regionserver.ScanInfo; import org.apache.hadoop.hbase.regionserver.ScanType; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreScanner; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.wal.WALEdit; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; @@ -239,8 +240,8 @@ public class TestCoprocessorScanPolicy { @Override public InternalScanner preFlushScannerOpen( - final ObserverContext<RegionCoprocessorEnvironment> c, - Store store, List<KeyValueScanner> scanners, InternalScanner s) throws IOException { + final ObserverContext<RegionCoprocessorEnvironment> c, Store store, + List<KeyValueScanner> scanners, InternalScanner s, long readPoint) throws IOException { Long newTtl = ttls.get(store.getTableName()); if (newTtl != null) { System.out.println("PreFlush:" + newTtl); @@ -262,7 +263,7 @@ public class TestCoprocessorScanPolicy { public InternalScanner preCompactScannerOpen( final ObserverContext<RegionCoprocessorEnvironment> c, Store store, List<? extends KeyValueScanner> scanners, ScanType scanType, long earliestPutTs, - InternalScanner s) throws IOException { + InternalScanner s, CompactionRequest request, long readPoint) throws IOException { Long newTtl = ttls.get(store.getTableName()); Integer newVersions = versions.get(store.getTableName()); ScanInfo oldSI = store.getScanInfo();
