HADOOP-2693 NPE in getClosestRowBefore
git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk/src/contrib/hbase@617724 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3e351091b6
commit
b7d932f4dc
|
@ -15,6 +15,7 @@ Trunk (unreleased changes)
|
|||
BUG FIXES
|
||||
HADOOP-2731 Under load, regions become extremely large and eventually cause
|
||||
region servers to become unresponsive
|
||||
HADOOP-2693 NPE in getClosestRowBefore (Bryan Duxbury & Stack)
|
||||
|
||||
IMPROVEMENTS
|
||||
HADOOP-2555 Refactor the HTable#get and HTable#getRow methods to avoid
|
||||
|
|
|
@ -1831,18 +1831,11 @@ public class HStore implements HConstants {
|
|||
Text row_from_mapfile =
|
||||
rowAtOrBeforeFromMapFile(maparray[i], row, timestamp);
|
||||
|
||||
// for when we have MapFile.Reader#getClosest before functionality
|
||||
/* Text row_from_mapfile = null;
|
||||
WritableComparable value = null;
|
||||
|
||||
HStoreKey hskResult =
|
||||
(HStoreKey)maparray[i].getClosest(rowKey, value, true);
|
||||
|
||||
if (hskResult != null) {
|
||||
row_from_mapfile = hskResult.getRow();
|
||||
}*/
|
||||
|
||||
/* LOG.debug("Best from this mapfile was " + row_from_mapfile);*/
|
||||
// if the result from the mapfile is null, then we know that
|
||||
// the mapfile was empty and can move on to the next one.
|
||||
if (row_from_mapfile == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// short circuit on an exact match
|
||||
if (row.equals(row_from_mapfile)) {
|
||||
|
@ -1855,7 +1848,6 @@ public class HStore implements HConstants {
|
|||
}
|
||||
}
|
||||
|
||||
/* LOG.debug("Went searching for " + row + ", found " + bestSoFar);*/
|
||||
return bestSoFar;
|
||||
} finally {
|
||||
this.lock.readLock().unlock();
|
||||
|
|
Loading…
Reference in New Issue