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
|
BUG FIXES
|
||||||
HADOOP-2731 Under load, regions become extremely large and eventually cause
|
HADOOP-2731 Under load, regions become extremely large and eventually cause
|
||||||
region servers to become unresponsive
|
region servers to become unresponsive
|
||||||
|
HADOOP-2693 NPE in getClosestRowBefore (Bryan Duxbury & Stack)
|
||||||
|
|
||||||
IMPROVEMENTS
|
IMPROVEMENTS
|
||||||
HADOOP-2555 Refactor the HTable#get and HTable#getRow methods to avoid
|
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 =
|
Text row_from_mapfile =
|
||||||
rowAtOrBeforeFromMapFile(maparray[i], row, timestamp);
|
rowAtOrBeforeFromMapFile(maparray[i], row, timestamp);
|
||||||
|
|
||||||
// for when we have MapFile.Reader#getClosest before functionality
|
// if the result from the mapfile is null, then we know that
|
||||||
/* Text row_from_mapfile = null;
|
// the mapfile was empty and can move on to the next one.
|
||||||
WritableComparable value = null;
|
if (row_from_mapfile == null) {
|
||||||
|
continue;
|
||||||
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);*/
|
|
||||||
|
|
||||||
// short circuit on an exact match
|
// short circuit on an exact match
|
||||||
if (row.equals(row_from_mapfile)) {
|
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;
|
return bestSoFar;
|
||||||
} finally {
|
} finally {
|
||||||
this.lock.readLock().unlock();
|
this.lock.readLock().unlock();
|
||||||
|
|
Loading…
Reference in New Issue