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

HBASE-10949 Reversed scan could hang

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1587061 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2014-04-13 17:56:01 +00:00
parent 2f4997c19a
commit b5867cb327
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
View File

@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.hfile.HFileScanner; import org.apache.hadoop.hbase.io.hfile.HFileScanner;
import org.apache.hadoop.hbase.regionserver.StoreFile.Reader; import org.apache.hadoop.hbase.regionserver.StoreFile.Reader;
import org.apache.hadoop.hbase.util.Bytes;
/** /**
* KeyValueScanner adaptor over the Reader. It also provides hooks into * KeyValueScanner adaptor over the Reader. It also provides hooks into
@ -200,7 +199,7 @@ public class StoreFileScanner implements KeyValueScanner {
hfs.next(); hfs.next();
cur = hfs.getKeyValue(); cur = hfs.getKeyValue();
if (this.stopSkippingKVsIfNextRow if (this.stopSkippingKVsIfNextRow
&& Bytes.compareTo(cur.getRowArray(), cur.getRowOffset(), && getComparator().compareRows(cur.getRowArray(), cur.getRowOffset(),
cur.getRowLength(), startKV.getRowArray(), startKV.getRowOffset(), cur.getRowLength(), startKV.getRowArray(), startKV.getRowOffset(),
startKV.getRowLength()) > 0) { startKV.getRowLength()) > 0) {
return false; return false;
@ -363,6 +362,10 @@ public class StoreFileScanner implements KeyValueScanner {
return reader; return reader;
} }
KeyValue.KVComparator getComparator() {
return reader.getComparator();
}
@Override @Override
public boolean realSeekDone() { public boolean realSeekDone() {
return realSeekDone; return realSeekDone;
@ -405,6 +408,7 @@ public class StoreFileScanner implements KeyValueScanner {
} }
@Override @Override
@SuppressWarnings("deprecation")
public boolean seekToPreviousRow(Cell key) throws IOException { public boolean seekToPreviousRow(Cell key) throws IOException {
try { try {
try { try {
@ -434,7 +438,7 @@ public class StoreFileScanner implements KeyValueScanner {
this.stopSkippingKVsIfNextRow = false; this.stopSkippingKVsIfNextRow = false;
} }
if (!resultOfSkipKVs if (!resultOfSkipKVs
|| KeyValue.COMPARATOR.compareRows(cur, firstKeyOfPreviousRow) > 0) { || getComparator().compareRows(cur, firstKeyOfPreviousRow) > 0) {
return seekToPreviousRow(firstKeyOfPreviousRow); return seekToPreviousRow(firstKeyOfPreviousRow);
} }
@ -466,7 +470,7 @@ public class StoreFileScanner implements KeyValueScanner {
public boolean backwardSeek(Cell key) throws IOException { public boolean backwardSeek(Cell key) throws IOException {
seek(key); seek(key);
if (cur == null if (cur == null
|| Bytes.compareTo(cur.getRowArray(), cur.getRowOffset(), || getComparator().compareRows(cur.getRowArray(), cur.getRowOffset(),
cur.getRowLength(), key.getRowArray(), key.getRowOffset(), cur.getRowLength(), key.getRowArray(), key.getRowOffset(),
key.getRowLength()) > 0) { key.getRowLength()) > 0) {
return seekToPreviousRow(key); return seekToPreviousRow(key);