From ad35eb2b62af1e0f7344ed4bdddbed560640fc5b Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Fri, 6 Jun 2014 17:21:27 -0700 Subject: [PATCH] HBASE-11307 Deprecate SlabCache --- .../src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java | 1 + .../main/java/org/apache/hadoop/hbase/io/hfile/DoubleBlockCache.java | 5 ++++- .../java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java | 1 + .../src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java | 1 + .../main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java | 4 +++- .../org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java index 4807a4d..ad750ec 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java @@ -513,6 +513,7 @@ public class CacheConfig { GLOBAL_BLOCK_CACHE_INSTANCE = lruCache; } } else { + LOG.warn("SlabCache is deprecated. Consider BucketCache as a replacement."); GLOBAL_BLOCK_CACHE_INSTANCE = new DoubleBlockCache( lruCacheSize, slabCacheOffHeapCacheSize, blockSize, blockSize, conf); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/DoubleBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/DoubleBlockCache.java index da7a56e..c576b11 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/DoubleBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/DoubleBlockCache.java @@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.io.HeapSize; +import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache; import org.apache.hadoop.hbase.io.hfile.slab.SlabCache; import org.apache.hadoop.util.StringUtils; @@ -36,8 +37,10 @@ import org.apache.hadoop.util.StringUtils; * cache before looking for the block in the off heap cache. Metrics are the * combined size and hits and misses of both caches. * - **/ + * @deprecated As of 1.0, replaced by {@link org.apache.hadoop.hbase.io.hfile.bucket.BucketCache}. + */ @InterfaceAudience.Private +@Deprecated public class DoubleBlockCache implements ResizableBlockCache, HeapSize { static final Log LOG = LogFactory.getLog(DoubleBlockCache.class.getName()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java index 381c5c9..c1e0cb8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java @@ -54,6 +54,7 @@ import com.google.common.cache.RemovalNotification; * **/ @InterfaceAudience.Private +@Deprecated public class SingleSizeCache implements BlockCache, HeapSize { private final Slab backingStore; private final ConcurrentMap backingMap; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java index 77bea49..cfda695 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java @@ -36,6 +36,7 @@ import com.google.common.base.Preconditions; **/ @InterfaceAudience.Private +@Deprecated class Slab implements org.apache.hadoop.hbase.io.HeapSize { static final Log LOG = LogFactory.getLog(Slab.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java index 561c6f4..3096a77 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java @@ -53,8 +53,10 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; * *

It is configured with a call to {@link #addSlab(int, int)} * - **/ + * @deprecated As of 1.0, replaced by {@link org.apache.hadoop.hbase.io.hfile.bucket.BucketCache}. + */ @InterfaceAudience.Private +@Deprecated public class SlabCache implements SlabItemActionWatcher, BlockCache, HeapSize { private final ConcurrentHashMap backingStore; private final TreeMap sizer; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java index fe121de..a588f06 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabItemActionWatcher.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; * Interface for objects that want to know when actions occur in a SingleSizeCache. * */ @InterfaceAudience.Private +@Deprecated interface SlabItemActionWatcher { /** -- 1.9.0