.../apache/hadoop/hbase/regionserver/HStore.java | 77 ++++++++-------------- .../apache/hadoop/hbase/regionserver/Store.java | 29 +------- .../hadoop/hbase/regionserver/StoreScanner.java | 25 +++++-- .../apache/hadoop/hbase/HBaseTestingUtility.java | 41 ------------ .../hadoop/hbase/regionserver/TestHMobStore.java | 14 ++-- .../hadoop/hbase/regionserver/TestHRegion.java | 58 ++++++++++++++++ .../hbase/regionserver/TestScanWithBloomError.java | 2 +- .../hadoop/hbase/regionserver/TestStore.java | 68 +++++++++++++++---- 8 files changed, 167 insertions(+), 147 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index c4bd849..9acaa28 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -18,23 +18,14 @@ */ package org.apache.hadoop.hbase.regionserver; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableCollection; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - import java.io.IOException; import java.io.InterruptedIOException; import java.net.InetSocketAddress; -import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.NavigableSet; import java.util.Set; @@ -62,9 +53,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.Tag; -import org.apache.hadoop.hbase.TagType; -import org.apache.hadoop.hbase.TagUtil; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.conf.ConfigurationManager; @@ -99,6 +87,13 @@ import org.apache.hadoop.hbase.util.ReflectionUtils; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; + /** * A Store holds a column family in a Region. Its a memstore and a set of zero * or more StoreFiles, which stretch backwards over time. @@ -1076,53 +1071,33 @@ public class HStore implements Store { } } - /** - * Get all scanners with no filtering based on TTL (that happens further down - * the line). - * @return all scanners for this store - */ - @Override - public List getScanners(boolean cacheBlocks, boolean isGet, - boolean usePread, boolean isCompaction, ScanQueryMatcher matcher, byte[] startRow, - byte[] stopRow, long readPt) throws IOException { - Collection storeFilesToScan; - List memStoreScanners; - this.lock.readLock().lock(); - try { - storeFilesToScan = - this.storeEngine.getStoreFileManager().getFilesForScanOrGet(isGet, startRow, stopRow); - memStoreScanners = this.memstore.getScanners(readPt); - } finally { - this.lock.readLock().unlock(); - } - - // First the store file scanners - - // TODO this used to get the store files in descending order, - // but now we get them in ascending order, which I think is - // actually more correct, since memstore get put at the end. - List sfScanners = StoreFileScanner.getScannersForStoreFiles(storeFilesToScan, - cacheBlocks, usePread, isCompaction, false, matcher, readPt, isPrimaryReplicaStore()); - List scanners = - new ArrayList(sfScanners.size()+1); - scanners.addAll(sfScanners); - // Then the memstore scanners - scanners.addAll(memStoreScanners); - return scanners; - } - @Override - public List getScanners(List files, boolean cacheBlocks, + public List getScanners(Collection files, boolean cacheBlocks, boolean isGet, boolean usePread, boolean isCompaction, ScanQueryMatcher matcher, - byte[] startRow, byte[] stopRow, long readPt, boolean includeMemstoreScanner) throws IOException { + byte[] startRow, byte[] stopRow, long readPt, boolean includeMemstoreScanner) + throws IOException { List memStoreScanners = null; - if (includeMemstoreScanner) { + if (files == null) { + // we need to create the store files on which we need to scan this.lock.readLock().lock(); try { - memStoreScanners = this.memstore.getScanners(readPt); + files = + this.storeEngine.getStoreFileManager().getFilesForScanOrGet(isGet, startRow, stopRow); + if (readPt >= this.getMaxSequenceId()) { + memStoreScanners = this.memstore.getScanners(readPt); + } } finally { this.lock.readLock().unlock(); } + } else { + if (includeMemstoreScanner && (readPt >= this.getMaxSequenceId())) { + this.lock.readLock().lock(); + try { + memStoreScanners = this.memstore.getScanners(readPt); + } finally { + this.lock.readLock().unlock(); + } + } } List sfScanners = StoreFileScanner.getScannersForStoreFiles(files, cacheBlocks, usePread, isCompaction, false, matcher, readPt, isPrimaryReplicaStore()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java index 853a4cf..34e74ef 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java @@ -84,33 +84,10 @@ public interface Store extends HeapSize, StoreConfigInformation, PropagatingConf throws IOException; /** - * Get all scanners with no filtering based on TTL (that happens further down - * the line). - * @param cacheBlocks - * @param isGet - * @param usePread - * @param isCompaction - * @param matcher - * @param startRow - * @param stopRow - * @param readPt - * @return all scanners for this store - */ - List getScanners( - boolean cacheBlocks, - boolean isGet, - boolean usePread, - boolean isCompaction, - ScanQueryMatcher matcher, - byte[] startRow, - byte[] stopRow, - long readPt - ) throws IOException; - - /** * Create scanners on the given files and if needed on the memstore with no filtering based on TTL * (that happens further down the line). - * @param files the list of files on which the scanners has to be created + * @param files the list of files on which the scanners has to be created. If this is null + * the list of store files will be created by the implementation * @param cacheBlocks cache the blocks or not * @param isGet true if it is get, false if not * @param usePread true to use pread, false if not @@ -122,7 +99,7 @@ public interface Store extends HeapSize, StoreConfigInformation, PropagatingConf * @param includeMemstoreScanner true if memstore has to be included * @return scanners on the given files and on the memstore if specified */ - List getScanners(List files, boolean cacheBlocks, boolean isGet, + List getScanners(Collection files, boolean cacheBlocks, boolean isGet, boolean usePread, boolean isCompaction, ScanQueryMatcher matcher, byte[] startRow, byte[] stopRow, long readPt, boolean includeMemstoreScanner) throws IOException; 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 e008a40..5a6c06c 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 @@ -24,6 +24,7 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.InterruptedIOException; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.NavigableSet; @@ -132,7 +133,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner // Indicates whether there was flush during the course of the scan protected volatile boolean flushed = false; // generally we get one file from a flush - protected List flushedStoreFiles = new ArrayList(1); + protected Collection flushedStoreFiles = new ArrayList(1); // The current list of scanners protected List currentScanners = new ArrayList(); // flush update lock @@ -351,8 +352,8 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner protected List getScannersNoCompaction() throws IOException { final boolean isCompaction = false; boolean usePread = get || scanUsePread; - return selectScannersFrom(store.getScanners(cacheBlocks, get, usePread, - isCompaction, matcher, scan.getStartRow(), scan.getStopRow(), this.readPt)); + return selectScannersFrom(store.getScanners(null, cacheBlocks, get, usePread, + isCompaction, matcher, scan.getStartRow(), scan.getStopRow(), this.readPt, true)); } /** @@ -963,13 +964,23 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner * Used in testing. * @return all scanners in no particular order */ + @VisibleForTesting List getAllScannersForTesting() { List allScanners = new ArrayList(); - KeyValueScanner current = heap.getCurrentForTesting(); - if (current != null) - allScanners.add(current); - for (KeyValueScanner scanner : heap.getHeap()) + for (KeyValueScanner scanner : currentScanners) { allScanners.add(scanner); + } + return allScanners; + } + + @VisibleForTesting + List getAllStoreFileScannersForTesting() { + List allScanners = new ArrayList(); + for (KeyValueScanner scanner : currentScanners) { + if (scanner.isFileScanner()) { + allScanners.add(scanner); + } + } return allScanners; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 04afb01..beaf2e8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -3296,32 +3296,6 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { } /** - * Do a small get/scan against one store. This is required because store - * has no actual methods of querying itself, and relies on StoreScanner. - */ - public static List getFromStoreFile(HStore store, - Get get) throws IOException { - Scan scan = new Scan(get); - InternalScanner scanner = (InternalScanner) store.getScanner(scan, - scan.getFamilyMap().get(store.getFamily().getName()), - // originally MultiVersionConcurrencyControl.resetThreadReadPoint() was called to set - // readpoint 0. - 0); - - List result = new ArrayList(); - scanner.next(result); - if (!result.isEmpty()) { - // verify that we are on the row we want: - Cell kv = result.get(0); - if (!CellUtil.matchingRow(kv, get.getRow())) { - result.clear(); - } - } - scanner.close(); - return result; - } - - /** * Create region split keys between startkey and endKey * * @param startKey @@ -3339,21 +3313,6 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { } /** - * Do a small get/scan against one store. This is required because store - * has no actual methods of querying itself, and relies on StoreScanner. - */ - public static List getFromStoreFile(HStore store, - byte [] row, - NavigableSet columns - ) throws IOException { - Get get = new Get(row); - Map> s = get.getFamilyMap(); - s.put(store.getFamily().getName(), columns); - - return getFromStoreFile(store,get); - } - - /** * Gets a ZooKeeperWatcher. * @param TEST_UTIL */ diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java index dfc97e9..1cb094b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java @@ -102,7 +102,7 @@ public class TestHMobStore { private NavigableSet qualifiers = new ConcurrentSkipListSet(Bytes.BYTES_COMPARATOR); private List expected = new ArrayList(); - private long id = System.currentTimeMillis(); + private static long id = 1; private Get get = new Get(row); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final String DIR = TEST_UTIL.getDataTestDir("TestHMobStore").toString(); @@ -219,7 +219,7 @@ public class TestHMobStore { Scan scan = new Scan(get); InternalScanner scanner = (InternalScanner) store.getScanner(scan, scan.getFamilyMap().get(store.getFamily().getName()), - 0); + id++); List results = new ArrayList(); scanner.next(results); @@ -264,7 +264,7 @@ public class TestHMobStore { Scan scan = new Scan(get); InternalScanner scanner = (InternalScanner) store.getScanner(scan, scan.getFamilyMap().get(store.getFamily().getName()), - 0); + id++); List results = new ArrayList(); scanner.next(results); @@ -309,7 +309,7 @@ public class TestHMobStore { scan.setAttribute(MobConstants.MOB_SCAN_RAW, Bytes.toBytes(Boolean.TRUE)); InternalScanner scanner = (InternalScanner) store.getScanner(scan, scan.getFamilyMap().get(store.getFamily().getName()), - 0); + id++); List results = new ArrayList(); scanner.next(results); @@ -354,7 +354,7 @@ public class TestHMobStore { Scan scan = new Scan(get); InternalScanner scanner = (InternalScanner) store.getScanner(scan, scan.getFamilyMap().get(store.getFamily().getName()), - 0); + id++); List results = new ArrayList(); scanner.next(results); @@ -406,7 +406,7 @@ public class TestHMobStore { scan.setAttribute(MobConstants.MOB_SCAN_RAW, Bytes.toBytes(Boolean.TRUE)); InternalScanner scanner = (InternalScanner) store.getScanner(scan, scan.getFamilyMap().get(store.getFamily().getName()), - 0); + id++); List results = new ArrayList(); scanner.next(results); @@ -522,7 +522,7 @@ public class TestHMobStore { Scan scan = new Scan(get); InternalScanner scanner = (InternalScanner) store.getScanner(scan, scan.getFamilyMap().get(store.getFamily().getName()), - 0); + id++); List results = new ArrayList(); scanner.next(results); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 2042f52..1e5041b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -5894,6 +5894,64 @@ public class TestHRegion { } @Test + public void testReverseScanShouldNotScanMemstoreIfReadPtlesser() throws Exception { + byte[] cf1 = Bytes.toBytes("CF1"); + byte[][] families = { cf1 }; + byte[] col = Bytes.toBytes("C"); + String method = this.getName(); + HBaseConfiguration conf = new HBaseConfiguration(); + this.region = initHRegion(tableName, method, conf, families); + try { + // setup with one storefile and one memstore, to create scanner and get an earlier readPt + Put put = new Put(Bytes.toBytes("19996")); + put.addColumn(cf1, col, Bytes.toBytes("val")); + region.put(put); + Put put2 = new Put(Bytes.toBytes("19995")); + put2.addColumn(cf1, col, Bytes.toBytes("val")); + region.put(put2); + // create a reverse scan + Scan scan = new Scan(Bytes.toBytes("19996")); + scan.setReversed(true); + RegionScanner scanner = region.getScanner(scan); + + // flush the cache. This will reset the store scanner + region.flushcache(true, true); + + // create one memstore contains many rows will be skipped + // to check MemStoreScanner.seekToPreviousRow + for (int i = 10000; i < 20000; i++) { + Put p = new Put(Bytes.toBytes("" + i)); + p.addColumn(cf1, col, Bytes.toBytes("" + i)); + region.put(p); + } + List currRow = new ArrayList<>(); + boolean hasNext; + boolean assertDone = false; + do { + hasNext = scanner.next(currRow); + // With HBASE-15871, after the scanner is reset the memstore scanner should not be + // added here + if (!assertDone) { + StoreScanner current = + (StoreScanner) (((RegionScannerImpl) scanner).storeHeap).getCurrentForTesting(); + List scanners = current.getAllScannersForTesting(); + assertEquals("There should be only one scanner the store file scanner", 1, + scanners.size()); + assertDone = true; + } + } while (hasNext); + assertEquals(2, currRow.size()); + assertEquals("19996", Bytes.toString(currRow.get(0).getRowArray(), + currRow.get(0).getRowOffset(), currRow.get(0).getRowLength())); + assertEquals("19995", Bytes.toString(currRow.get(1).getRowArray(), + currRow.get(1).getRowOffset(), currRow.get(1).getRowLength())); + } finally { + HBaseTestingUtility.closeRegionAndWAL(this.region); + this.region = null; + } + } + + @Test public void testSplitRegionWithReverseScan() throws IOException { TableName tableName = TableName.valueOf("testSplitRegionWithReverseScan"); byte [] qualifier = Bytes.toBytes("qualifier"); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java index 027193f..0e5cbcd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java @@ -128,7 +128,7 @@ public class TestScanWithBloomError { (StoreScanner) storeHeap.getCurrentForTesting(); @SuppressWarnings({ "unchecked", "rawtypes" }) List scanners = (List) - (List) storeScanner.getAllScannersForTesting(); + (List) storeScanner.getAllStoreFileScannersForTesting(); // Sort scanners by their HFile's modification time. Collections.sort(scanners, new Comparator() { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java index e3e62fc..0d68f3d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java @@ -37,6 +37,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.NavigableSet; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.atomic.AtomicBoolean; @@ -63,6 +64,7 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.CacheConfig; @@ -121,7 +123,7 @@ public class TestStore { List expected = new ArrayList(); List result = new ArrayList(); - long id = System.currentTimeMillis(); + static long id = 1; Get get = new Get(row); private HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @@ -447,7 +449,7 @@ public class TestStore { this.store = new HStore(this.store.getHRegion(), this.store.getFamily(), c); Assert.assertEquals(2, this.store.getStorefilesCount()); - result = HBaseTestingUtility.getFromStoreFile(store, + result = getFromStoreFile(store, get.getRow(), qualifiers); Assert.assertEquals(1, result.size()); @@ -470,7 +472,7 @@ public class TestStore { this.store.add(new KeyValue(row, family, qf6, 1, (byte[])null)); //Get - result = HBaseTestingUtility.getFromStoreFile(store, + result = getFromStoreFile(store, get.getRow(), qualifiers); //Compare @@ -504,7 +506,7 @@ public class TestStore { flush(3); //Get - result = HBaseTestingUtility.getFromStoreFile(store, + result = getFromStoreFile(store, get.getRow(), qualifiers); //this.store.get(get, qualifiers, result); @@ -541,7 +543,7 @@ public class TestStore { this.store.add(new KeyValue(row, family, qf6, 1, (byte[])null)); //Get - result = HBaseTestingUtility.getFromStoreFile(store, + result = getFromStoreFile(store, get.getRow(), qualifiers); //Need to sort the result since multiple files @@ -551,6 +553,44 @@ public class TestStore { assertCheck(); } + /** + * Do a small get/scan against one store. This is required because store has no actual methods of + * querying itself, and relies on StoreScanner. + */ + private static List getFromStoreFile(HStore store, byte[] row, NavigableSet columns) + throws IOException { + Get get = new Get(row); + Map> s = get.getFamilyMap(); + s.put(store.getFamily().getName(), columns); + + return getFromStoreFile(store, get); + } + + /** + * Do a small get/scan against one store. This is required because store has no actual methods of + * querying itself, and relies on StoreScanner. + */ + private static List getFromStoreFile(HStore store, Get get) throws IOException { + Scan scan = new Scan(get); + InternalScanner scanner = (InternalScanner) store.getScanner(scan, + scan.getFamilyMap().get(store.getFamily().getName()), + // originally MultiVersionConcurrencyControl.resetThreadReadPoint() was called to set + // readpoint 0. + id++); + + List result = new ArrayList(); + scanner.next(result); + if (!result.isEmpty()) { + // verify that we are on the row we want: + Cell kv = result.get(0); + if (!CellUtil.matchingRow(kv, get.getRow())) { + result.clear(); + } + } + scanner.close(); + return result; + } + private void flush(int storeFilessize) throws IOException{ this.store.snapshot(); flushStore(store, id++); @@ -608,7 +648,7 @@ public class TestStore { get.setMaxVersions(); // all versions. List results = new ArrayList(); - results = HBaseTestingUtility.getFromStoreFile(store, get); + results = getFromStoreFile(store, get); Assert.assertEquals(2, results.size()); long ts1 = results.get(0).getTimestamp(); @@ -720,7 +760,7 @@ public class TestStore { get.setMaxVersions(); // all versions. List results = new ArrayList(); - results = HBaseTestingUtility.getFromStoreFile(store, get); + results = getFromStoreFile(store, get); Assert.assertEquals(2, results.size()); long ts1 = results.get(0).getTimestamp(); @@ -734,7 +774,7 @@ public class TestStore { newValue += 1; this.store.updateColumnValue(row, family, qf1, newValue); - results = HBaseTestingUtility.getFromStoreFile(store, get); + results = getFromStoreFile(store, get); Assert.assertEquals(2, results.size()); ts1 = results.get(0).getTimestamp(); @@ -915,27 +955,27 @@ public class TestStore { get.addColumn(family,qf1); get.setTimeRange(0,15); - result = HBaseTestingUtility.getFromStoreFile(store, get); + result = getFromStoreFile(store, get); Assert.assertTrue(result.size()>0); get.setTimeRange(40,90); - result = HBaseTestingUtility.getFromStoreFile(store, get); + result = getFromStoreFile(store, get); Assert.assertTrue(result.size()>0); get.setTimeRange(10,45); - result = HBaseTestingUtility.getFromStoreFile(store, get); + result = getFromStoreFile(store, get); Assert.assertTrue(result.size()>0); get.setTimeRange(80,145); - result = HBaseTestingUtility.getFromStoreFile(store, get); + result = getFromStoreFile(store, get); Assert.assertTrue(result.size()>0); get.setTimeRange(1,2); - result = HBaseTestingUtility.getFromStoreFile(store, get); + result = getFromStoreFile(store, get); Assert.assertTrue(result.size()>0); get.setTimeRange(90,200); - result = HBaseTestingUtility.getFromStoreFile(store, get); + result = getFromStoreFile(store, get); Assert.assertTrue(result.size()==0); }