Repository: hbase Updated Branches: refs/heads/branch-1 421fe24e9 -> dfa948413
HBASE-15171 Addendum removes extra loop (Yu Li) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dfa94841 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dfa94841 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dfa94841 Branch: refs/heads/branch-1 Commit: dfa94841374f78422d4e44a5623cc8b601966b1d Parents: 421fe24 Author: tedyu <yuzhih...@gmail.com> Authored: Thu Jan 28 07:08:03 2016 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Thu Jan 28 07:08:03 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/mapreduce/PutSortReducer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dfa94841/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/PutSortReducer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/PutSortReducer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/PutSortReducer.java index 5533bad..a71b66a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/PutSortReducer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/PutSortReducer.java @@ -66,12 +66,11 @@ public class PutSortReducer extends for (List<Cell> cells: p.getFamilyCellMap().values()) { for (Cell cell: cells) { KeyValue kv = KeyValueUtil.ensureKeyValueTypeForMR(cell); - map.add(kv); + if (map.add(kv)) {// don't count duplicated kv into size + curSize += kv.heapSize(); + } } } - for(KeyValue kv: map){ - curSize +=kv.heapSize(); - } } context.setStatus("Read " + map.size() + " entries of " + map.getClass() + "(" + StringUtils.humanReadableInt(curSize) + ")");
