ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [47/57] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP (11)
Date Fri, 13 Feb 2015 10:54:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
index 0d86f5e..737e218 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
@@ -32,7 +32,7 @@ import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * GGFS modes self test.
@@ -48,10 +48,10 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
     private IgfsImpl ggfsSecondary;
 
     /** Default GGFS mode. */
-    private IgniteFsMode mode;
+    private IgfsMode mode;
 
     /** Modes map. */
-    private Map<String, IgniteFsMode> pathModes;
+    private Map<String, IgfsMode> pathModes;
 
     /** Whether to set "null" mode. */
     private boolean setNullMode;
@@ -105,7 +105,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         cacheCfg.setBackups(0);
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -162,7 +162,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         cacheCfg.setBackups(0);
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -199,12 +199,12 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
      * @param modes Modes.
      */
     @SafeVarargs
-    final void pathModes(IgniteBiTuple<String, IgniteFsMode>... modes) {
+    final void pathModes(IgniteBiTuple<String, IgfsMode>... modes) {
         assert modes != null;
 
         pathModes = new LinkedHashMap<>(modes.length, 1.0f);
 
-        for (IgniteBiTuple<String, IgniteFsMode> mode : modes)
+        for (IgniteBiTuple<String, IgfsMode> mode : modes)
             pathModes.put(mode.getKey(), mode.getValue());
     }
 
@@ -487,14 +487,14 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
      * @param expMode Expected mode.
      * @throws Exception If failed.
      */
-    private void checkMode(String pathStr, IgniteFsMode expMode) throws Exception {
+    private void checkMode(String pathStr, IgfsMode expMode) throws Exception {
         assert ggfs != null;
 
         IgfsPath path = new IgfsPath(pathStr);
 
         IgfsModeResolver rslvr = ggfs.modeResolver();
 
-        IgniteFsMode mode = rslvr.resolveMode(path);
+        IgfsMode mode = rslvr.resolveMode(path);
 
         assertEquals(expMode, mode);
     }
@@ -525,7 +525,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         ggfs.mkdirs(dir);
 
         // Create new file.
-        IgniteFsOutputStream os = ggfs.create(file, 1024, true, null, 0, 2048, null);
+        IgfsOutputStream os = ggfs.create(file, 1024, true, null, 0, 2048, null);
 
         os.write(testData1);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapTieredSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapTieredSelfTest.java
index e192f37..d58ea7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapTieredSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapTieredSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.fs;
 
 import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for PRIMARY mode and OFFHEAP_TIERED memory.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapValuesSelfTest.java
index a7dcfe2..c777555 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimaryOffheapValuesSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.fs;
 
 import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for PRIMARY mode and OFFHEAP_VALUES memory.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimarySelfTest.java
index c19dde7..d81e35f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsPrimarySelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.processors.fs;
 
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for PRIMARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
index 9a87a86..11763b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
@@ -135,7 +135,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
 
             cacheCfg.setBackups(0);
-            cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+            cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         }
 
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -203,7 +203,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testCreate() throws Exception {
         IgfsPath path = path("/file");
 
-        try (IgniteFsOutputStream os = ggfs.create(path, false)) {
+        try (IgfsOutputStream os = ggfs.create(path, false)) {
             assert os != null;
 
             IgfsFileImpl info = (IgfsFileImpl)ggfs.info(path);
@@ -308,7 +308,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet()) {
-                    IgniteFsFile info = ggfs.info(path(cur));
+                    IgfsFile info = ggfs.info(path(cur));
 
                     assertNotNull("Expects file exist: " + cur, info);
                     assertTrue("Expects file is a directory: " + cur, info.isDirectory());
@@ -377,7 +377,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return null;
             }
-        }, IgniteFsException.class, null);
+        }, IgfsException.class, null);
 
         ggfs.delete(path("/A1/B1/C1"), false);
         assertNull(ggfs.info(path("/A1/B1/C1")));
@@ -403,7 +403,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return null;
             }
-        }, IgniteFsException.class, null);
+        }, IgfsException.class, null);
         assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/"))));
 
         ggfs.delete(path("/"), true);
@@ -430,7 +430,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         IgfsPath fileSubdir1 = path("/dir1/subdir1/file");
         IgfsPath fileDir2 = path("/dir2/file");
 
-        IgniteFsOutputStream os = ggfs.create(fileDir1, false);
+        IgfsOutputStream os = ggfs.create(fileDir1, false);
         os.write(new byte[1000]);
         os.close();
 
@@ -481,7 +481,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return null;
             }
-        }, IgniteFsException.class, null);
+        }, IgfsException.class, null);
 
         // Move under itself.
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
@@ -490,7 +490,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return null;
             }
-        }, IgniteFsException.class, null);
+        }, IgfsException.class, null);
 
         // Move under itself.
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
@@ -500,7 +500,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return null;
             }
-        }, IgniteFsException.class, null);
+        }, IgfsException.class, null);
 
         ///
         // F6 > Enter > Tab x N times
@@ -538,7 +538,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                     return null;
                 }
-            }, IgniteFsException.class, null);
+            }, IgfsException.class, null);
 
             // Test root rename.
             GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
@@ -547,7 +547,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                     return null;
                 }
-            }, IgniteFsException.class, null);
+            }, IgfsException.class, null);
 
             // Test root rename.
             if (!root.equals(p2)) {
@@ -557,7 +557,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                         return null;
                     }
-                }, IgniteFsException.class, null);
+                }, IgfsException.class, null);
             }
 
             // Test same rename.
@@ -677,7 +677,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testDeleteCacheConsistency() throws Exception {
         IgfsPath path = new IgfsPath("/someFile");
 
-        try (IgniteFsOutputStream out = ggfs.create(path, true)) {
+        try (IgfsOutputStream out = ggfs.create(path, true)) {
             out.write(new byte[10 * 1024 * 1024]);
         }
 
@@ -794,7 +794,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         for (int i = 0; i < buf.length; i++)
             buf[i] = (byte)(i * i);
 
-        IgniteFsOutputStream os = ggfs.create(path, bufSize, true, null, 0, 1024, null);
+        IgfsOutputStream os = ggfs.create(path, bufSize, true, null, 0, 1024, null);
 
         try {
             for (int i = 0; i < cnt; i++)
@@ -845,7 +845,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      */
     private String create(String path, boolean overwrite, String text) throws Exception {
 
-        try (IgniteFsOutputStream out = ggfs.create(path(path), overwrite)) {
+        try (IgfsOutputStream out = ggfs.create(path(path), overwrite)) {
             IOUtils.write(text, out, UTF_8);
         }
 
@@ -865,7 +865,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      */
     private String append(String path, boolean create, String text) throws Exception {
 
-        try (IgniteFsOutputStream out = ggfs.append(path(path), create)) {
+        try (IgfsOutputStream out = ggfs.append(path(path), create)) {
             IOUtils.write(text, out, UTF_8);
         }
 
@@ -919,7 +919,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return false;
             }
-        }, IgniteFsException.class, msg);
+        }, IgfsException.class, msg);
     }
 
     /**
@@ -936,7 +936,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
                 return false;
             }
-        }, IgniteFsException.class, msg);
+        }, IgfsException.class, msg);
     }
 
     /**
@@ -963,11 +963,11 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws IgniteCheckedException If failed.
      */
     private void assertListDir(String path, String... item) throws IgniteCheckedException {
-        Collection<IgniteFsFile> files = ggfs.listFiles(new IgfsPath(path));
+        Collection<IgfsFile> files = ggfs.listFiles(new IgfsPath(path));
 
         List<String> names = new ArrayList<>(item.length);
 
-        for (IgniteFsFile file : files)
+        for (IgfsFile file : files)
             names.add(file.path().name());
 
         Arrays.sort(item);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
index f0631cc..c6a0220 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
@@ -31,7 +31,7 @@ import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for node validation logic in {@link IgfsProcessor}.
@@ -482,7 +482,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     }
 
     /**
-     * @param grpSize Group size to use in {@link org.apache.ignite.ignitefs.IgniteFsGroupDataBlocksKeyMapper}.
+     * @param grpSize Group size to use in {@link org.apache.ignite.ignitefs.IgfsGroupDataBlocksKeyMapper}.
      * @param cacheNames 2 Optional caches names.
      * @return 2 preconfigured data caches.
      */
@@ -498,7 +498,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
             CacheConfiguration dataCache = defaultCacheConfiguration();
 
             dataCache.setName(cacheNames[i]);
-            dataCache.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(grpSize));
+            dataCache.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(grpSize));
             dataCache.setAtomicityMode(TRANSACTIONAL);
             dataCache.setQueryIndexEnabled(false);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index 6af1ef6..92c67de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -129,7 +129,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
 
         cc.setName("partitioned");
         cc.setCacheMode(CacheMode.PARTITIONED);
-        cc.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        cc.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         cc.setBackups(0);
         cc.setAtomicityMode(TRANSACTIONAL);
         cc.setQueryIndexEnabled(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
index 1cba9b4..29b0189 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
@@ -134,7 +134,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
         dataCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         dataCfg.setPreloadMode(SYNC);
-        dataCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        dataCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         dataCfg.setQueryIndexEnabled(false);
         dataCfg.setAtomicityMode(TRANSACTIONAL);
 
@@ -430,7 +430,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
         final IgfsPath path = new IgfsPath("/file");
 
         // This write is expected to be successful.
-        IgniteFsOutputStream os = ggfs(0).create(path, false);
+        IgfsOutputStream os = ggfs(0).create(path, false);
         os.write(chunk(BLOCK_SIZE - 1));
         os.close();
 
@@ -442,7 +442,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
         // This write must fail w/ exception.
         GridTestUtils.assertThrows(log(), new Callable<Object>() {
             @Override public Object call() throws Exception {
-                IgniteFsOutputStream osErr = ggfs(0).append(path, false);
+                IgfsOutputStream osErr = ggfs(0).append(path, false);
 
                 try {
                     osErr.write(chunk(BLOCK_SIZE));
@@ -462,7 +462,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
                     U.closeQuiet(osErr);
                 }
             }
-        }, IgniteFsOutOfSpaceException.class, "Failed to write data block (GGFS maximum data size exceeded) [used=" +
+        }, IgfsOutOfSpaceException.class, "Failed to write data block (GGFS maximum data size exceeded) [used=" +
             ggfsMaxData + ", allowed=" + ggfsMaxData + ']');
     }
 
@@ -485,7 +485,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
         final IgfsPath otherPath = new IgfsPath("/fileOther");
 
         // Fill cache with data up to it's limit.
-        IgniteFsOutputStream os = ggfs.create(path, false);
+        IgfsOutputStream os = ggfs.create(path, false);
         os.write(chunk((int)ggfsMaxData));
         os.close();
 
@@ -789,7 +789,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
             // Actual write.
             for (IgfsBlock block : blocks) {
-                IgniteFsOutputStream os = ggfs(0).append(path, false);
+                IgfsOutputStream os = ggfs(0).append(path, false);
 
                 os.write(chunk(block.length()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
index 934919e..811db2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
@@ -136,7 +136,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
             cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
 
             cacheCfg.setBackups(0);
-            cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(CFG_GRP_SIZE));
+            cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(CFG_GRP_SIZE));
         }
 
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -201,15 +201,15 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
             idx++;
         }
 
-        try (IgniteFsOutputStream out = fs.create(path, 1024, true, affKey, 0, 1024, null)) {
+        try (IgfsOutputStream out = fs.create(path, 1024, true, affKey, 0, 1024, null)) {
             // Write 5M, should be enough to test distribution.
             for (int i = 0; i < 15; i++)
                 out.write(new byte[1024 * 1024]);
         }
 
-        IgniteFsFile info = fs.info(path);
+        IgfsFile info = fs.info(path);
 
-        Collection<IgniteFsBlockLocation> affNodes = fs.affinity(path, 0, info.length());
+        Collection<IgfsBlockLocation> affNodes = fs.affinity(path, 0, info.length());
 
         assertEquals(1, affNodes.size());
         Collection<UUID> nodeIds = F.first(affNodes).nodeIds();
@@ -233,7 +233,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
             IgniteFs fs1 = grid(1).fileSystem("ggfs");
             IgniteFs fs2 = grid(2).fileSystem("ggfs");
 
-            try (IgniteFsOutputStream out = fs0.create(path, 128, false, 1, CFG_GRP_SIZE,
+            try (IgfsOutputStream out = fs0.create(path, 128, false, 1, CFG_GRP_SIZE,
                 F.asMap(IgniteFs.PROP_PREFER_LOCAL_WRITES, "true"))) {
                 // 1.5 blocks
                 byte[] data = new byte[CFG_BLOCK_SIZE * 3 / 2];
@@ -243,7 +243,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
                 out.write(data);
             }
 
-            try (IgniteFsOutputStream out = fs1.append(path, false)) {
+            try (IgfsOutputStream out = fs1.append(path, false)) {
                 // 1.5 blocks.
                 byte[] data = new byte[CFG_BLOCK_SIZE * 3 / 2];
 
@@ -325,7 +325,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
                 IgfsPath f = new IgfsPath(path.parent(), "asdf" + (id > 1 ? "-" + id : ""));
 
-                try (IgniteFsOutputStream out = fs.create(f, 0, true, null, 0, 1024, null)) {
+                try (IgfsOutputStream out = fs.create(f, 0, true, null, 0, 1024, null)) {
                     assertNotNull(out);
 
                     cleanUp.add(f); // Add all created into cleanup list.
@@ -371,7 +371,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
         info("Get stored file info: " + path);
 
-        IgniteFsFile desc = fs.info(path);
+        IgfsFile desc = fs.info(path);
 
         info("Validate stored file info: " + desc);
 
@@ -380,7 +380,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
         if (log.isDebugEnabled())
             log.debug("File descriptor: " + desc);
 
-        Collection<IgniteFsBlockLocation> aff = fs.affinity(path, 0, desc.length());
+        Collection<IgfsBlockLocation> aff = fs.affinity(path, 0, desc.length());
 
         assertFalse("Affinity: " + aff, desc.length() != 0 && aff.isEmpty());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
index 29ddc13..814e7c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for {@link org.apache.ignite.ignitefs.mapreduce.IgfsTask}.
@@ -113,7 +113,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
         dataCacheCfg.setDistributionMode(PARTITIONED_ONLY);
         dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
-        dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(1));
+        dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(1));
         dataCacheCfg.setBackups(0);
         dataCacheCfg.setQueryIndexEnabled(false);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
index 299adc0..15f8d48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -33,7 +33,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Base class for all split resolvers
@@ -65,7 +65,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
         dataCacheCfg.setDistributionMode(NEAR_PARTITIONED);
         dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
-        dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         dataCacheCfg.setBackups(0);
         dataCacheCfg.setQueryIndexEnabled(false);
 
@@ -163,7 +163,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
      * @throws Exception In case of exception.
      */
     protected void write(byte[]... chunks) throws Exception {
-        IgniteFsOutputStream os =  ggfs.create(FILE, true);
+        IgfsOutputStream os =  ggfs.create(FILE, true);
 
         if (chunks != null) {
             for (byte[] chunk : chunks)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
index d837b63..b7b73e5 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteFs.*;
 import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.ignitefs.hadoop.IgfsHadoopParameters.*;
 import static org.apache.ignite.internal.fs.hadoop.IgfsHadoopUtils.*;
 
@@ -271,8 +271,8 @@ public class IgfsHadoopFileSystem extends FileSystem {
             boolean initSecondary = paths.defaultMode() == PROXY;
 
             if (paths.pathModes() != null && !paths.pathModes().isEmpty()) {
-                for (T2<IgfsPath, IgniteFsMode> pathMode : paths.pathModes()) {
-                    IgniteFsMode mode = pathMode.getValue();
+                for (T2<IgfsPath, IgfsMode> pathMode : paths.pathModes()) {
+                    IgfsMode mode = pathMode.getValue();
 
                     initSecondary |= mode == PROXY;
                 }
@@ -485,7 +485,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = mode(path);
+            IgfsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -553,7 +553,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = mode(path);
+            IgfsMode mode = mode(path);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Opening output stream in create [thread=" + Thread.currentThread().getName() + "path=" +
@@ -631,7 +631,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = mode(path);
+            IgfsMode mode = mode(path);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Opening output stream in append [thread=" + Thread.currentThread().getName() +
@@ -697,7 +697,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
         try {
             IgfsPath srcPath = convert(src);
             IgfsPath dstPath = convert(dst);
-            IgniteFsMode mode = mode(srcPath);
+            IgfsMode mode = mode(srcPath);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -724,7 +724,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
         catch (IOException e) {
             // Intentionally ignore GGFS exceptions here to follow Hadoop contract.
             if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null ||
-                !X.hasCause(e.getCause(), IgniteFsException.class)))
+                !X.hasCause(e.getCause(), IgfsException.class)))
                 throw e;
             else
                 return false;
@@ -748,7 +748,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = mode(path);
+            IgfsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -775,7 +775,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
         catch (IOException e) {
             // Intentionally ignore GGFS exceptions here to follow Hadoop contract.
             if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null ||
-                !X.hasCause(e.getCause(), IgniteFsException.class)))
+                !X.hasCause(e.getCause(), IgfsException.class)))
                 throw e;
             else
                 return false;
@@ -793,7 +793,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = mode(path);
+            IgfsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -822,12 +822,12 @@ public class IgfsHadoopFileSystem extends FileSystem {
                 return arr;
             }
             else {
-                Collection<IgniteFsFile> list = rmtClient.listFiles(path);
+                Collection<IgfsFile> list = rmtClient.listFiles(path);
 
                 if (list == null)
                     throw new FileNotFoundException("File " + f + " does not exist.");
 
-                List<IgniteFsFile> files = new ArrayList<>(list);
+                List<IgfsFile> files = new ArrayList<>(list);
 
                 FileStatus[] arr = new FileStatus[files.size()];
 
@@ -907,7 +907,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = mode(path);
+            IgfsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -933,7 +933,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
         catch (IOException e) {
             // Intentionally ignore GGFS exceptions here to follow Hadoop contract.
             if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null ||
-                !X.hasCause(e.getCause(), IgniteFsException.class)))
+                !X.hasCause(e.getCause(), IgfsException.class)))
                 throw e;
             else
                 return false;
@@ -960,7 +960,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
                 return toPrimary(secondaryFs.getFileStatus(toSecondary(f)));
             }
             else {
-                IgniteFsFile info = rmtClient.info(convert(f));
+                IgfsFile info = rmtClient.info(convert(f));
 
                 if (info == null)
                     throw new FileNotFoundException("File not found: " + f);
@@ -1025,7 +1025,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
             else {
                 long now = System.currentTimeMillis();
 
-                List<IgniteFsBlockLocation> affinity = new ArrayList<>(rmtClient.affinity(path, start, len));
+                List<IgfsBlockLocation> affinity = new ArrayList<>(rmtClient.affinity(path, start, len));
 
                 BlockLocation[] arr = new BlockLocation[affinity.size()];
 
@@ -1059,7 +1059,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
      * @param path HDFS path.
      * @return Path mode.
      */
-    public IgniteFsMode mode(Path path) {
+    public IgfsMode mode(Path path) {
         return mode(convert(path));
     }
 
@@ -1069,7 +1069,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
      * @param path GGFS path.
      * @return Path mode.
      */
-    public IgniteFsMode mode(IgfsPath path) {
+    public IgfsMode mode(IgfsPath path) {
         return modeRslvr.resolveMode(path);
     }
 
@@ -1165,7 +1165,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
      * @param block GGFS affinity block location.
      * @return Hadoop affinity block location.
      */
-    private BlockLocation convert(IgniteFsBlockLocation block) {
+    private BlockLocation convert(IgfsBlockLocation block) {
         Collection<String> names = block.names();
         Collection<String> hosts = block.hosts();
 
@@ -1193,7 +1193,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
      * @return Hadoop file status.
      */
     @SuppressWarnings("deprecation")
-    private FileStatus convert(IgniteFsFile file) {
+    private FileStatus convert(IgfsFile file) {
         return new FileStatus(file.length(), file.isDirectory(), getDefaultReplication(),
             file.groupBlockSize(), file.modificationTime(), file.accessTime(), permission(file),
             file.property(PROP_USER_NAME, DFLT_USER_NAME), file.property(PROP_GROUP_NAME, "users"),
@@ -1232,7 +1232,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
      * @param file File info.
      * @return Hadoop permission.
      */
-    private FsPermission permission(IgniteFsFile file) {
+    private FsPermission permission(IgfsFile file) {
         String perm = file.property(PROP_PERMISSION, null);
 
         if (perm == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
index 7d7ba64..42e1716 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteFs.*;
 import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.ignitefs.hadoop.IgfsHadoopParameters.*;
 import static org.apache.ignite.internal.fs.hadoop.IgfsHadoopUtils.*;
 
@@ -266,8 +266,8 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
             boolean initSecondary = paths.defaultMode() == PROXY;
 
             if (paths.pathModes() != null) {
-                for (T2<IgfsPath, IgniteFsMode> pathMode : paths.pathModes()) {
-                    IgniteFsMode mode = pathMode.getValue();
+                for (T2<IgfsPath, IgfsMode> pathMode : paths.pathModes()) {
+                    IgfsMode mode = pathMode.getValue();
 
                     initSecondary |= mode == PROXY;
                 }
@@ -430,7 +430,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = modeRslvr.resolveMode(path);
+            IgfsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY) {
                 FSDataInputStream is = secondaryFs.open(toSecondary(f), bufSize);
@@ -505,7 +505,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = modeRslvr.resolveMode(path);
+            IgfsMode mode = modeRslvr.resolveMode(path);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Opening output stream in create [thread=" + Thread.currentThread().getName() + "path=" +
@@ -604,7 +604,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
         try {
             IgfsPath srcPath = convert(src);
             IgfsPath dstPath = convert(dst);
-            Set<IgniteFsMode> childrenModes = modeRslvr.resolveChildrenModes(srcPath);
+            Set<IgfsMode> childrenModes = modeRslvr.resolveChildrenModes(srcPath);
 
             if (childrenModes.contains(PROXY)) {
                 if (clientLog.isLogEnabled())
@@ -631,8 +631,8 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = modeRslvr.resolveMode(path);
-            Set<IgniteFsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
+            IgfsMode mode = modeRslvr.resolveMode(path);
+            Set<IgfsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
 
             if (childrenModes.contains(PROXY)) {
                 if (clientLog.isLogEnabled())
@@ -676,7 +676,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = modeRslvr.resolveMode(path);
+            IgfsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY) {
                 FileStatus[] arr = secondaryFs.listStatus(toSecondary(f));
@@ -699,12 +699,12 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
                 return arr;
             }
             else {
-                Collection<IgniteFsFile> list = rmtClient.listFiles(path);
+                Collection<IgfsFile> list = rmtClient.listFiles(path);
 
                 if (list == null)
                     throw new FileNotFoundException("File " + f + " does not exist.");
 
-                List<IgniteFsFile> files = new ArrayList<>(list);
+                List<IgfsFile> files = new ArrayList<>(list);
 
                 FileStatus[] arr = new FileStatus[files.size()];
 
@@ -736,7 +736,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
 
         try {
             IgfsPath path = convert(f);
-            IgniteFsMode mode = modeRslvr.resolveMode(path);
+            IgfsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY) {
                 if (clientLog.isLogEnabled())
@@ -766,7 +766,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
             if (mode(f) == PROXY)
                 return toPrimary(secondaryFs.getFileStatus(toSecondary(f)));
             else {
-                IgniteFsFile info = rmtClient.info(convert(f));
+                IgfsFile info = rmtClient.info(convert(f));
 
                 if (info == null)
                     throw new FileNotFoundException("File not found: " + f);
@@ -793,7 +793,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
             else {
                 long now = System.currentTimeMillis();
 
-                List<IgniteFsBlockLocation> affinity = new ArrayList<>(
+                List<IgfsBlockLocation> affinity = new ArrayList<>(
                     rmtClient.affinity(ggfsPath, start, len));
 
                 BlockLocation[] arr = new BlockLocation[affinity.size()];
@@ -819,7 +819,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
      * @param path HDFS path.
      * @return Path mode.
      */
-    public IgniteFsMode mode(Path path) {
+    public IgfsMode mode(Path path) {
         return modeRslvr.resolveMode(convert(path));
     }
 
@@ -914,7 +914,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
      * @param block GGFS affinity block location.
      * @return Hadoop affinity block location.
      */
-    private BlockLocation convert(IgniteFsBlockLocation block) {
+    private BlockLocation convert(IgfsBlockLocation block) {
         Collection<String> names = block.names();
         Collection<String> hosts = block.hosts();
 
@@ -941,7 +941,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
      * @param file GGFS file information.
      * @return Hadoop file status.
      */
-    private FileStatus convert(IgniteFsFile file) {
+    private FileStatus convert(IgfsFile file) {
         return new FileStatus(
             file.length(),
             file.isDirectory(),
@@ -986,7 +986,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
      * @param file File info.
      * @return Hadoop permission.
      */
-    private FsPermission permission(IgniteFsFile file) {
+    private FsPermission permission(IgfsFile file) {
         String perm = file.property(PROP_PERMISSION, null);
 
         if (perm == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoop.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoop.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoop.java
index 5f6e2f7..4960e4d 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoop.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoop.java
@@ -52,7 +52,7 @@ public interface IgfsHadoop {
      * @return Future for info operation.
      * @throws IgniteCheckedException If failed.
      */
-    public IgniteFsFile info(IgfsPath path) throws IgniteCheckedException, IOException;
+    public IgfsFile info(IgfsPath path) throws IgniteCheckedException, IOException;
 
     /**
      * Command to update file properties.
@@ -62,7 +62,7 @@ public interface IgfsHadoop {
      * @return Future for update operation.
      * @throws IgniteCheckedException If failed.
      */
-    public IgniteFsFile update(IgfsPath path, Map<String, String> props) throws IgniteCheckedException, IOException;
+    public IgfsFile update(IgfsPath path, Map<String, String> props) throws IgniteCheckedException, IOException;
 
     /**
      * Sets last access time and last modification time for a file.
@@ -104,7 +104,7 @@ public interface IgfsHadoop {
      * @return Future for affinity command.
      * @throws IgniteCheckedException If failed.
      */
-    public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len) throws IgniteCheckedException,
+    public Collection<IgfsBlockLocation> affinity(IgfsPath path, long start, long len) throws IgniteCheckedException,
         IOException;
 
     /**
@@ -132,7 +132,7 @@ public interface IgfsHadoop {
      * @return Future for listFiles operation.
      * @throws IgniteCheckedException If failed.
      */
-    public Collection<IgniteFsFile> listFiles(IgfsPath path) throws IgniteCheckedException, IOException;
+    public Collection<IgfsFile> listFiles(IgfsPath path) throws IgniteCheckedException, IOException;
 
     /**
      * Command to get directory listing.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopFileSystemWrapper.java
index 3fd59fa..b7a4668 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopFileSystemWrapper.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopFileSystemWrapper.java
@@ -97,12 +97,12 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
      * @param detailMsg Detailed error message.
      * @return Appropriate exception.
      */
-    private IgniteFsException handleSecondaryFsError(IOException e, String detailMsg) {
+    private IgfsException handleSecondaryFsError(IOException e, String detailMsg) {
         boolean wrongVer = X.hasCause(e, RemoteException.class) ||
             (e.getMessage() != null && e.getMessage().contains("Failed on local"));
 
-        IgniteFsException ggfsErr = !wrongVer ? cast(detailMsg, e) :
-            new IgniteFsInvalidHdfsVersionException("HDFS version you are connecting to differs from local " +
+        IgfsException ggfsErr = !wrongVer ? cast(detailMsg, e) :
+            new IgfsInvalidHdfsVersionException("HDFS version you are connecting to differs from local " +
                 "version.", e);
 
 
@@ -116,17 +116,17 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
      * @param e IO exception.
      * @return GGFS exception.
      */
-    public static IgniteFsException cast(String msg, IOException e) {
+    public static IgfsException cast(String msg, IOException e) {
         if (e instanceof FileNotFoundException)
             return new IgfsFileNotFoundException(e);
         else if (e instanceof ParentNotDirectoryException)
-            return new IgniteFsParentNotDirectoryException(msg, e);
+            return new IgfsParentNotDirectoryException(msg, e);
         else if (e instanceof PathIsNotEmptyDirectoryException)
             return new IgfsDirectoryNotEmptyException(e);
         else if (e instanceof PathExistsException)
-            return new IgniteFsPathAlreadyExistsException(msg, e);
+            return new IgfsPathAlreadyExistsException(msg, e);
         else
-            return new IgniteFsException(msg, e);
+            return new IgfsException(msg, e);
     }
 
     /**
@@ -156,7 +156,7 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public IgniteFsFile update(IgfsPath path, Map<String, String> props) {
+    @Nullable @Override public IgfsFile update(IgfsPath path, Map<String, String> props) {
         IgfsHadoopFSProperties props0 = new IgfsHadoopFSProperties(props);
 
         try {
@@ -179,7 +179,7 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
         // Delegate to the secondary file system.
         try {
             if (!fileSys.rename(convert(src), convert(dest)))
-                throw new IgniteFsException("Failed to rename (secondary file system returned false) " +
+                throw new IgfsException("Failed to rename (secondary file system returned false) " +
                     "[src=" + src + ", dest=" + dest + ']');
         }
         catch (IOException e) {
@@ -243,14 +243,14 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(IgfsPath path) {
+    @Override public Collection<IgfsFile> listFiles(IgfsPath path) {
         try {
             FileStatus[] statuses = fileSys.listStatus(convert(path));
 
             if (statuses == null)
                 throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
 
-            Collection<IgniteFsFile> res = new ArrayList<>(statuses.length);
+            Collection<IgfsFile> res = new ArrayList<>(statuses.length);
 
             for (FileStatus status : statuses) {
                 IgfsFileInfo fsInfo = status.isDirectory() ? new IgfsFileInfo(true, properties(status)) :
@@ -314,7 +314,7 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile info(final IgfsPath path) {
+    @Override public IgfsFile info(final IgfsPath path) {
         try {
             final FileStatus status = fileSys.getFileStatus(convert(path));
 
@@ -323,7 +323,7 @@ public class IgfsHadoopWrapper implements Igfs, AutoCloseable {
 
             final Map<String, String> props = properties(status);
 
-            return new IgniteFsFile() {
+            return new IgfsFile() {
                 @Override public IgfsPath path() {
                     return path;
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopInProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopInProc.java
index e3b76f6..f277bd2 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopInProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopInProc.java
@@ -81,7 +81,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile info(IgfsPath path) throws IgniteCheckedException {
+    @Override public IgfsFile info(IgfsPath path) throws IgniteCheckedException {
         try {
             return ggfs.info(path);
         }
@@ -94,7 +94,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile update(IgfsPath path, Map<String, String> props) throws IgniteCheckedException {
+    @Override public IgfsFile update(IgfsPath path, Map<String, String> props) throws IgniteCheckedException {
         try {
             return ggfs.update(path, props);
         }
@@ -175,7 +175,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(IgfsPath path) throws IgniteCheckedException {
+    @Override public Collection<IgfsFile> listFiles(IgfsPath path) throws IgniteCheckedException {
         try {
             return ggfs.listFiles(path);
         }
@@ -218,7 +218,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len)
+    @Override public Collection<IgfsBlockLocation> affinity(IgfsPath path, long start, long len)
         throws IgniteCheckedException {
         try {
             return ggfs.affinity(path, start, len);
@@ -266,7 +266,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     @Override public IgfsHadoopStreamDelegate create(IgfsPath path, boolean overwrite, boolean colocate,
         int replication, long blockSize, @Nullable Map<String, String> props) throws IgniteCheckedException {
         try {
-            IgniteFsOutputStream stream = ggfs.create(path, bufSize, overwrite,
+            IgfsOutputStream stream = ggfs.create(path, bufSize, overwrite,
                 colocate ? ggfs.nextAffinityKey() : null, replication, blockSize, props);
 
             return new IgfsHadoopStreamDelegate(this, stream);
@@ -283,7 +283,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     @Override public IgfsHadoopStreamDelegate append(IgfsPath path, boolean create,
         @Nullable Map<String, String> props) throws IgniteCheckedException {
         try {
-            IgniteFsOutputStream stream = ggfs.append(path, bufSize, create, props);
+            IgfsOutputStream stream = ggfs.append(path, bufSize, create, props);
 
             return new IgfsHadoopStreamDelegate(this, stream);
         }
@@ -339,7 +339,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     @Override public void writeData(IgfsHadoopStreamDelegate delegate, byte[] data, int off, int len)
         throws IOException {
         try {
-            IgniteFsOutputStream stream = delegate.target();
+            IgfsOutputStream stream = delegate.target();
 
             stream.write(data, off, len);
         }
@@ -359,7 +359,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx {
     /** {@inheritDoc} */
     @Override public void flush(IgfsHadoopStreamDelegate delegate) throws IOException {
         try {
-            IgniteFsOutputStream stream = delegate.target();
+            IgfsOutputStream stream = delegate.target();
 
             stream.flush();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopOutProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopOutProc.java
index 844e11c..bf68c44 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopOutProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopOutProc.java
@@ -42,7 +42,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
     private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Long> LONG_RES = createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
-    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgniteFsFile> FILE_RES = createClosure();
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsFile> FILE_RES = createClosure();
 
     /** Expected result is {@code GridGgfsHandshakeResponse} */
     private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
@@ -58,7 +58,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
 
     /** Expected result is {@code GridGgfsFile}. */
     private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
-        Collection<IgniteFsFile>> FILE_COL_RES = createClosure();
+        Collection<IgfsFile>> FILE_COL_RES = createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
     private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
@@ -70,7 +70,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
 
     /** Expected result is {@code GridGgfsFile}. */
     private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
-        Collection<IgniteFsBlockLocation>> BLOCK_LOCATION_COL_RES = createClosure();
+        Collection<IgfsBlockLocation>> BLOCK_LOCATION_COL_RES = createClosure();
 
     /** Grid name. */
     private final String grid;
@@ -165,7 +165,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile info(IgfsPath path) throws IgniteCheckedException {
+    @Override public IgfsFile info(IgfsPath path) throws IgniteCheckedException {
         final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(INFO);
@@ -175,7 +175,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile update(IgfsPath path, Map<String, String> props) throws IgniteCheckedException {
+    @Override public IgfsFile update(IgfsPath path, Map<String, String> props) throws IgniteCheckedException {
         final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(UPDATE);
@@ -220,7 +220,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len)
+    @Override public Collection<IgfsBlockLocation> affinity(IgfsPath path, long start, long len)
         throws IgniteCheckedException {
         final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
@@ -254,7 +254,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(IgfsPath path) throws IgniteCheckedException {
+    @Override public Collection<IgfsFile> listFiles(IgfsPath path) throws IgniteCheckedException {
         final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(LIST_FILES);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopUtils.java
index 255674f..a81ed0c 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopUtils.java
@@ -112,11 +112,11 @@ public class IgfsHadoopUtils {
             return e.getCause(IOException.class);
         else if (e.hasCause(IgfsFileNotFoundException.class))
             return new FileNotFoundException(path); // TODO: Or PathNotFoundException?
-        else if (e.hasCause(IgniteFsParentNotDirectoryException.class))
+        else if (e.hasCause(IgfsParentNotDirectoryException.class))
             return new ParentNotDirectoryException(path);
         else if (path != null && e.hasCause(IgfsDirectoryNotEmptyException.class))
             return new PathIsNotEmptyDirectoryException(path);
-        else if (path != null && e.hasCause(IgniteFsPathAlreadyExistsException.class))
+        else if (path != null && e.hasCause(IgfsPathAlreadyExistsException.class))
             return new PathExistsException(path);
         else
             return new IOException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopWrapper.java
index fa6e789..ce557e3 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopWrapper.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopWrapper.java
@@ -95,9 +95,9 @@ public class IgfsHadoopWrapper implements IgfsHadoop {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile info(final IgfsPath path) throws IOException {
-        return withReconnectHandling(new FileSystemClosure<IgniteFsFile>() {
-            @Override public IgniteFsFile apply(IgfsHadoopEx hadoop, IgfsHandshakeResponse hndResp)
+    @Override public IgfsFile info(final IgfsPath path) throws IOException {
+        return withReconnectHandling(new FileSystemClosure<IgfsFile>() {
+            @Override public IgfsFile apply(IgfsHadoopEx hadoop, IgfsHandshakeResponse hndResp)
                 throws IgniteCheckedException, IOException {
                 return hadoop.info(path);
             }
@@ -105,9 +105,9 @@ public class IgfsHadoopWrapper implements IgfsHadoop {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile update(final IgfsPath path, final Map<String, String> props) throws IOException {
-        return withReconnectHandling(new FileSystemClosure<IgniteFsFile>() {
-            @Override public IgniteFsFile apply(IgfsHadoopEx hadoop, IgfsHandshakeResponse hndResp)
+    @Override public IgfsFile update(final IgfsPath path, final Map<String, String> props) throws IOException {
+        return withReconnectHandling(new FileSystemClosure<IgfsFile>() {
+            @Override public IgfsFile apply(IgfsHadoopEx hadoop, IgfsHandshakeResponse hndResp)
                 throws IgniteCheckedException, IOException {
                 return hadoop.update(path, props);
             }
@@ -146,10 +146,10 @@ public class IgfsHadoopWrapper implements IgfsHadoop {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(final IgfsPath path, final long start,
+    @Override public Collection<IgfsBlockLocation> affinity(final IgfsPath path, final long start,
         final long len) throws IOException {
-        return withReconnectHandling(new FileSystemClosure<Collection<IgniteFsBlockLocation>>() {
-            @Override public Collection<IgniteFsBlockLocation> apply(IgfsHadoopEx hadoop,
+        return withReconnectHandling(new FileSystemClosure<Collection<IgfsBlockLocation>>() {
+            @Override public Collection<IgfsBlockLocation> apply(IgfsHadoopEx hadoop,
                 IgfsHandshakeResponse hndResp) throws IgniteCheckedException, IOException {
                 return hadoop.affinity(path, start, len);
             }
@@ -177,9 +177,9 @@ public class IgfsHadoopWrapper implements IgfsHadoop {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(final IgfsPath path) throws IOException {
-        return withReconnectHandling(new FileSystemClosure<Collection<IgniteFsFile>>() {
-            @Override public Collection<IgniteFsFile> apply(IgfsHadoopEx hadoop,
+    @Override public Collection<IgfsFile> listFiles(final IgfsPath path) throws IOException {
+        return withReconnectHandling(new FileSystemClosure<Collection<IgfsFile>>() {
+            @Override public Collection<IgfsFile> apply(IgfsHadoopEx hadoop,
                 IgfsHandshakeResponse hndResp) throws IgniteCheckedException, IOException {
                 return hadoop.listFiles(path);
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
index 5ca9831..4411b22 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
@@ -161,7 +161,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla
                     ggfs = (IgfsEx)((IgniteEx)ignite).ggfsx(endpoint.ggfs());
 
                 if (ggfs != null && !ggfs.isProxy(split0.file())) {
-                    Collection<IgniteFsBlockLocation> blocks;
+                    Collection<IgfsBlockLocation> blocks;
 
                     try {
                         blocks = ggfs.affinity(new IgfsPath(split0.file()), split0.start(), split0.length());
@@ -182,7 +182,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla
                         List<UUID> bestNodeIds = null;
                         long bestLen = -1L;
 
-                        for (IgniteFsBlockLocation block : blocks) {
+                        for (IgfsBlockLocation block : blocks) {
                             for (UUID blockNodeId : block.nodeIds()) {
                                 if (topIds.contains(blockNodeId)) {
                                     Long oldLen = nodeMap.get(blockNodeId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
index 21ab561..a784e20 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
@@ -400,7 +400,7 @@ public class GridHadoopClientProtocolSelfTest extends GridHadoopAbstractSelfTest
      */
     @SuppressWarnings("ConstantConditions")
     private static void dumpGgfs(IgniteFs ggfs, IgfsPath path) throws Exception {
-        IgniteFsFile file = ggfs.info(path);
+        IgfsFile file = ggfs.info(path);
 
         assert file != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
index 3cf2e9b..6ef574f 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
 
 import java.util.*;
 
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Test suite for GGFS event tests.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
index 72bf454..a6471eb 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Hadoop 2.x compliant file system.
@@ -69,7 +69,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
     private static AbstractFileSystem fs;
 
     /** Default GGFS mode. */
-    protected IgniteFsMode mode;
+    protected IgfsMode mode;
 
     /** Primary file system URI. */
     protected URI primaryFsUri;
@@ -82,7 +82,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
      *
      * @param mode Default GGFS mode.
      */
-    protected IgfsHadoop20FileSystemAbstractSelfTest(IgniteFsMode mode) {
+    protected IgfsHadoop20FileSystemAbstractSelfTest(IgfsMode mode) {
         this.mode = mode;
     }
 
@@ -158,7 +158,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
             cacheCfg.setCacheMode(PARTITIONED);
             cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
             cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-            cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE));
+            cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
             cacheCfg.setBackups(0);
             cacheCfg.setQueryIndexEnabled(false);
             cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -228,7 +228,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE));
+        cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
         cacheCfg.setBackups(0);
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -328,7 +328,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
         for (int i = 0; i < 4; i++) {
             IgniteFs ggfs = grid(i).fileSystem("ggfs");
 
-            IgniteFsMetrics metrics = ggfs.metrics();
+            IgfsMetrics metrics = ggfs.metrics();
 
             used += metrics.localSpaceSize();
             max += metrics.maxSpaceSize();
@@ -1301,13 +1301,13 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
 
             IgfsPath filePath = new IgfsPath("/someFile");
 
-            IgniteFsFile fileInfo = igniteFs.info(filePath);
+            IgfsFile fileInfo = igniteFs.info(filePath);
 
-            Collection<IgniteFsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
+            Collection<IgfsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
 
             assertEquals(1, locations.size());
 
-            IgniteFsBlockLocation location = F.first(locations);
+            IgfsBlockLocation location = F.first(locations);
 
             assertEquals(1, location.nodeIds().size());
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
index cb1b767..f30efd8 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.ignitefs;
 
 import java.util.*;
 
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java
index 42bb786..a35e29c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.ignitefs;
 
 import java.util.*;
 
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
index 9670b3d..bd22437 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
@@ -38,7 +38,7 @@ import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.ignitefs.hadoop.IgfsHadoopParameters.*;
 import static org.apache.ignite.internal.processors.fs.IgfsAbstractSelfTest.*;
 
@@ -98,14 +98,14 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT
     protected static IgfsImpl ggfsSecondary;
 
     /** GGFS mode. */
-    protected final IgniteFsMode mode;
+    protected final IgfsMode mode;
 
     /**
      * Constructor.
      *
      * @param mode GGFS mode.
      */
-    protected IgfsHadoopDualAbstractSelfTest(IgniteFsMode mode) {
+    protected IgfsHadoopDualAbstractSelfTest(IgfsMode mode) {
         this.mode = mode;
         assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
     }
@@ -121,7 +121,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT
      * @return Started grid instance.
      * @throws Exception If failed.
      */
-    protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgniteFsMode mode,
+    protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgfsMode mode,
         @Nullable Igfs secondaryFs, @Nullable Map<String, String> restCfg) throws Exception {
         IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
 
@@ -141,7 +141,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT
         dataCacheCfg.setCacheMode(PARTITIONED);
         dataCacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
         dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(2));
+        dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
         dataCacheCfg.setBackups(0);
         dataCacheCfg.setQueryIndexEnabled(false);
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -222,7 +222,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT
         // Write enough data to the secondary file system.
         final int blockSize = GGFS_BLOCK_SIZE;
 
-        IgniteFsOutputStream out = ggfsSecondary.append(FILE, false);
+        IgfsOutputStream out = ggfsSecondary.append(FILE, false);
 
         int totalWritten = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAsyncSelfTest.java
index aab8823..93110d0 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAsyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAsyncSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.ignitefs;
 
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for DUAL_ASYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualSyncSelfTest.java
index d741ee3..0e5705e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualSyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualSyncSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.ignitefs;
 
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Tests for DUAL_SYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
index 3f2f608..5d3ce4c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 
 /**
  * Test hadoop file system implementation.
@@ -98,7 +98,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
     private static FileSystem fs;
 
     /** Default GGFS mode. */
-    protected final IgniteFsMode mode;
+    protected final IgfsMode mode;
 
     /** Skip embedded mode flag. */
     private final boolean skipEmbed;
@@ -134,7 +134,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
      * @param skipLocShmem Whether to skip local shmem mode.
      * @param skipLocTcp Whether to skip local TCP mode.
      */
-    protected IgfsHadoopFileSystemAbstractSelfTest(IgniteFsMode mode, boolean skipEmbed, boolean skipLocShmem) {
+    protected IgfsHadoopFileSystemAbstractSelfTest(IgfsMode mode, boolean skipEmbed, boolean skipLocShmem) {
         this.mode = mode;
         this.skipEmbed = skipEmbed;
         this.skipLocShmem = skipLocShmem;
@@ -187,7 +187,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
             cacheCfg.setCacheMode(PARTITIONED);
             cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
             cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-            cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE));
+            cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
             cacheCfg.setBackups(0);
             cacheCfg.setQueryIndexEnabled(false);
             cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -296,7 +296,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE));
+        cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
         cacheCfg.setBackups(0);
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -1540,13 +1540,13 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
 
             IgfsPath filePath = new IgfsPath("/someFile");
 
-            IgniteFsFile fileInfo = igniteFs.info(filePath);
+            IgfsFile fileInfo = igniteFs.info(filePath);
 
-            Collection<IgniteFsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
+            Collection<IgfsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
 
             assertEquals(1, locations.size());
 
-            IgniteFsBlockLocation location = F.first(locations);
+            IgfsBlockLocation location = F.first(locations);
 
             assertEquals(1, location.nodeIds().size());
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
index c9d1132..07faa60 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
@@ -96,7 +96,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest {
         cacheCfg.setDistributionMode(PARTITIONED_ONLY);
         cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
         cacheCfg.setEvictionPolicy(null);
-        cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         cacheCfg.setBackups(0);
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
index bc85122..6b44ea1 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
@@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.internal.fs.hadoop.IgfsHadoopUtils.*;
 import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*;
 
@@ -220,7 +220,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes
         dataCacheCfg.setCacheMode(PARTITIONED);
         dataCacheCfg.setDistributionMode(PARTITIONED_ONLY);
         dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
-        dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128));
+        dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
         dataCacheCfg.setBackups(0);
         dataCacheCfg.setQueryIndexEnabled(false);
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19c7b35c/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
index b4e0d17..7ea183c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
@@ -108,7 +108,7 @@ public class IgfsHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTest
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-        cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE));
+        cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
         cacheCfg.setBackups(0);
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);


Mime
View raw message