Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 100B3200C89 for ; Fri, 19 May 2017 19:17:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0EA82160BD2; Fri, 19 May 2017 17:17:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 54EC0160BD4 for ; Fri, 19 May 2017 19:17:27 +0200 (CEST) Received: (qmail 32598 invoked by uid 500); 19 May 2017 17:17:26 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 32466 invoked by uid 99); 19 May 2017 17:17:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 May 2017 17:17:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75804DFF17; Fri, 19 May 2017 17:17:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dlmarion@apache.org To: commits@accumulo.apache.org Date: Fri, 19 May 2017 17:17:28 -0000 Message-Id: <26825d153b6b4603a52a4eb0a6c1f500@git.apache.org> In-Reply-To: <4b24d2542a9e4b18a8cd178682c7f454@git.apache.org> References: <4b24d2542a9e4b18a8cd178682c7f454@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] accumulo git commit: Ignite cache changes due to 4463 merge archived-at: Fri, 19 May 2017 17:17:28 -0000 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 Authored: Fri May 19 13:17:03 2017 -0400 Committer: Dave Marion 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);