Author: stack
Date: Tue Jun 26 21:50:10 2007
New Revision: 551039
URL: http://svn.apache.org/viewvc?view=rev&rev=551039
Log:
HADOOP-1534. [hbase] Memcache scanner fails if start key not present
* src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java
(findFirstRow): Change compare from startsWith -- looking for
an 'exact' match -- to instead use compareTo and if >= 0, then
we are at first key.
* src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
Add logging of problematic directory if server won't start because
log file exists.
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?view=diff&rev=551039&r1=551038&r2=551039
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Jun 26 21:50:10 2007
@@ -38,5 +38,5 @@
23. HADOOP-1509. Made methods/inner classes in HRegionServer and HClient
protected
instead of private for easier extension. Also made HRegion and
HRegionInfo public too.
Added an hbase-default.xml property for specifying what HRegionInterface
extension to use
- for proxy server connection.
-
+ for proxy server connection.
+ 24. HADOOP-1534. [hbase] Memcache scanner fails if start key not present
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java?view=diff&rev=551039&r1=551038&r2=551039
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java
Tue Jun 26 21:50:10 2007
@@ -332,8 +332,8 @@
* @return true if this is the first row
*/
boolean findFirstRow(int i, Text firstRow) {
- return ((firstRow.getLength() == 0)
- || (keys[i].getRow().toString().startsWith(firstRow.toString())));
+ return firstRow.getLength() == 0 ||
+ keys[i].getRow().compareTo(firstRow) >= 0;
}
/**
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java?view=diff&rev=551039&r1=551038&r2=551039
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegionServer.java
Tue Jun 26 21:50:10 2007
@@ -446,7 +446,7 @@
if(fs.exists(logdir)) {
throw new RegionServerRunningException("region server already running
at " +
this.serverInfo.getServerAddress().toString() + " because logdir " +
- " exists");
+ logdir.toString() + " exists");
}
this.log = new HLog(fs, logdir, conf);
