diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsEvictionFilter.java similarity index 94% rename from modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsEvictionFilter.java rename to modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsEvictionFilter.java index 06bb7f03055d5..f4b2a814f959e 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsEvictionFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/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/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsPerBlockLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsPerBlockLruEvictionPolicy.java similarity index 96% rename from modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsPerBlockLruEvictionPolicy.java rename to modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsPerBlockLruEvictionPolicy.java index 6647cc49ff868..c38275d09a297 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsPerBlockLruEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsPerBlockLruEvictionPolicy.java @@ -33,8 +33,8 @@ /** * GGFS eviction policy which evicts particular blocks. */ -public class CacheIgniteFsPerBlockLruEvictionPolicy implements CacheEvictionPolicy, - CacheIgniteFsPerBlockLruEvictionPolicyMXBean { +public class CacheIgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy, + 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 excludePaths) { this.maxSize = maxSize; this.maxBlocks = maxBlocks; diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsPerBlockLruEvictionPolicyMXBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java similarity index 98% rename from modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsPerBlockLruEvictionPolicyMXBean.java rename to modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java index 0aa973bcda00e..3e1c7c244a842 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgniteFsPerBlockLruEvictionPolicyMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ignitefs/CacheIgfsPerBlockLruEvictionPolicyMXBean.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 index b5f489f722ee3..6511c6b8e983b 100644 --- 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 index 51f6e628d4073..857f7bbd1d93a 100644 --- 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/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java index a19deafa1ff50..46c3301e3bc04 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java @@ -71,7 +71,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb private static GridCacheAdapter 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/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java similarity index 98% rename from modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java rename to modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java index 41996d9d55bae..900558cda7147 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/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/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java deleted file mode 100644 index eed2da2e75396..0000000000000 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.*; -import org.apache.ignite.ignitefs.*; -import org.apache.ignite.internal.processors.fs.*; -import org.apache.ignite.internal.processors.hadoop.*; - -import static org.apache.ignite.testsuites.IgniteHadoopTestSuite.*; - -/** - * Test suite for Hadoop file system over Ignite cache. - * Contains tests which works on Linux and Mac OS platform only. - */ -public class IgniteFsLinuxAndMacOSTestSuite extends TestSuite { - /** - * @return Test suite. - * @throws Exception Thrown in case of the failure. - */ - public static TestSuite suite() throws Exception { - downloadHadoop(); - - GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); - - TestSuite suite = new TestSuite("Ignite GGFS Test Suite For Linux And Mac OS"); - - suite.addTest(new TestSuite(ldr.loadClass(IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.class.getName()))); - - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemExternalPrimarySelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemExternalSecondarySelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemExternalDualSyncSelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.class.getName()))); - - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.class.getName()))); - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.class.getName()))); - - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoopFileSystemIpcCacheSelfTest.class.getName()))); - - suite.addTest(new TestSuite(ldr.loadClass(IgfsHadoop20FileSystemShmemPrimarySelfTest.class.getName()))); - - suite.addTest(IgfsEventsTestSuite.suite()); - - return suite; - } -}