Repository: hbase
Updated Branches:
  refs/heads/branch-1 12478cded -> d502bafad


HBASE-11696 Make CombinedBlockCache resizable.


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

Branch: refs/heads/branch-1
Commit: d502bafad2592e83672f3bbe3bae2e2fb48a19cc
Parents: 12478cd
Author: anoopsjohn <[email protected]>
Authored: Tue Aug 19 17:35:03 2014 +0530
Committer: anoopsjohn <[email protected]>
Committed: Tue Aug 19 17:35:03 2014 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d502bafa/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java
index c89073d..cc53e60 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache;
  * 
  */
 @InterfaceAudience.Private
-public class CombinedBlockCache implements BlockCache, HeapSize {
+public class CombinedBlockCache implements ResizableBlockCache, HeapSize {
   private final LruBlockCache lruCache;
   private final BucketCache bucketCache;
   private final CombinedCacheStats combinedCacheStats;
@@ -207,4 +207,9 @@ public class CombinedBlockCache implements BlockCache, 
HeapSize {
   public BlockCache[] getBlockCaches() {
     return new BlockCache [] {this.lruCache, this.bucketCache};
   }
+
+  @Override
+  public void setMaxSize(long size) {
+    this.lruCache.setMaxSize(size);
+  }
 }
\ No newline at end of file

Reply via email to