ACCUMULO-4463: Merge in master to resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f56636bf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f56636bf Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f56636bf Branch: refs/heads/ACCUMULO-4463 Commit: f56636bf2c505b95e7bf3a3f31a15b7675edce1f Parents: 4276632 Author: Dave Marion <dlmar...@apache.org> Authored: Mon May 22 11:16:28 2017 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Mon May 22 11:16:28 2017 -0400 ---------------------------------------------------------------------- .../file/blockfile/cache/BlockCacheFactoryTest.java | 6 +++--- .../core/file/blockfile/cache/TestLruBlockCache.java | 12 ++++++------ .../org/apache/accumulo/core/file/rfile/RFileTest.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f56636bf/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java index a28014a..e17fb76 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java @@ -29,7 +29,7 @@ public class BlockCacheFactoryTest { @Test public void testCreateLruBlockCacheFactory() throws Exception { - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager.getInstance(cc); @@ -37,7 +37,7 @@ public class BlockCacheFactoryTest { @Test public void testCreateTinyLfuBlockCacheFactory() throws Exception { - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName()); BlockCacheManager.getInstance(cc); @@ -45,7 +45,7 @@ public class BlockCacheFactoryTest { @Test public void testStartWithDefault() throws Exception { - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); BlockCacheManager manager = BlockCacheManager.getInstance(dc); manager.start(dc); Assert.assertNotNull(manager.getBlockCache(CacheType.INDEX)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f56636bf/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 e157d35..966b6eb 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 @@ -74,7 +74,7 @@ public class TestLruBlockCache extends TestCase { long maxSize = 100000; long blockSize = calculateBlockSizeDefault(maxSize, 9); // room for 9, will evict - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); @@ -107,7 +107,7 @@ public class TestLruBlockCache extends TestCase { long maxSize = 1000000; long blockSize = calculateBlockSizeDefault(maxSize, 101); - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); @@ -164,7 +164,7 @@ public class TestLruBlockCache extends TestCase { long maxSize = 100000; long blockSize = calculateBlockSizeDefault(maxSize, 10); - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); @@ -211,7 +211,7 @@ public class TestLruBlockCache extends TestCase { long maxSize = 100000; long blockSize = calculateBlockSizeDefault(maxSize, 10); - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); @@ -275,7 +275,7 @@ public class TestLruBlockCache extends TestCase { long maxSize = 100000; long blockSize = calculateBlockSize(maxSize, 10); - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); @@ -398,7 +398,7 @@ public class TestLruBlockCache extends TestCase { long maxSize = 100000; long blockSize = calculateBlockSize(maxSize, 10); - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); BlockCacheManager manager = BlockCacheManager.getInstance(cc); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f56636bf/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 d1f9a30..ef3fb62 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 @@ -269,7 +269,7 @@ public class RFileTest { in = new FSDataInputStream(bais); fileLength = data.length; - DefaultConfiguration dc = new DefaultConfiguration(); + DefaultConfiguration dc = DefaultConfiguration.getInstance(); ConfigurationCopy cc = new ConfigurationCopy(dc); cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName()); try {
