HBASE-1644 Result.row is cached in getRow; this breaks MapReduce
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@793115 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6691578821
commit
10c178fcb0
@ -254,6 +254,8 @@ Release 0.20.0 - Unreleased
|
|||||||
HBASE-1641 Stargate build.xml causes error in Eclipse
|
HBASE-1641 Stargate build.xml causes error in Eclipse
|
||||||
HBASE-1627 TableInputFormatBase#nextKeyValue catches the wrong exception
|
HBASE-1627 TableInputFormatBase#nextKeyValue catches the wrong exception
|
||||||
(Doğacan Güney via Stack)
|
(Doğacan Güney via Stack)
|
||||||
|
HBASE-1644 Result.row is cached in getRow; this breaks MapReduce
|
||||||
|
(Doğacan Güney via Stack)
|
||||||
|
|
||||||
IMPROVEMENTS
|
IMPROVEMENTS
|
||||||
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
|
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
|
||||||
|
@ -198,19 +198,17 @@ extends InputFormat<ImmutableBytesWritable, Result> {
|
|||||||
public boolean nextKeyValue() throws IOException, InterruptedException {
|
public boolean nextKeyValue() throws IOException, InterruptedException {
|
||||||
if (key == null) key = new ImmutableBytesWritable();
|
if (key == null) key = new ImmutableBytesWritable();
|
||||||
if (value == null) value = new Result();
|
if (value == null) value = new Result();
|
||||||
Result result;
|
|
||||||
try {
|
try {
|
||||||
result = this.scanner.next();
|
value = this.scanner.next();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LOG.debug("recovered from " + StringUtils.stringifyException(e));
|
LOG.debug("recovered from " + StringUtils.stringifyException(e));
|
||||||
restart(lastRow);
|
restart(lastRow);
|
||||||
scanner.next(); // skip presumed already mapped row
|
scanner.next(); // skip presumed already mapped row
|
||||||
result = scanner.next();
|
value = scanner.next();
|
||||||
}
|
}
|
||||||
if (result != null && result.size() > 0) {
|
if (value != null && value.size() > 0) {
|
||||||
key.set(result.getRow());
|
key.set(value.getRow());
|
||||||
lastRow = key.get();
|
lastRow = key.get();
|
||||||
Writables.copyWritable(result, value);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user