accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlmar...@apache.org
Subject [13/13] accumulo git commit: IGNITE: Changes for successful build
Date Tue, 23 May 2017 12:22:59 GMT
IGNITE: Changes for successful build


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb6cb142
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb6cb142
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb6cb142

Branch: refs/heads/IGNITE
Commit: eb6cb1424ed9aa29fd0029683e8ef7f5729c8195
Parents: 81379f0
Author: Dave Marion <dlmarion@apache.org>
Authored: Tue May 23 08:22:22 2017 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Tue May 23 08:22:22 2017 -0400

----------------------------------------------------------------------
 .../core/file/blockfile/cache/tiered/TieredBlockCache.java       | 4 ++--
 .../accumulo/core/file/blockfile/cache/TestTieredBlockCache.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb6cb142/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 674115f..89e984d 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
@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
 
 public class TieredBlockCache implements BlockCache {
 
-  public static final class Block implements CacheEntry {
-    private volatile byte[] buffer;
+  static final class Block implements CacheEntry {
+    private byte[] buffer;
     private volatile Object index;
 
     public Block(byte[] buffer) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb6cb142/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 12b65c0..ef09c1a 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
@@ -51,7 +51,7 @@ public class TestTieredBlockCache {
 
   @Test
   public void testCacheCreation() throws Exception {
-    DefaultConfiguration dc = new DefaultConfiguration();
+    DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
     cc.set(Property.TSERV_CACHE_MANAGER_IMPL, TieredBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManager.getInstance(cc);
@@ -84,7 +84,7 @@ public class TestTieredBlockCache {
 
   @Test
   public void testOffHeapBlockMigration() throws Exception {
-    DefaultConfiguration dc = new DefaultConfiguration();
+    DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
     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));


Mime
View raw message