Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-17054 Compactor#preCreateCoprocScanner should be passed user

This commit is contained in:
tedyu 2016-11-09 06:57:43 -08:00
parent 3b63f701e6
commit 287358ba6c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
View File

@ -294,7 +294,7 @@ public abstract class Compactor<T extends CellSink> {
try { try {
/* Include deletes, unless we are doing a major compaction */ /* Include deletes, unless we are doing a major compaction */
ScanType scanType = scannerFactory.getScanType(request); ScanType scanType = scannerFactory.getScanType(request);
scanner = preCreateCoprocScanner(request, scanType, fd.earliestPutTs, scanners); scanner = preCreateCoprocScanner(request, scanType, fd.earliestPutTs, scanners, user);
if (scanner == null) { if (scanner == null) {
scanner = scannerFactory.createScanner(scanners, scanType, fd, smallestReadPoint); scanner = scannerFactory.createScanner(scanners, scanType, fd, smallestReadPoint);
} }
@ -344,13 +344,9 @@ public abstract class Compactor<T extends CellSink> {
* @param scanType Scan type. * @param scanType Scan type.
* @param earliestPutTs Earliest put ts. * @param earliestPutTs Earliest put ts.
* @param scanners File scanners for compaction files. * @param scanners File scanners for compaction files.
* @param user the User
* @return Scanner override by coprocessor; null if not overriding. * @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, protected InternalScanner preCreateCoprocScanner(final CompactionRequest request,
final ScanType scanType, final long earliestPutTs, final List<StoreFileScanner> scanners, final ScanType scanType, final long earliestPutTs, final List<StoreFileScanner> scanners,
User user) throws IOException { User user) throws IOException {