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

HBASE-7953 Some HFilePerformanceEvaluation tests might fail because of scanner.getValue when there is no more row (Jean-Marc) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1459882 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2013-03-22 16:14:32 +00:00
parent 5bee34d496
commit 4742310a5f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hbase-server/src/test/java/org/apache/hadoop/hbase/HFilePerformanceEvaluation.java
View File

@ -284,7 +284,10 @@ public class HFilePerformanceEvaluation {
void doRow(int i) throws Exception { void doRow(int i) throws Exception {
HFileScanner scanner = this.reader.getScanner(false, true); HFileScanner scanner = this.reader.getScanner(false, true);
byte [] b = getRandomRow(); byte [] b = getRandomRow();
scanner.seekTo(b); if (scanner.seekTo(b) < 0) {
LOG.info("Not able to seekTo " + new String(b));
return;
}
ByteBuffer k = scanner.getKey(); ByteBuffer k = scanner.getKey();
PerformanceEvaluationCommons.assertKey(b, k); PerformanceEvaluationCommons.assertKey(b, k);
ByteBuffer v = scanner.getValue(); ByteBuffer v = scanner.getValue();
@ -309,7 +312,7 @@ public class HFilePerformanceEvaluation {
HFileScanner scanner = this.reader.getScanner(false, false); HFileScanner scanner = this.reader.getScanner(false, false);
byte [] b = getRandomRow(); byte [] b = getRandomRow();
if (scanner.seekTo(b) != 0) { if (scanner.seekTo(b) != 0) {
System.out.println("Nonexistent row: " + new String(b)); LOG.info("Nonexistent row: " + new String(b));
return; return;
} }
ByteBuffer k = scanner.getKey(); ByteBuffer k = scanner.getKey();
@ -317,7 +320,8 @@ public class HFilePerformanceEvaluation {
// System.out.println("Found row: " + new String(b)); // System.out.println("Found row: " + new String(b));
for (int ii = 0; ii < 30; ii++) { for (int ii = 0; ii < 30; ii++) {
if (!scanner.next()) { if (!scanner.next()) {
System.out.println("NOTHING FOLLOWS"); LOG.info("NOTHING FOLLOWS");
return;
} }
ByteBuffer v = scanner.getValue(); ByteBuffer v = scanner.getValue();
PerformanceEvaluationCommons.assertValueSize(v.limit(), ROW_LENGTH); PerformanceEvaluationCommons.assertValueSize(v.limit(), ROW_LENGTH);
@ -341,10 +345,15 @@ public class HFilePerformanceEvaluation {
@Override @Override
void doRow(int i) throws Exception { void doRow(int i) throws Exception {
HFileScanner scanner = this.reader.getScanner(false, true); HFileScanner scanner = this.reader.getScanner(false, true);
scanner.seekTo(getGaussianRandomRowBytes()); byte[] gaussianRandomRowBytes = getGaussianRandomRowBytes();
if (scanner.seekTo(gaussianRandomRowBytes < 0) {
LOG.info("Not able to seekTo " + new String(gaussianRandomRowBytes));
return;
}
for (int ii = 0; ii < 30; ii++) { for (int ii = 0; ii < 30; ii++) {
if (!scanner.next()) { if (!scanner.next()) {
System.out.println("NOTHING FOLLOWS"); LOG.info("NOTHING FOLLOWS");
return;
} }
scanner.getKey(); scanner.getKey();
scanner.getValue(); scanner.getValue();