You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 04:15:36 UTC
svn commit: r1181513 - in /hbase/branches/0.89/src:
main/java/org/apache/hadoop/hbase/io/hfile/
main/java/org/apache/hadoop/hbase/regionserver/
test/java/org/apache/hadoop/hbase/ test/java/org/apache/hadoop/hbase/io/
test/java/org/apache/hadoop/hbase/i...
Author: nspiegelberg
Date: Tue Oct 11 02:15:35 2011
New Revision: 1181513
URL: http://svn.apache.org/viewvc?rev=1181513&view=rev
Log:
add backward compat API for getScanners to minimize Test file changes from previous diff
Summary:
I have reverted all the test changes, and add a backward compatible API for
getScanner interfaces.
Test Plan:
running unit tests
Reviewed By: liyintang
Reviewers: nspiegelberg, liyintang
CC: liyintang, kannan, hbase@lists,
Tasks:
#523544: make it easier to add per-CF metrics; add some key per-CF metrics to
start with to debug read perf issues in dark launch
Revert Plan:
OK
Differential Revision: 232098
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/RandomSeek.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java Tue Oct 11 02:15:35 2011
@@ -992,6 +992,21 @@ public class HFile {
* Call {@link HFileScanner#seekTo(byte[])} to position an start the read.
* There is nothing to clean up in a Scanner. Letting go of your references
* to the scanner is sufficient.
+ * NOTE: Do not use this overload of getScanner for compactions.
+ * @param cacheBlocks True if we should cache blocks read in by this scanner.
+ * @param pread Use positional read rather than seek+read if true (pread is
+ * better for random reads, seek+read is better scanning).
+ * @return Scanner on this file.
+ */
+ public HFileScanner getScanner(boolean cacheBlocks, final boolean pread) {
+ return getScanner(cacheBlocks, pread, false);
+ }
+
+ /**
+ * Create a Scanner on this file. No seeks or reads are done on creation.
+ * Call {@link HFileScanner#seekTo(byte[])} to position an start the read.
+ * There is nothing to clean up in a Scanner. Letting go of your references
+ * to the scanner is sufficient.
* @param cacheBlocks True if we should cache blocks read in by this scanner.
* @param pread Use positional read rather than seek+read if true (pread is
* better for random reads, seek+read is better scanning).
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java Tue Oct 11 02:15:35 2011
@@ -942,6 +942,19 @@ public class StoreFile {
}
/**
+ * Get a scanner to scan over this StoreFile. Do not use
+ * this overload if using this scanner for compactions.
+ *
+ * @param cacheBlocks should this scanner cache blocks?
+ * @param pread use pread (for highly concurrent small readers)
+ * @return a scanner
+ */
+ public StoreFileScanner getStoreFileScanner(boolean cacheBlocks,
+ boolean pread) {
+ return getStoreFileScanner(cacheBlocks, pread, false);
+ }
+
+ /**
* Get a scanner to scan over this StoreFile.
*
* @param cacheBlocks should this scanner cache blocks?
@@ -964,6 +977,20 @@ public class StoreFile {
*
* @param cacheBlocks should we cache the blocks?
* @param pread use pread (for concurrent small readers)
+ * @return the underlying HFileScanner
+ */
+ @Deprecated
+ public HFileScanner getScanner(boolean cacheBlocks, boolean pread){
+ return getScanner(cacheBlocks, pread, false);
+ }
+
+ /**
+ * Warning: Do not write further code which depends on this call. Instead
+ * use getStoreFileScanner() which uses the StoreFileScanner class/interface
+ * which is the preferred way to scan a store with higher level concepts.
+ *
+ * @param cacheBlocks should we cache the blocks?
+ * @param pread use pread (for concurrent small readers)
* @param isCompaction is scanner being used for compaction?
* @return the underlying HFileScanner
*/
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java Tue Oct 11 02:15:35 2011
@@ -56,6 +56,20 @@ class StoreFileScanner implements KeyVal
/**
* Return an array of scanners corresponding to the given
* set of store files.
+ * Note: Do not use this overload if using the scanners for
+ * compactions.
+ */
+ public static List<StoreFileScanner> getScannersForStoreFiles(
+ Collection<StoreFile> files,
+ boolean cacheBlocks,
+ boolean usePread) throws IOException {
+ return getScannersForStoreFiles(files, cacheBlocks,
+ usePread, false);
+ }
+
+ /**
+ * Return an array of scanners corresponding to the given
+ * set of store files.
*/
public static List<StoreFileScanner> getScannersForStoreFiles(
Collection<StoreFile> files,
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java Tue Oct 11 02:15:35 2011
@@ -247,7 +247,7 @@ public class HFilePerformanceEvaluation
@Override
void setUp() throws Exception {
super.setUp();
- this.scanner = this.reader.getScanner(false, false, false);
+ this.scanner = this.reader.getScanner(false, false);
this.scanner.seekTo();
}
@@ -279,7 +279,7 @@ public class HFilePerformanceEvaluation
@Override
void doRow(int i) throws Exception {
- HFileScanner scanner = this.reader.getScanner(false, true, false);
+ HFileScanner scanner = this.reader.getScanner(false, true);
byte [] b = getRandomRow();
scanner.seekTo(b);
ByteBuffer k = scanner.getKey();
@@ -303,7 +303,7 @@ public class HFilePerformanceEvaluation
@Override
void doRow(int i) throws Exception {
- HFileScanner scanner = this.reader.getScanner(false, false, false);
+ HFileScanner scanner = this.reader.getScanner(false, false);
byte [] b = getRandomRow();
if (scanner.seekTo(b) != 0) {
System.out.println("Nonexistent row: " + new String(b));
@@ -337,7 +337,7 @@ public class HFilePerformanceEvaluation
@Override
void doRow(int i) throws Exception {
- HFileScanner scanner = this.reader.getScanner(false, true, false);
+ HFileScanner scanner = this.reader.getScanner(false, true);
scanner.seekTo(getGaussianRandomRowBytes());
for (int ii = 0; ii < 30; ii++) {
if (!scanner.next()) {
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java Tue Oct 11 02:15:35 2011
@@ -92,7 +92,7 @@ public class TestHalfStoreFileReader {
final HalfStoreFileReader halfreader =
new HalfStoreFileReader(fs, p, null, bottom);
halfreader.loadFileInfo();
- final HFileScanner scanner = halfreader.getScanner(false, false, false);
+ final HFileScanner scanner = halfreader.getScanner(false, false);
scanner.seekTo();
KeyValue curr;
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/RandomSeek.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/RandomSeek.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/RandomSeek.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/RandomSeek.java Tue Oct 11 02:15:35 2011
@@ -78,7 +78,7 @@ public class RandomSeek {
List<String> keys = slurp("/Users/ryan/xaa.50k");
// Get a scanner that doesn't cache and that uses pread.
- HFileScanner scanner = reader.getScanner(false, true, false);
+ HFileScanner scanner = reader.getScanner(false, true);
int count;
long totalBytes = 0;
int notFound = 0;
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java Tue Oct 11 02:15:35 2011
@@ -145,7 +145,7 @@ public class TestHFile extends HBaseTest
// Load up the index.
reader.loadFileInfo();
// Get a scanner that caches and that does not use pread.
- HFileScanner scanner = reader.getScanner(true, false, false);
+ HFileScanner scanner = reader.getScanner(true, false);
// Align scanner at start of the file.
scanner.seekTo();
readAllRecords(scanner);
@@ -219,7 +219,7 @@ public class TestHFile extends HBaseTest
.getLen(), null, false);
reader.loadFileInfo();
// No data -- this should return false.
- assertFalse(reader.getScanner(false, false, false).seekTo());
+ assertFalse(reader.getScanner(false, false).seekTo());
someReadingWithMetaBlock(reader);
fs.delete(mFile, true);
reader.close();
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java Tue Oct 11 02:15:35 2011
@@ -245,7 +245,7 @@ public class TestHFilePerformance extend
case 1:
default:
{
- HFileScanner scanner = reader.getScanner(false, false, false);
+ HFileScanner scanner = reader.getScanner(false, false);
scanner.seekTo();
for (long l=0 ; l<rows ; l++ ) {
key = scanner.getKey();
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java Tue Oct 11 02:15:35 2011
@@ -161,7 +161,7 @@ public class TestHFileSeek extends TestC
KeySampler kSampler =
new KeySampler(rng, reader.getFirstKey(), reader.getLastKey(),
keyLenGen);
- HFileScanner scanner = reader.getScanner(false, false, false);
+ HFileScanner scanner = reader.getScanner(false, false);
BytesWritable key = new BytesWritable();
timer.reset();
timer.start();
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java Tue Oct 11 02:15:35 2011
@@ -62,7 +62,7 @@ public class TestReseekTo {
HFile.Reader reader = new HFile.Reader(TEST_UTIL.getTestFileSystem(),
ncTFile, null, false);
reader.loadFileInfo();
- HFileScanner scanner = reader.getScanner(false, true, false);
+ HFileScanner scanner = reader.getScanner(false, true);
scanner.seekTo();
for (int i = 0; i < keyList.size(); i++) {
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java Tue Oct 11 02:15:35 2011
@@ -62,7 +62,7 @@ public class TestSeekTo extends HBaseTes
Path p = makeNewFile();
HFile.Reader reader = new HFile.Reader(fs, p, null, false);
reader.loadFileInfo();
- HFileScanner scanner = reader.getScanner(false, true, false);
+ HFileScanner scanner = reader.getScanner(false, true);
assertEquals(false, scanner.seekBefore(toKV("a").getKey()));
assertEquals(false, scanner.seekBefore(toKV("c").getKey()));
@@ -96,7 +96,7 @@ public class TestSeekTo extends HBaseTes
HFile.Reader reader = new HFile.Reader(fs, p, null, false);
reader.loadFileInfo();
assertEquals(2, reader.blockIndex.count);
- HFileScanner scanner = reader.getScanner(false, true, false);
+ HFileScanner scanner = reader.getScanner(false, true);
// lies before the start of the file.
assertEquals(-1, scanner.seekTo(toKV("a").getKey()));
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java Tue Oct 11 02:15:35 2011
@@ -152,7 +152,7 @@ public class TestLoadIncrementalHFiles {
HFile.Reader reader = new HFile.Reader(
p.getFileSystem(conf), p, null, false);
reader.loadFileInfo();
- HFileScanner scanner = reader.getScanner(false, false, false);
+ HFileScanner scanner = reader.getScanner(false, false);
scanner.seekTo();
int count = 0;
do {
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java Tue Oct 11 02:15:35 2011
@@ -342,7 +342,7 @@ public class TestCompaction extends HBas
int count1 = 0;
int count2 = 0;
for (StoreFile f: this.r.stores.get(COLUMN_FAMILY_TEXT).getStorefiles()) {
- HFileScanner scanner = f.getReader().getScanner(false, false, false);
+ HFileScanner scanner = f.getReader().getScanner(false, false);
scanner.seekTo();
do {
byte [] row = scanner.getKeyValue().getRow();
@@ -434,7 +434,7 @@ public class TestCompaction extends HBas
int count = 0;
for (StoreFile f: this.r.stores.
get(COLUMN_FAMILY_TEXT).getStorefiles()) {
- HFileScanner scanner = f.getReader().getScanner(false, false, false);
+ HFileScanner scanner = f.getReader().getScanner(false, false);
if (!scanner.seekTo()) {
continue;
}
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java Tue Oct 11 02:15:35 2011
@@ -77,7 +77,7 @@ public class TestFSErrorsExposed {
StoreFile sf = new StoreFile(fs, writer.getPath(), false,
util.getConfiguration(), StoreFile.BloomType.NONE, false);
StoreFile.Reader reader = sf.createReader();
- HFileScanner scanner = reader.getScanner(false, true, false);
+ HFileScanner scanner = reader.getScanner(false, true);
FaultyInputStream inStream = fs.inStreams.get(0).get();
assertNotNull(inStream);
@@ -118,7 +118,7 @@ public class TestFSErrorsExposed {
StoreFile sf = new StoreFile(fs, writer.getPath(), false,
util.getConfiguration(), BloomType.NONE, false);
List<StoreFileScanner> scanners = StoreFileScanner.getScannersForStoreFiles(
- Collections.singletonList(sf), false, true, false);
+ Collections.singletonList(sf), false, true);
KeyValueScanner scanner = scanners.get(0);
FaultyInputStream inStream = fs.inStreams.get(0).get();
Modified: hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1181513&r1=1181512&r2=1181513&view=diff
==============================================================================
--- hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/branches/0.89/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Tue Oct 11 02:15:35 2011
@@ -145,7 +145,7 @@ public class TestStoreFile extends HBase
StoreFile.BloomType.NONE, false);
// Now confirm that I can read from the reference and that it only gets
// keys from top half of the file.
- HFileScanner s = refHsf.createReader().getScanner(false, false, false);
+ HFileScanner s = refHsf.createReader().getScanner(false, false);
for(boolean first = true; (!s.isSeeked() && s.seekTo()) || s.next();) {
ByteBuffer bb = s.getKey();
kv = KeyValue.createKeyValueFromKey(bb);
@@ -192,7 +192,7 @@ public class TestStoreFile extends HBase
// Now test reading from the top.
boolean first = true;
ByteBuffer key = null;
- HFileScanner topScanner = top.getScanner(false, false, false);
+ HFileScanner topScanner = top.getScanner(false, false);
while ((!topScanner.isSeeked() && topScanner.seekTo()) ||
(topScanner.isSeeked() && topScanner.next())) {
key = topScanner.getKey();
@@ -207,7 +207,7 @@ public class TestStoreFile extends HBase
LOG.info("Last in top: " + Bytes.toString(Bytes.toBytes(key)));
first = true;
- HFileScanner bottomScanner = bottom.getScanner(false, false, false);
+ HFileScanner bottomScanner = bottom.getScanner(false, false);
while ((!bottomScanner.isSeeked() && bottomScanner.seekTo()) ||
bottomScanner.next()) {
previous = bottomScanner.getKey();
@@ -237,7 +237,7 @@ public class TestStoreFile extends HBase
StoreFile.BloomType.NONE, false).createReader();
bottom = new StoreFile(this.fs, bottomPath, true, conf,
StoreFile.BloomType.NONE, false).createReader();
- bottomScanner = bottom.getScanner(false, false, false);
+ bottomScanner = bottom.getScanner(false, false);
int count = 0;
while ((!bottomScanner.isSeeked() && bottomScanner.seekTo()) ||
bottomScanner.next()) {
@@ -247,7 +247,7 @@ public class TestStoreFile extends HBase
assertTrue(count == 0);
// Now read from the top.
first = true;
- topScanner = top.getScanner(false, false, false);
+ topScanner = top.getScanner(false, false);
while ((!topScanner.isSeeked() && topScanner.seekTo()) ||
topScanner.next()) {
key = topScanner.getKey();
@@ -283,7 +283,7 @@ public class TestStoreFile extends HBase
bottom = new StoreFile(this.fs, bottomPath, true, conf,
StoreFile.BloomType.NONE, false).createReader();
first = true;
- bottomScanner = bottom.getScanner(false, false, false);
+ bottomScanner = bottom.getScanner(false, false);
while ((!bottomScanner.isSeeked() && bottomScanner.seekTo()) ||
bottomScanner.next()) {
key = bottomScanner.getKey();
@@ -303,7 +303,7 @@ public class TestStoreFile extends HBase
assertTrue(Bytes.toString(keyKV.getRow()).charAt(i) == 'z');
}
count = 0;
- topScanner = top.getScanner(false, false, false);
+ topScanner = top.getScanner(false, false);
while ((!topScanner.isSeeked() && topScanner.seekTo()) ||
(topScanner.isSeeked() && topScanner.next())) {
count++;
@@ -341,7 +341,7 @@ public class TestStoreFile extends HBase
StoreFile.Reader reader = new StoreFile.Reader(fs, f, null, false);
reader.loadFileInfo();
reader.loadBloomfilter();
- StoreFileScanner scanner = reader.getStoreFileScanner(false, false, false);
+ StoreFileScanner scanner = reader.getStoreFileScanner(false, false);
// check false positives rate
int falsePos = 0;
@@ -431,7 +431,7 @@ public class TestStoreFile extends HBase
StoreFile.Reader reader = new StoreFile.Reader(fs, f, null, false);
reader.loadFileInfo();
reader.loadBloomfilter();
- StoreFileScanner scanner = reader.getStoreFileScanner(false, false, false);
+ StoreFileScanner scanner = reader.getStoreFileScanner(false, false);
assertEquals(expKeys[x], reader.bloomFilter.getKeyCount());
// check false positives rate
@@ -605,7 +605,7 @@ public class TestStoreFile extends HBase
StoreFile hsf = new StoreFile(this.fs, writer.getPath(), true, conf,
StoreFile.BloomType.NONE, false);
StoreFile.Reader reader = hsf.createReader();
- StoreFileScanner scanner = reader.getStoreFileScanner(false, false, false);
+ StoreFileScanner scanner = reader.getStoreFileScanner(false, false);
TreeSet<byte[]> columns = new TreeSet<byte[]>();
columns.add(qualifier);