# IGNITE-226: WIP.

apache · Feb 13, 2015 · d096d13 · d096d13
1 parent f9facce
commit d096d13
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 80 deletions.
diff --git a/...ignitefs/CacheIgniteFsEvictionFilter.java → ...ion/ignitefs/CacheIgfsEvictionFilter.java b/...ignitefs/CacheIgniteFsEvictionFilter.java → ...ion/ignitefs/CacheIgfsEvictionFilter.java
@@ -25,7 +25,7 @@
 /**
  * GGFS eviction filter which will not evict blocks of particular files.
  */
-public class CacheIgniteFsEvictionFilter implements CacheEvictionFilter {
+public class CacheIgfsEvictionFilter implements CacheEvictionFilter {
     /** {@inheritDoc} */
     @Override public boolean evictAllowed(Cache.Entry entry) {
         Object key = entry.getKey();

diff --git a/...cheIgniteFsPerBlockLruEvictionPolicy.java → ...s/CacheIgfsPerBlockLruEvictionPolicy.java b/...cheIgniteFsPerBlockLruEvictionPolicy.java → ...s/CacheIgfsPerBlockLruEvictionPolicy.java
@@ -33,8 +33,8 @@
 /**
  * GGFS eviction policy which evicts particular blocks.
  */
-public class CacheIgniteFsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<IgfsBlockKey, byte[]>,
-    CacheIgniteFsPerBlockLruEvictionPolicyMXBean {
+public class CacheIgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<IgfsBlockKey, byte[]>,
+    CacheIgfsPerBlockLruEvictionPolicyMXBean {
     /** Maximum size. When reached, eviction begins. */
     private volatile long maxSize;
 
@@ -60,7 +60,7 @@ public class CacheIgniteFsPerBlockLruEvictionPolicy implements CacheEvictionPoli
     /**
      * Default constructor.
      */
-    public CacheIgniteFsPerBlockLruEvictionPolicy() {
+    public CacheIgfsPerBlockLruEvictionPolicy() {
         // No-op.
     }
 
@@ -70,7 +70,7 @@ public CacheIgniteFsPerBlockLruEvictionPolicy() {
      * @param maxSize Maximum size. When reached, eviction begins.
      * @param maxBlocks Maximum amount of blocks. When reached, eviction begins.
      */
-    public CacheIgniteFsPerBlockLruEvictionPolicy(long maxSize, int maxBlocks) {
+    public CacheIgfsPerBlockLruEvictionPolicy(long maxSize, int maxBlocks) {
         this(maxSize, maxBlocks, null);
     }
 
@@ -81,7 +81,7 @@ public CacheIgniteFsPerBlockLruEvictionPolicy(long maxSize, int maxBlocks) {
      * @param maxBlocks Maximum amount of blocks. When reached, eviction begins.
      * @param excludePaths Collection of regex for path which must not be evicted.
      */
-    public CacheIgniteFsPerBlockLruEvictionPolicy(long maxSize, int maxBlocks,
+    public CacheIgfsPerBlockLruEvictionPolicy(long maxSize, int maxBlocks,
         @Nullable Collection<String> excludePaths) {
         this.maxSize = maxSize;
         this.maxBlocks = maxBlocks;

diff --git a/...iteFsPerBlockLruEvictionPolicyMXBean.java → ...eIgfsPerBlockLruEvictionPolicyMXBean.java b/...iteFsPerBlockLruEvictionPolicyMXBean.java → ...eIgfsPerBlockLruEvictionPolicyMXBean.java
@@ -26,7 +26,7 @@
  * MBean for {@code GGFS per-block LRU} eviction policy.
  */
 @MXBeanDescription("MBean for GGFS per-block LRU cache eviction policy.")
-public interface CacheIgniteFsPerBlockLruEvictionPolicyMXBean {
+public interface CacheIgfsPerBlockLruEvictionPolicyMXBean {
     /**
      * Gets maximum allowed size of all blocks in bytes.
      *

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsHelperImpl.java
@@ -30,18 +30,18 @@ public class IgfsHelperImpl implements IgfsHelper {
     @Override public void preProcessCacheConfiguration(CacheConfiguration cfg) {
         CacheEvictionPolicy evictPlc = cfg.getEvictionPolicy();
 
-        if (evictPlc instanceof CacheIgniteFsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null)
-            cfg.setEvictionFilter(new CacheIgniteFsEvictionFilter());
+        if (evictPlc instanceof CacheIgfsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null)
+            cfg.setEvictionFilter(new CacheIgfsEvictionFilter());
     }
 
     /** {@inheritDoc} */
     @Override public void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException {
         CacheEvictionPolicy evictPlc =  cfg.getEvictionPolicy();
 
-        if (evictPlc != null && evictPlc instanceof CacheIgniteFsPerBlockLruEvictionPolicy) {
+        if (evictPlc != null && evictPlc instanceof CacheIgfsPerBlockLruEvictionPolicy) {
             CacheEvictionFilter evictFilter = cfg.getEvictionFilter();
 
-            if (evictFilter != null && !(evictFilter instanceof CacheIgniteFsEvictionFilter))
+            if (evictFilter != null && !(evictFilter instanceof CacheIgfsEvictionFilter))
                 throw new IgniteCheckedException("Eviction filter cannot be set explicitly when using " +
                     "CacheGgfsPerBlockLruEvictionPolicy:" + cfg.getName());
         }

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java
@@ -116,7 +116,7 @@ public final class IgfsImpl implements IgfsEx {
     private Object topic;
 
     /** Eviction policy (if set). */
-    private CacheIgniteFsPerBlockLruEvictionPolicy evictPlc;
+    private CacheIgfsPerBlockLruEvictionPolicy evictPlc;
 
     /**
      * Creates GGFS instance with given context.
@@ -200,8 +200,8 @@ public final class IgfsImpl implements IgfsEx {
             if (F.eq(dataCacheName, cacheCfg.getName())) {
                 CacheEvictionPolicy evictPlc = cacheCfg.getEvictionPolicy();
 
-                if (evictPlc != null & evictPlc instanceof CacheIgniteFsPerBlockLruEvictionPolicy)
-                    this.evictPlc = (CacheIgniteFsPerBlockLruEvictionPolicy)evictPlc;
+                if (evictPlc != null & evictPlc instanceof CacheIgfsPerBlockLruEvictionPolicy)
+                    this.evictPlc = (CacheIgfsPerBlockLruEvictionPolicy)evictPlc;
 
                 break;
             }

diff --git a/.../apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/.../apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
@@ -71,7 +71,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
     private static GridCacheAdapter<IgfsBlockKey, byte[]> dataCache;
 
     /** Eviction policy */
-    private static CacheIgniteFsPerBlockLruEvictionPolicy evictPlc;
+    private static CacheIgfsPerBlockLruEvictionPolicy evictPlc;
 
     /**
      * Start a grid with the primary file system.
@@ -104,7 +104,7 @@ private void startPrimary() throws Exception {
         dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        evictPlc = new CacheIgniteFsPerBlockLruEvictionPolicy();
+        evictPlc = new CacheIgfsPerBlockLruEvictionPolicy();
 
         dataCacheCfg.setEvictionPolicy(evictPlc);
         dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));

diff --git a/.../ignite/testsuites/IgniteFsTestSuite.java → ...gnite/testsuites/IgniteIgfsTestSuite.java b/.../ignite/testsuites/IgniteFsTestSuite.java → ...gnite/testsuites/IgniteIgfsTestSuite.java
@@ -28,7 +28,7 @@
  * Test suite for Hadoop file system over Ignite cache.
  * Contains platform independent tests only.
  */
-public class IgniteFsTestSuite extends TestSuite {
+public class IgniteIgfsTestSuite extends TestSuite {
     /**
      * @return Test suite.
      * @throws Exception Thrown in case of the failure.

diff --git a/...les/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java b/...les/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java