[2/2] hbase git commit: HBASE-15171 Addendum removes extra loop (Yu Li)

[apurtell]

HBASE-15171 Addendum removes extra loop (Yu Li)

Amending-Author: Andrew Purtell 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/de149d0b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/de149d0b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/de149d0b

Branch: refs/heads/0.98
Commit: de149d0bc4eda960e7246c79a1ad85c9cbe50de0
Parents: 38cd179
Author: tedyu 
Authored: Thu Jan 28 07:08:03 2016 -0800
Committer: Andrew Purtell 
Committed: Wed Feb 10 00:08:55 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/de149d0b/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 dbf4e30..792686a 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 cells: p.getFamilyCellMap().values()) {
   for (Cell cell: cells) {
 KeyValue kv = KeyValueUtil.ensureKeyValue(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) + ")");

[04/13] hbase git commit: HBASE-15171 Addendum removes extra loop (Yu Li)

[syuanjiang]

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/37ed0f6d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/37ed0f6d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/37ed0f6d

Branch: refs/heads/hbase-12439
Commit: 37ed0f6d0815389e0b368bc98b3a01dd02f193ac
Parents: 138b754
Author: tedyu 
Authored: Thu Jan 28 07:06:10 2016 -0800
Committer: tedyu 
Committed: Thu Jan 28 07:06:10 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/37ed0f6d/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 d18ea34..b302d58 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
@@ -67,12 +67,11 @@ public class PutSortReducer extends
 for (List cells: p.getFamilyCellMap().values()) {
   for (Cell cell: cells) {
 KeyValue kv = KeyValueUtil.ensureKeyValue(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) + ")");

hbase git commit: HBASE-15171 Addendum removes extra loop (Yu Li)

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/master 138b75467 -> 37ed0f6d0


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/37ed0f6d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/37ed0f6d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/37ed0f6d

Branch: refs/heads/master
Commit: 37ed0f6d0815389e0b368bc98b3a01dd02f193ac
Parents: 138b754
Author: tedyu 
Authored: Thu Jan 28 07:06:10 2016 -0800
Committer: tedyu 
Committed: Thu Jan 28 07:06:10 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/37ed0f6d/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 d18ea34..b302d58 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
@@ -67,12 +67,11 @@ public class PutSortReducer extends
 for (List cells: p.getFamilyCellMap().values()) {
   for (Cell cell: cells) {
 KeyValue kv = KeyValueUtil.ensureKeyValue(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) + ")");

hbase git commit: HBASE-15171 Addendum removes extra loop (Yu Li)

[tedyu]

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 
Authored: Thu Jan 28 07:08:03 2016 -0800
Committer: tedyu 
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 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) + ")");