Repository: accumulo Updated Branches: refs/heads/master 628fbaf0d -> d877a2df2
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d877a2df/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java index 966b6eb..8b7f32b 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java +++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java @@ -20,15 +20,20 @@ package org.apache.accumulo.core.file.blockfile.cache; import java.util.Arrays; import java.util.Random; -import junit.framework.TestCase; - import org.apache.accumulo.core.conf.ConfigurationCopy; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheConfiguration; +import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheManagerFactory; +import org.apache.accumulo.core.file.blockfile.cache.impl.ClassSize; +import org.apache.accumulo.core.file.blockfile.cache.lru.CachedBlock; +import org.apache.accumulo.core.file.blockfile.cache.lru.HeapSize; import org.apache.accumulo.core.file.blockfile.cache.lru.LruBlockCache; import org.apache.accumulo.core.file.blockfile.cache.lru.LruBlockCacheConfiguration; import org.apache.accumulo.core.file.blockfile.cache.lru.LruBlockCacheManager; +import junit.framework.TestCase; + /** * Tests the concurrent LruBlockCache. * <p> @@ -43,11 +48,13 @@ public class TestLruBlockCache extends TestCase { cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(1019)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(1000023)); + cc.set(Property.TSERV_DATACACHE_SIZE, Long.toString(1000027)); + cc.set(Property.TSERV_SUMMARYCACHE_SIZE, Long.toString(1000029)); LruBlockCacheConfiguration.builder(CacheType.INDEX).useEvictionThread(false).minFactor(0.93f).acceptableFactor(0.97f).singleFactor(0.20f) .multiFactor(0.30f).memoryFactor(0.50f).mapConcurrencyLevel(5).buildMap().forEach(cc::set); - String defaultPrefix = BlockCacheConfiguration.getDefaultPrefix(LruBlockCacheConfiguration.PROPERTY_PREFIX); + String defaultPrefix = BlockCacheManager.CACHE_PROPERTY_BASE + LruBlockCacheConfiguration.PROPERTY_PREFIX + ".default."; // this should be overridden by cache type specific setting cc.set(defaultPrefix + LruBlockCacheConfiguration.MEMORY_FACTOR_PROPERTY, "0.6"); @@ -55,7 +62,8 @@ public class TestLruBlockCache extends TestCase { // this is not set for the cache type, so should fall back to default cc.set(defaultPrefix + LruBlockCacheConfiguration.MAP_LOAD_PROPERTY, "0.53"); - LruBlockCacheConfiguration lbcc = new LruBlockCacheConfiguration(cc, CacheType.INDEX); + BlockCacheConfiguration bcc = new BlockCacheConfiguration(cc); + LruBlockCacheConfiguration lbcc = new LruBlockCacheConfiguration(bcc, CacheType.INDEX); assertEquals(false, lbcc.isUseEvictionThread()); assertEquals(0.93f, lbcc.getMinFactor()); @@ -77,10 +85,10 @@ public class TestLruBlockCache extends TestCase { DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); - BlockCacheManager manager = BlockCacheManager.getInstance(cc); + BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize)); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache cache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); Block[] blocks = generateFixedBlocks(10, blockSize, "block"); @@ -110,10 +118,10 @@ public class TestLruBlockCache extends TestCase { DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); - BlockCacheManager manager = BlockCacheManager.getInstance(cc); + BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize)); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache cache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); Block[] blocks = generateRandomBlocks(100, blockSize); @@ -167,11 +175,11 @@ public class TestLruBlockCache extends TestCase { DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); - BlockCacheManager manager = BlockCacheManager.getInstance(cc); + BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize)); LruBlockCacheConfiguration.builder(CacheType.INDEX).useEvictionThread(false).buildMap().forEach(cc::set); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache cache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); @@ -214,12 +222,12 @@ public class TestLruBlockCache extends TestCase { DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); - BlockCacheManager manager = BlockCacheManager.getInstance(cc); + BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize)); LruBlockCacheConfiguration.builder(CacheType.INDEX).useEvictionThread(false).minFactor(0.98f).acceptableFactor(0.99f).singleFactor(0.25f) .multiFactor(0.50f).memoryFactor(0.25f).buildMap().forEach(cc::set); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache cache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); Block[] singleBlocks = generateFixedBlocks(5, 10000, "single"); @@ -278,12 +286,12 @@ public class TestLruBlockCache extends TestCase { DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); - BlockCacheManager manager = BlockCacheManager.getInstance(cc); + BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize)); LruBlockCacheConfiguration.builder(CacheType.INDEX).useEvictionThread(false).minFactor(0.98f).acceptableFactor(0.99f).singleFactor(0.33f) .multiFactor(0.33f).memoryFactor(0.34f).buildMap().forEach(cc::set); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache cache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); Block[] singleBlocks = generateFixedBlocks(5, blockSize, "single"); @@ -401,12 +409,12 @@ public class TestLruBlockCache extends TestCase { DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); - BlockCacheManager manager = BlockCacheManager.getInstance(cc); + BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc); cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize)); LruBlockCacheConfiguration.builder(CacheType.INDEX).useEvictionThread(false).minFactor(0.66f).acceptableFactor(0.99f).singleFactor(0.33f) .multiFactor(0.33f).memoryFactor(0.34f).buildMap().forEach(cc::set); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache cache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); Block[] singleBlocks = generateFixedBlocks(20, blockSize, "single"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d877a2df/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java index ef3fb62..f6b77b2 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java @@ -60,6 +60,8 @@ import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.file.FileSKVIterator; import org.apache.accumulo.core.file.blockfile.cache.BlockCacheManager; import org.apache.accumulo.core.file.blockfile.cache.CacheType; +import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheConfiguration; +import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheManagerFactory; import org.apache.accumulo.core.file.blockfile.cache.lru.LruBlockCache; import org.apache.accumulo.core.file.blockfile.cache.lru.LruBlockCacheManager; import org.apache.accumulo.core.file.blockfile.impl.CachableBlockFile; @@ -273,14 +275,14 @@ public class RFileTest { ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); try { - manager = BlockCacheManager.getInstance(cc); + manager = BlockCacheManagerFactory.getInstance(cc); } catch (Exception e) { throw new RuntimeException("Error creating BlockCacheManager", e); } cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(100000)); cc.set(Property.TSERV_DATACACHE_SIZE, Long.toString(100000000)); cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(100000000)); - manager.start(cc); + manager.start(new BlockCacheConfiguration(cc)); LruBlockCache indexCache = (LruBlockCache) manager.getBlockCache(CacheType.INDEX); LruBlockCache dataCache = (LruBlockCache) manager.getBlockCache(CacheType.DATA); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d877a2df/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index 91b748c..7397c06 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@ -42,6 +42,8 @@ import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.file.blockfile.cache.BlockCache; import org.apache.accumulo.core.file.blockfile.cache.BlockCacheManager; import org.apache.accumulo.core.file.blockfile.cache.CacheType; +import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheConfiguration; +import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheManagerFactory; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.util.Daemon; import org.apache.accumulo.core.util.NamingThreadFactory; @@ -173,12 +175,12 @@ public class TabletServerResourceManager { long totalQueueSize = acuConf.getAsBytes(Property.TSERV_TOTAL_MUTATION_QUEUE_MAX); try { - cacheManager = BlockCacheManager.getInstance(acuConf); + cacheManager = BlockCacheManagerFactory.getInstance(acuConf); } catch (Exception e) { throw new RuntimeException("Error creating BlockCacheManager", e); } - cacheManager.start(acuConf); + cacheManager.start(new BlockCacheConfiguration(acuConf)); _iCache = cacheManager.getBlockCache(CacheType.INDEX); _dCache = cacheManager.getBlockCache(CacheType.DATA);
