From c20d9cb1a25963cb04c54d96f620726b5a17d785 Mon Sep 17 00:00:00 2001 From: Ramkrishna Date: Fri, 16 Jun 2017 12:34:08 +0530 Subject: [PATCH] HBASE-18220 - Addendum as per Duo suggestion for readability (Ram) --- .../hadoop/hbase/regionserver/StoreScanner.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index 985af4b47c3..9849c9363eb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -190,6 +190,11 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner if (get) { this.readType = Scan.ReadType.PREAD; this.scanUsePread = true; + } else if(scanType != scanType.USER_SCAN) { + // For compaction scanners never use Pread as already we have stream based scanners on the + // store files to be compacted + this.readType = Scan.ReadType.STREAM; + this.scanUsePread = false; } else { if (scan.getReadType() == Scan.ReadType.DEFAULT) { this.readType = scanInfo.isUsePread() ? Scan.ReadType.PREAD : Scan.ReadType.DEFAULT; @@ -198,12 +203,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner } // Always start with pread unless user specific stream. Will change to stream later if // readType is default if the scan keeps running for a long time. - if (scanType != ScanType.COMPACT_DROP_DELETES - && scanType != ScanType.COMPACT_RETAIN_DELETES) { - // For compaction scanners never use Pread as already we have stream based scanners on the - // store files to be compacted - this.scanUsePread = this.readType != Scan.ReadType.STREAM; - } + this.scanUsePread = this.readType != Scan.ReadType.STREAM; } this.preadMaxBytes = scanInfo.getPreadMaxBytes(); this.cellsPerHeartbeatCheck = scanInfo.getCellsPerTimeoutCheck();