You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2016/07/11 23:48:01 UTC
[08/50] [abbrv] hbase git commit: HBASE-16194 Should count in MSLAB
chunk allocation into heap size change when adding duplicate cells, addendum
HBASE-16194 Should count in MSLAB chunk allocation into heap size change when adding duplicate cells, addendum
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/356c1307
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/356c1307
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/356c1307
Branch: refs/heads/HBASE-14850
Commit: 356c1307021e931e871307077f71aab79dc43def
Parents: 0875c35
Author: Yu Li <li...@apache.org>
Authored: Mon Jul 11 22:43:26 2016 +0800
Committer: Yu Li <li...@apache.org>
Committed: Mon Jul 11 22:44:32 2016 +0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/AbstractMemStore.java | 14 +++++++-------
.../hadoop/hbase/regionserver/MemStoreCompactor.java | 4 ++--
.../hadoop/hbase/regionserver/MutableSegment.java | 8 ++++----
.../org/apache/hadoop/hbase/regionserver/Segment.java | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/356c1307/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
index 79e95af..2b9910f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
@@ -109,8 +109,8 @@ public abstract class AbstractMemStore implements MemStore {
@Override
public long add(Cell cell) {
Cell toAdd = maybeCloneWithAllocator(cell);
- boolean useMSLAB = (toAdd != cell);
- return internalAdd(toAdd, useMSLAB);
+ boolean mslabUsed = (toAdd != cell);
+ return internalAdd(toAdd, mslabUsed);
}
/**
@@ -157,8 +157,8 @@ public abstract class AbstractMemStore implements MemStore {
@Override
public long delete(Cell deleteCell) {
Cell toAdd = maybeCloneWithAllocator(deleteCell);
- boolean useMSLAB = (toAdd != deleteCell);
- long s = internalAdd(toAdd, useMSLAB);
+ boolean mslabUsed = (toAdd != deleteCell);
+ long s = internalAdd(toAdd, mslabUsed);
return s;
}
@@ -390,11 +390,11 @@ public abstract class AbstractMemStore implements MemStore {
*
* Callers should ensure they already have the read lock taken
* @param toAdd the cell to add
- * @param useMSLAB whether using MSLAB
+ * @param mslabUsed whether using MSLAB
* @return the heap size change in bytes
*/
- private long internalAdd(final Cell toAdd, final boolean useMSLAB) {
- long s = active.add(toAdd, useMSLAB);
+ private long internalAdd(final Cell toAdd, final boolean mslabUsed) {
+ long s = active.add(toAdd, mslabUsed);
setOldestEditTimeToNow();
checkActiveSize();
return s;
http://git-wip-us.apache.org/repos/asf/hbase/blob/356c1307/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java
index 23f792b..042de0a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreCompactor.java
@@ -197,8 +197,8 @@ class MemStoreCompactor {
// The scanner is doing all the elimination logic
// now we just copy it to the new segment
Cell newKV = result.maybeCloneWithAllocator(c);
- boolean useMSLAB = (newKV != c);
- result.internalAdd(newKV, useMSLAB);
+ boolean mslabUsed = (newKV != c);
+ result.internalAdd(newKV, mslabUsed);
}
kvs.clear();
http://git-wip-us.apache.org/repos/asf/hbase/blob/356c1307/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MutableSegment.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MutableSegment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MutableSegment.java
index 6e54060..e62249a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MutableSegment.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MutableSegment.java
@@ -36,11 +36,11 @@ public class MutableSegment extends Segment {
/**
* Adds the given cell into the segment
* @param cell the cell to add
- * @param useMSLAB whether using MSLAB
+ * @param mslabUsed whether using MSLAB
* @return the change in the heap size
*/
- public long add(Cell cell, boolean useMSLAB) {
- return internalAdd(cell, useMSLAB);
+ public long add(Cell cell, boolean mslabUsed) {
+ return internalAdd(cell, mslabUsed);
}
/**
@@ -91,4 +91,4 @@ public class MutableSegment extends Segment {
tagsPresent = true;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/hbase/blob/356c1307/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java
index adb101e..33c3bfb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java
@@ -250,13 +250,13 @@ public abstract class Segment {
return comparator;
}
- protected long internalAdd(Cell cell, boolean useMSLAB) {
+ protected long internalAdd(Cell cell, boolean mslabUsed) {
boolean succ = getCellSet().add(cell);
long s = AbstractMemStore.heapSizeChange(cell, succ);
// If there's already a same cell in the CellSet and we are using MSLAB, we must count in the
// MSLAB allocation size as well, or else there will be memory leak (occupied heap size larger
// than the counted number)
- if (!succ && useMSLAB) {
+ if (!succ && mslabUsed) {
s += getCellLength(cell);
}
updateMetaInfo(cell, s);
@@ -309,4 +309,4 @@ public abstract class Segment {
res += "Min ts "+getMinTimestamp()+"; ";
return res;
}
-}
\ No newline at end of file
+}