Repository: hbase Updated Branches: refs/heads/branch-1 d248d6b0b -> 1e322e68a
HBASE-17054 Compactor#preCreateCoprocScanner should be passed user Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e322e68 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e322e68 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e322e68 Branch: refs/heads/branch-1 Commit: 1e322e68a5f383b59011d50c7f09257c459831c3 Parents: d248d6b Author: tedyu <[email protected]> Authored: Wed Nov 9 07:00:19 2016 -0800 Committer: tedyu <[email protected]> Committed: Wed Nov 9 07:00:19 2016 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/compactions/Compactor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1e322e68/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java index b6d145d..efb5fb2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java @@ -286,7 +286,7 @@ public abstract class Compactor<T extends CellSink> { try { /* Include deletes, unless we are doing a major compaction */ ScanType scanType = scannerFactory.getScanType(request); - scanner = preCreateCoprocScanner(request, scanType, fd.earliestPutTs, scanners); + scanner = preCreateCoprocScanner(request, scanType, fd.earliestPutTs, scanners, user); if (scanner == null) { scanner = scannerFactory.createScanner(scanners, scanType, fd, smallestReadPoint); } @@ -336,14 +336,10 @@ public abstract class Compactor<T extends CellSink> { * @param scanType Scan type. * @param earliestPutTs Earliest put ts. * @param scanners File scanners for compaction files. + * @param user the User * @return Scanner override by coprocessor; null if not overriding. */ protected InternalScanner preCreateCoprocScanner(final CompactionRequest request, - ScanType scanType, long earliestPutTs, List<StoreFileScanner> scanners) throws IOException { - return preCreateCoprocScanner(request, scanType, earliestPutTs, scanners, null); - } - - protected InternalScanner preCreateCoprocScanner(final CompactionRequest request, final ScanType scanType, final long earliestPutTs, final List<StoreFileScanner> scanners, User user) throws IOException { if (store.getCoprocessorHost() == null) {
