Repository: hbase Updated Branches: refs/heads/0.98 a41eca43e -> b8e7c6164
HBASE-11678 BucketCache ramCache fills heap after running a few hours -- 0.98 addendum Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b8e7c616 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b8e7c616 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b8e7c616 Branch: refs/heads/0.98 Commit: b8e7c61645404d50fb247307ea590f71a6a7472e Parents: a41eca4 Author: stack <[email protected]> Authored: Thu Aug 7 14:41:01 2014 -0700 Committer: stack <[email protected]> Committed: Thu Aug 7 14:41:01 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e7c616/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java index b14bd8c..acf43f3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java @@ -1316,9 +1316,6 @@ public class BucketCache implements BlockCache, HeapSize { @Override public int compareTo(CachedBlock other) { -<<<<<<< HEAD - return (int)(this.getOffset() - other.getOffset()); -======= int diff = this.getFilename().compareTo(other.getFilename()); if (diff != 0) return diff; diff = (int)(this.getOffset() - other.getOffset()); @@ -1343,7 +1340,6 @@ public class BucketCache implements BlockCache, HeapSize { } else { return false; } ->>>>>>> 4997908... HBASE-11678 BucketCache ramCache fills heap after running a few hours } }; }
