You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2013/08/27 23:00:29 UTC
svn commit: r1517987 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java
Author: jdcryans
Date: Tue Aug 27 21:00:29 2013
New Revision: 1517987
URL: http://svn.apache.org/r1517987
Log:
HBASE-9307 HalfStoreFileReader needs to handle the faked key else compactions
go into infinite loops
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java?rev=1517987&r1=1517986&r2=1517987&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java Tue Aug 27 21:00:29 2013
@@ -27,6 +27,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
@@ -195,6 +196,9 @@ public class HalfStoreFileReader extends
public boolean seekTo() throws IOException {
if (top) {
int r = this.delegate.seekTo(splitkey);
+ if (r == HConstants.INDEX_KEY_MAGIC) {
+ return true;
+ }
if (r < 0) {
// midkey is < first key in file
return this.delegate.seekTo();