Ignite cache changes due to 4463 merge
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b5aaeea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b5aaeea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b5aaeea Branch: refs/heads/IGNITE Commit: 7b5aaeeaf55c2178644b5e6c674ee20ddcd74d6a Parents: eddb7f3 Author: Dave Marion <dlmar...@apache.org> Authored: Fri May 19 13:17:03 2017 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Fri May 19 13:17:03 2017 -0400 ---------------------------------------------------------------------- .../core/file/blockfile/cache/tiered/TieredBlockCache.java | 7 ++++++- .../file/blockfile/cache/tiered/TieredBlockCacheManager.java | 3 ++- .../core/file/blockfile/cache/TestTieredBlockCache.java | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b5aaeea/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCache.java index f8ef434..13803cb 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCache.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCache.java @@ -102,7 +102,12 @@ public class TieredBlockCache implements BlockCache { public long getMaxSize() { return this.conf.getMaxSize(); } - + + @Override + public long getMaxHeapSize() { + return this.conf.getMaxSize(); + } + public CacheMetrics getCacheMetrics() { return this.metrics; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b5aaeea/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCacheManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCacheManager.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCacheManager.java index d3f1170..b72e394 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCacheManager.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tiered/TieredBlockCacheManager.java @@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.file.blockfile.cache.BlockCache; +import org.apache.accumulo.core.file.blockfile.cache.BlockCacheConfiguration; import org.apache.accumulo.core.file.blockfile.cache.BlockCacheManager; import org.apache.accumulo.core.file.blockfile.cache.CacheType; import org.apache.accumulo.core.util.NamingThreadFactory; @@ -28,7 +29,7 @@ public class TieredBlockCacheManager extends BlockCacheManager { static final int STAT_INTERVAL = 60; public static final String PROPERTY_PREFIX = "tiered"; - private static final String TIERED_PROPERTY_BASE = BlockCacheManager.CACHE_PROPERTY_BASE + PROPERTY_PREFIX + "."; + private static final String TIERED_PROPERTY_BASE = BlockCacheConfiguration.CACHE_PROPERTY_BASE + PROPERTY_PREFIX + "."; public static final String OFF_HEAP_MAX_SIZE_PROPERTY = TIERED_PROPERTY_BASE + "off-heap.max.size"; public static final String OFF_HEAP_BLOCK_SIZE_PROPERTY = TIERED_PROPERTY_BASE + "off-heap.block.size"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b5aaeea/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestTieredBlockCache.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestTieredBlockCache.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestTieredBlockCache.java index 4642224..f5bc2f7 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestTieredBlockCache.java +++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestTieredBlockCache.java @@ -33,7 +33,7 @@ public class TestTieredBlockCache { public void testCacheCreation() throws Exception { DefaultConfiguration dc = new DefaultConfiguration(); ConfigurationCopy cc = new ConfigurationCopy(dc); - cc.set(Property.TSERV_CACHE_FACTORY_IMPL, TieredBlockCacheManager.class.getName()); + cc.set(Property.TSERV_CACHE_MANAGER_IMPL, TieredBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(BLOCKSIZE)); cc.set(Property.TSERV_DATACACHE_SIZE, Long.toString(MAXSIZE)); @@ -63,7 +63,7 @@ public class TestTieredBlockCache { public void testOffHeapBlockMigration() throws Exception { DefaultConfiguration dc = new DefaultConfiguration(); ConfigurationCopy cc = new ConfigurationCopy(dc); - cc.set(Property.TSERV_CACHE_FACTORY_IMPL, TieredBlockCacheManager.class.getName()); + cc.set(Property.TSERV_CACHE_MANAGER_IMPL, TieredBlockCacheManager.class.getName()); cc.set("general.custom.cache.block.tiered.off-heap.max.size", Long.toString(10*1024*1024)); cc.set("general.custom.cache.block.tiered.off-heap.block.sizee", Long.toString(BLOCKSIZE)); BlockCacheManager manager = BlockCacheManager.getInstance(cc);
