ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [44/57] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP (10)
Date Fri, 13 Feb 2015 10:54:54 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsPathSummary.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsPathSummary.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsPathSummary.java
deleted file mode 100644
index a03e704..0000000
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsPathSummary.java
+++ /dev/null
@@ -1,138 +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.ignitefs;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Path summary: total files count, total directories count, total length.
- */
-public class IgniteFsPathSummary implements Externalizable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Path. */
-    private IgniteFsPath path;
-
-    /** File count. */
-    private int filesCnt;
-
-    /** Directories count. */
-    private int dirCnt;
-
-    /** Length consumed. */
-    private long totalLen;
-
-    /**
-     * Empty constructor required by {@link Externalizable}.
-     */
-    public IgniteFsPathSummary() {
-        // No-op.
-    }
-
-    /**
-     * Construct empty path summary.
-     *
-     * @param path Path.
-     */
-    public IgniteFsPathSummary(IgniteFsPath path) {
-        this.path = path;
-    }
-
-    /**
-     * @return Files count.
-     */
-    public int filesCount() {
-        return filesCnt;
-    }
-
-    /**
-     * @param filesCnt Files count.
-     */
-    public void filesCount(int filesCnt) {
-        this.filesCnt = filesCnt;
-    }
-
-    /**
-     * @return Directories count.
-     */
-    public int directoriesCount() {
-        return dirCnt;
-    }
-
-    /**
-     * @param dirCnt Directories count.
-     */
-    public void directoriesCount(int dirCnt) {
-        this.dirCnt = dirCnt;
-    }
-
-    /**
-     * @return Total length.
-     */
-    public long totalLength() {
-        return totalLen;
-    }
-
-    /**
-     * @param totalLen Total length.
-     */
-    public void totalLength(long totalLen) {
-        this.totalLen = totalLen;
-    }
-
-    /**
-     * @return Path for which summary is obtained.
-     */
-    public IgniteFsPath path() {
-        return path;
-    }
-
-    /**
-     * @param path Path for which summary is obtained.
-     */
-    public void path(IgniteFsPath path) {
-        this.path = path;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeInt(filesCnt);
-        out.writeInt(dirCnt);
-        out.writeLong(totalLen);
-
-        path.writeExternal(out);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        filesCnt = in.readInt();
-        dirCnt = in.readInt();
-        totalLen = in.readLong();
-
-        path = new IgniteFsPath();
-        path.readExternal(in);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(IgniteFsPathSummary.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsReader.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsReader.java
deleted file mode 100644
index 6e16792..0000000
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsReader.java
+++ /dev/null
@@ -1,38 +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.ignitefs;
-
-import java.io.*;
-
-/**
- * The simplest data input interface to read from secondary file system in dual modes.
- */
-public interface IgniteFsReader extends Closeable {
-    /**
-     * Read up to the specified number of bytes, from a given position within a file, and return the number of bytes
-     * read.
-     *
-     * @param pos Position in the input stream to seek.
-     * @param buf Buffer into which data is read.
-     * @param off Offset in the buffer from which stream data should be written.
-     * @param len The number of bytes to read.
-     * @return Total number of bytes read into the buffer, or -1 if there is no more data (EOF).
-     * @throws IOException In case of any exception.
-     */
-    public int read(long pos, byte[] buf, int off, int len) throws IOException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsFileRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsFileRange.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsFileRange.java
index ba3966f..39c83af 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsFileRange.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsFileRange.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  */
 public class IgfsFileRange {
     /** File path. */
-    private IgniteFsPath path;
+    private IgfsPath path;
 
     /** Start position. */
     private long start;
@@ -40,7 +40,7 @@ public class IgfsFileRange {
      * @param start Start position.
      * @param len Length.
      */
-    public IgfsFileRange(IgniteFsPath path, long start, long len) {
+    public IgfsFileRange(IgfsPath path, long start, long len) {
         this.path = path;
         this.start = start;
         this.len = len;
@@ -51,7 +51,7 @@ public class IgfsFileRange {
      *
      * @return File path.
      */
-    public IgniteFsPath path() {
+    public IgfsPath path() {
         return path;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsInputStreamJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsInputStreamJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsInputStreamJobAdapter.java
index 775d004..460b04c 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsInputStreamJobAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsInputStreamJobAdapter.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.*;
 import java.io.*;
 
 /**
- * Convenient {@link IgfsJob} adapter. It limits data returned from {@link org.apache.ignite.ignitefs.IgniteFsInputStream} to bytes within
+ * Convenient {@link IgfsJob} adapter. It limits data returned from {@link org.apache.ignite.ignitefs.IgfsInputStream} to bytes within
  * the {@link IgfsFileRange} assigned to the job.
  * <p>
  * Under the covers it simply puts job's {@code GridGgfsInputStream} position to range start and wraps in into
@@ -32,7 +32,7 @@ import java.io.*;
  */
 public abstract class IgfsInputStreamJobAdapter extends IgfsJobAdapter {
     /** {@inheritDoc} */
-    @Override public final Object execute(IgniteFs ggfs, IgfsFileRange range, IgniteFsInputStream in)
+    @Override public final Object execute(IgniteFs ggfs, IgfsFileRange range, IgfsInputStream in)
         throws IgniteException, IOException {
         in.seek(range.start());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsJob.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsJob.java
index 6bf2bb3..6bb00ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsJob.java
@@ -26,8 +26,8 @@ import java.io.*;
  * Defines executable unit for {@link IgfsTask}. Before this job is executed, it is assigned one of the
  * ranges provided by the {@link IgfsRecordResolver} passed to one of the {@code GridGgfs.execute(...)} methods.
  * <p>
- * {@link #execute(org.apache.ignite.IgniteFs, IgfsFileRange, org.apache.ignite.ignitefs.IgniteFsInputStream)} method is given {@link IgfsFileRange} this
- * job is expected to operate on, and already opened {@link org.apache.ignite.ignitefs.IgniteFsInputStream} for the file this range belongs to.
+ * {@link #execute(org.apache.ignite.IgniteFs, IgfsFileRange, org.apache.ignite.ignitefs.IgfsInputStream)} method is given {@link IgfsFileRange} this
+ * job is expected to operate on, and already opened {@link org.apache.ignite.ignitefs.IgfsInputStream} for the file this range belongs to.
  * <p>
  * Note that provided input stream has position already adjusted to range start. However, it will not
  * automatically stop on range end. This is done to provide capability in some cases to look beyond
@@ -52,7 +52,7 @@ public interface IgfsJob {
      * @throws IgniteException If execution failed.
      * @throws IOException If file system operation resulted in IO exception.
      */
-    public Object execute(IgniteFs ggfs, IgfsFileRange range, IgniteFsInputStream in) throws IgniteException,
+    public Object execute(IgniteFs ggfs, IgfsFileRange range, IgfsInputStream in) throws IgniteException,
         IOException;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRangeInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRangeInputStream.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRangeInputStream.java
index 1676432..84ac0be 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRangeInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRangeInputStream.java
@@ -24,14 +24,14 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 
 /**
- * Decorator for regular {@link org.apache.ignite.ignitefs.IgniteFsInputStream} which streams only data within the given range.
+ * Decorator for regular {@link org.apache.ignite.ignitefs.IgfsInputStream} which streams only data within the given range.
  * This stream is used for {@link IgfsInputStreamJobAdapter} convenience adapter to create
  * jobs which will be working only with the assigned range. You can also use it explicitly when
  * working with {@link IgfsJob} directly.
  */
-public final class IgfsRangeInputStream extends IgniteFsInputStream {
+public final class IgfsRangeInputStream extends IgfsInputStream {
     /** Base input stream. */
-    private final IgniteFsInputStream is;
+    private final IgfsInputStream is;
 
     /** Start position. */
     private final long start;
@@ -50,7 +50,7 @@ public final class IgfsRangeInputStream extends IgniteFsInputStream {
      * @param maxLen Maximum stream length.
      * @throws IOException In case of exception.
      */
-    public IgfsRangeInputStream(IgniteFsInputStream is, long start, long maxLen) throws IOException {
+    public IgfsRangeInputStream(IgfsInputStream is, long start, long maxLen) throws IOException {
         if (is == null)
             throw new IllegalArgumentException("Input stream cannot be null.");
 
@@ -85,7 +85,7 @@ public final class IgfsRangeInputStream extends IgniteFsInputStream {
      * @param range File range.
      * @throws IOException In case of exception.
      */
-    public IgfsRangeInputStream(IgniteFsInputStream is, IgfsFileRange range) throws IOException {
+    public IgfsRangeInputStream(IgfsInputStream is, IgfsFileRange range) throws IOException {
         this(is, range.start(), range.length());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRecordResolver.java
index 70bdd35..2b89abc 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsRecordResolver.java
@@ -51,6 +51,6 @@ public interface IgfsRecordResolver extends Serializable {
      * @throws IgniteException If resolve failed.
      * @throws IOException If resolve failed.
      */
-    @Nullable public IgfsFileRange resolveRecords(IgniteFs fs, IgniteFsInputStream stream,
+    @Nullable public IgfsFileRange resolveRecords(IgniteFs fs, IgfsInputStream stream,
         IgfsFileRange suggestedRecord) throws IgniteException, IOException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
index da1228d..1598055 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
@@ -33,7 +33,7 @@ import java.util.*;
  * GGFS task which can be executed on the grid using one of {@code GridGgfs.execute()} methods. Essentially GGFS task
  * is regular {@link org.apache.ignite.compute.ComputeTask} with different map logic. Instead of implementing
  * {@link org.apache.ignite.compute.ComputeTask#map(List, Object)} method to split task into jobs, you must implement
- * {@link IgfsTask#createJob(org.apache.ignite.ignitefs.IgniteFsPath, IgfsFileRange, IgfsTaskArgs)} method.
+ * {@link IgfsTask#createJob(org.apache.ignite.ignitefs.IgfsPath, IgfsFileRange, IgfsTaskArgs)} method.
  * <p>
  * Each file participating in GGFS task is split into {@link IgfsFileRange}s first. Normally range is a number of
  * consequent bytes located on a single node (see {@code IgniteFsGroupDataBlocksKeyMapper}). In case maximum range size
@@ -95,7 +95,7 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>,
 
         Map<UUID, ClusterNode> nodes = mapSubgrid(subgrid);
 
-        for (IgniteFsPath path : args.paths()) {
+        for (IgfsPath path : args.paths()) {
             IgniteFsFile file = fs.info(path);
 
             if (file == null) {
@@ -152,7 +152,7 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>,
      * @return GGFS job. If {@code null} is returned, the passed in file range will be skipped.
      * @throws IgniteException If job creation failed.
      */
-    @Nullable public abstract IgfsJob createJob(IgniteFsPath path, IgfsFileRange range,
+    @Nullable public abstract IgfsJob createJob(IgfsPath path, IgfsFileRange range,
         IgfsTaskArgs<T> args) throws IgniteException;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
index 3f7af29..5ed7283 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
@@ -24,7 +24,7 @@ import java.util.*;
 /**
  * GGFS task arguments. When you initiate new GGFS task execution using one of {@code GridGgfs.execute(...)} methods,
  * all passed parameters are encapsulated in a single {@code GridGgfsTaskArgs} object. Later on this object is
- * passed to {@link IgfsTask#createJob(org.apache.ignite.ignitefs.IgniteFsPath, IgfsFileRange, IgfsTaskArgs)} method.
+ * passed to {@link IgfsTask#createJob(org.apache.ignite.ignitefs.IgfsPath, IgfsFileRange, IgfsTaskArgs)} method.
  * <p>
  * Task arguments encapsulates the following data:
  * <ul>
@@ -49,7 +49,7 @@ public interface IgfsTaskArgs<T> {
      *
      * @return File paths to process.
      */
-    public Collection<IgniteFsPath> paths();
+    public Collection<IgfsPath> paths();
 
     /**
      * Gets record resolver for the task.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
index 64ec8b3..deb1744 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsByteDelimiterRecordResolver.java
@@ -77,7 +77,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsFileRange resolveRecords(IgniteFs fs, IgniteFsInputStream stream,
+    @Override public IgfsFileRange resolveRecords(IgniteFs fs, IgfsInputStream stream,
         IgfsFileRange suggestedRecord) throws IgniteException, IOException {
         long suggestedStart = suggestedRecord.start();
         long suggestedEnd = suggestedStart + suggestedRecord.length();
@@ -145,7 +145,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte
      * @return The first found delimiter.
      * @throws IOException In case of IO exception.
      */
-    @Nullable private IgniteBiTuple<State, Delimiter> findFirstDelimiter(IgniteFsInputStream stream, long startPos)
+    @Nullable private IgniteBiTuple<State, Delimiter> findFirstDelimiter(IgfsInputStream stream, long startPos)
         throws IOException {
         State state;
         Delimiter delim;
@@ -176,7 +176,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte
      * @return Next delimiter and updated map.
      * @throws IOException In case of exception.
      */
-    private Delimiter nextDelimiter(IgniteFsInputStream is, State state) throws IOException {
+    private Delimiter nextDelimiter(IgfsInputStream is, State state) throws IOException {
         assert is != null;
         assert state != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsFixedLengthRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsFixedLengthRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsFixedLengthRecordResolver.java
index ccf2f72..6692cd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsFixedLengthRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/records/IgfsFixedLengthRecordResolver.java
@@ -52,7 +52,7 @@ public class IgfsFixedLengthRecordResolver implements IgfsRecordResolver, Extern
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsFileRange resolveRecords(IgniteFs fs, IgniteFsInputStream stream,
+    @Override public IgfsFileRange resolveRecords(IgniteFs fs, IgfsInputStream stream,
         IgfsFileRange suggestedRecord)
         throws IgniteException, IOException {
         long suggestedEnd = suggestedRecord.start() + suggestedRecord.length();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsControlResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsControlResponse.java
index e2905cc..59ea810 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsControlResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsControlResponse.java
@@ -177,7 +177,7 @@ public class IgfsControlResponse extends IgfsMessage {
     /**
      * @param res Response.
      */
-    public void response(IgniteFsPath res) {
+    public void response(IgfsPath res) {
         resType = RES_TYPE_GGFS_PATH;
 
         this.res = res;
@@ -186,7 +186,7 @@ public class IgfsControlResponse extends IgfsMessage {
     /**
      * @param res Path summary response.
      */
-    public void response(IgniteFsPathSummary res) {
+    public void response(IgfsPathSummary res) {
         resType = RES_TYPE_GGFS_PATH_SUMMARY;
 
         this.res = res;
@@ -204,7 +204,7 @@ public class IgfsControlResponse extends IgfsMessage {
     /**
      * @param res Response.
      */
-    public void paths(Collection<IgniteFsPath> res) {
+    public void paths(Collection<IgfsPath> res) {
         resType = RES_TYPE_COL_GGFS_PATH;
 
         this.res = res;
@@ -261,7 +261,7 @@ public class IgfsControlResponse extends IgfsMessage {
         assert errCode != -1;
 
         if (errCode == ERR_FILE_NOT_FOUND)
-            throw new IgniteFsFileNotFoundException(err);
+            throw new IgfsFileNotFoundException(err);
         else if (errCode == ERR_PATH_ALREADY_EXISTS)
             throw new IgniteFsPathAlreadyExistsException(err);
         else if (errCode == ERR_DIRECTORY_NOT_EMPTY)
@@ -332,7 +332,7 @@ public class IgfsControlResponse extends IgfsMessage {
      */
     @SuppressWarnings("unchecked")
     private int errorCode(IgniteCheckedException e, boolean checkIo) {
-        if (X.hasCause(e, IgniteFsFileNotFoundException.class))
+        if (X.hasCause(e, IgfsFileNotFoundException.class))
             return ERR_FILE_NOT_FOUND;
         else if (e.hasCause(IgniteFsPathAlreadyExistsException.class))
             return ERR_PATH_ALREADY_EXISTS;
@@ -475,7 +475,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 boolean hasVal = in.readBoolean();
 
                 if (hasVal) {
-                    IgniteFsPath path = new IgniteFsPath();
+                    IgfsPath path = new IgfsPath();
 
                     path.readExternal(in);
 
@@ -489,7 +489,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 boolean hasVal = in.readBoolean();
 
                 if (hasVal) {
-                    IgniteFsPathSummary sum = new IgniteFsPathSummary();
+                    IgfsPathSummary sum = new IgfsPathSummary();
 
                     sum.readExternal(in);
 
@@ -578,7 +578,7 @@ public class IgfsControlResponse extends IgfsMessage {
             }
 
             case RES_TYPE_COL_GGFS_PATH: {
-                Collection<IgniteFsPath> paths = null;
+                Collection<IgfsPath> paths = null;
 
                 int size = in.readInt();
 
@@ -586,7 +586,7 @@ public class IgfsControlResponse extends IgfsMessage {
                     paths = new ArrayList<>(size);
 
                     for (int i = 0; i < size; i++) {
-                        IgniteFsPath path = new IgniteFsPath();
+                        IgfsPath path = new IgfsPath();
 
                         path.readExternal(in);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsLogger.java
index a2f32f4..568231f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsLogger.java
@@ -256,7 +256,7 @@ public final class IgfsLogger {
      * @param bufSize Buffer size.
      * @param dataLen Data length.
      */
-    public void logOpen(long streamId, IgniteFsPath path, IgniteFsMode mode, int bufSize, long dataLen) {
+    public void logOpen(long streamId, IgfsPath path, IgniteFsMode mode, int bufSize, long dataLen) {
         addEntry(new Entry(TYPE_OPEN_IN, path.toString(), mode, streamId, bufSize, dataLen, null, null, null, null,
             null, null, null, null, null, null, null, null, null, null));
     }
@@ -272,7 +272,7 @@ public final class IgfsLogger {
      * @param replication Replication factor.
      * @param blockSize Block size.
      */
-    public void logCreate(long streamId, IgniteFsPath path, IgniteFsMode mode, boolean overwrite, int bufSize,
+    public void logCreate(long streamId, IgfsPath path, IgniteFsMode mode, boolean overwrite, int bufSize,
         int replication, long blockSize) {
         addEntry(new Entry(TYPE_OPEN_OUT, path.toString(), mode, streamId, bufSize, null, false, overwrite, replication,
             blockSize, null, null, null, null, null, null, null, null, null, null));
@@ -286,7 +286,7 @@ public final class IgfsLogger {
      * @param mode Mode.
      * @param bufSize Buffer size.
      */
-    public void logAppend(long streamId, IgniteFsPath path, IgniteFsMode mode, int bufSize) {
+    public void logAppend(long streamId, IgfsPath path, IgniteFsMode mode, int bufSize) {
         addEntry(new Entry(TYPE_OPEN_OUT, path.toString(), mode, streamId, bufSize, null, true, null, null, null, null,
             null, null, null, null, null, null, null, null, null));
     }
@@ -378,7 +378,7 @@ public final class IgfsLogger {
      * @param path Path.
      * @param mode Mode.
      */
-    public void logMakeDirectory(IgniteFsPath path, IgniteFsMode mode) {
+    public void logMakeDirectory(IgfsPath path, IgniteFsMode mode) {
         addEntry(new Entry(TYPE_DIR_MAKE, path.toString(), mode, null, null, null, null, null, null, null, null, null,
             null, null, null, null, null, null, null, null));
     }
@@ -390,7 +390,7 @@ public final class IgfsLogger {
      * @param mode Mode.
      * @param files Files.
      */
-    public void logListDirectory(IgniteFsPath path, IgniteFsMode mode, String[] files) {
+    public void logListDirectory(IgfsPath path, IgniteFsMode mode, String[] files) {
         addEntry(new Entry(TYPE_DIR_LIST, path.toString(), mode, null, null, null, null, null, null, null, null, null,
             null, null, null, null, null, null, null, files));
     }
@@ -402,7 +402,7 @@ public final class IgfsLogger {
      * @param mode Mode.
      * @param destPath Destination path.
      */
-    public void logRename(IgniteFsPath path, IgniteFsMode mode, IgniteFsPath destPath) {
+    public void logRename(IgfsPath path, IgniteFsMode mode, IgfsPath destPath) {
         addEntry(new Entry(TYPE_RENAME, path.toString(), mode, null, null, null, null, null, null, null, null, null,
             null, null, null, null, null, destPath.toString(), null, null));
     }
@@ -414,7 +414,7 @@ public final class IgfsLogger {
      * @param mode Mode.
      * @param recursive Recursive flag.
      */
-    public void logDelete(IgniteFsPath path, IgniteFsMode mode, boolean recursive) {
+    public void logDelete(IgfsPath path, IgniteFsMode mode, boolean recursive) {
         addEntry(new Entry(TYPE_DELETE, path.toString(), mode, null, null, null, null, null, null, null, null, null,
             null, null, null, null, null, null, recursive, null));
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsMarshaller.java
index f0679bc..3b5347d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsMarshaller.java
@@ -316,7 +316,7 @@ public class IgfsMarshaller {
      * @param path Path to write.
      * @throws IOException If write failed.
      */
-    private void writePath(ObjectOutput out, @Nullable IgniteFsPath path) throws IOException {
+    private void writePath(ObjectOutput out, @Nullable IgfsPath path) throws IOException {
         out.writeBoolean(path != null);
 
         if (path != null)
@@ -324,15 +324,15 @@ public class IgfsMarshaller {
     }
 
     /**
-     * Reads GGFS path from data input that was written by {@link #writePath(ObjectOutput, org.apache.ignite.ignitefs.IgniteFsPath)}
+     * Reads GGFS path from data input that was written by {@link #writePath(ObjectOutput, org.apache.ignite.ignitefs.IgfsPath)}
      * method.
      *
      * @param in Data input.
      * @return Written path or {@code null}.
      */
-    @Nullable private IgniteFsPath readPath(ObjectInput in) throws IOException {
+    @Nullable private IgfsPath readPath(ObjectInput in) throws IOException {
         if(in.readBoolean()) {
-            IgniteFsPath path = new IgniteFsPath();
+            IgfsPath path = new IgfsPath();
 
             path.readExternal(in);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsPathControlRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsPathControlRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsPathControlRequest.java
index de6505b..d8e4bdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsPathControlRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/fs/common/IgfsPathControlRequest.java
@@ -28,10 +28,10 @@ import java.util.*;
  */
 public class IgfsPathControlRequest extends IgfsMessage {
     /** Main path. */
-    private IgniteFsPath path;
+    private IgfsPath path;
 
     /** Second path, rename command. */
-    private IgniteFsPath destPath;
+    private IgfsPath destPath;
 
     /** Boolean flag, meaning depends on command. */
     private boolean flag;
@@ -66,14 +66,14 @@ public class IgfsPathControlRequest extends IgfsMessage {
     /**
      * @param path Path.
      */
-    public void path(IgniteFsPath path) {
+    public void path(IgfsPath path) {
         this.path = path;
     }
 
     /**
      * @param destPath Destination path (rename only).
      */
-    public void destinationPath(IgniteFsPath destPath) {
+    public void destinationPath(IgfsPath destPath) {
         this.destPath = destPath;
     }
 
@@ -150,14 +150,14 @@ public class IgfsPathControlRequest extends IgfsMessage {
     /**
      * @return Path.
      */
-    public IgniteFsPath path() {
+    public IgfsPath path() {
         return path;
     }
 
     /**
      * @return Destination path (rename only).
      */
-    public IgniteFsPath destinationPath() {
+    public IgfsPath destinationPath() {
         return destPath;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
index 95cc9f3..1686fea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
@@ -57,7 +57,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
-        Collection<IgniteFsPath> paths, @Nullable T arg) {
+        Collection<IgfsPath> paths, @Nullable T arg) {
         try {
             return saveOrGet(ggfs.executeAsync(task, rslvr, paths, arg));
         }
@@ -68,7 +68,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
-        Collection<IgniteFsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
+        Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
         try {
             return saveOrGet(ggfs.executeAsync(task, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg));
         }
@@ -79,7 +79,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls,
-        @Nullable IgfsRecordResolver rslvr, Collection<IgniteFsPath> paths, @Nullable T arg) {
+        @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) {
         try {
             return saveOrGet(ggfs.executeAsync(taskCls, rslvr, paths, arg));
         }
@@ -90,7 +90,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls,
-        @Nullable IgfsRecordResolver rslvr, Collection<IgniteFsPath> paths, boolean skipNonExistentFiles,
+        @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles,
         long maxRangeLen, @Nullable T arg) {
         try {
             return saveOrGet(ggfs.executeAsync(taskCls, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg));
@@ -116,18 +116,18 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path, int bufSize,
+    @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize,
         int seqReadsBeforePrefetch) {
         return ggfs.open(path, bufSize, seqReadsBeforePrefetch);
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path) {
+    @Override public IgfsInputStreamAdapter open(IgfsPath path) {
         return ggfs.open(path);
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path, int bufSize) {
+    @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize) {
         return ggfs.open(path, bufSize);
     }
 
@@ -172,7 +172,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     }
 
     /** {@inheritDoc} */
-    @Override public boolean evictExclude(IgniteFsPath path, boolean primary) {
+    @Override public boolean evictExclude(IgfsPath path, boolean primary) {
         return ggfs.evictExclude(path, primary);
     }
 
@@ -197,50 +197,50 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsPathSummary summary(IgniteFsPath path) {
+    @Override public IgfsPathSummary summary(IgfsPath path) {
         return ggfs.summary(path);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream create(IgniteFsPath path, boolean overwrite) {
+    @Override public IgniteFsOutputStream create(IgfsPath path, boolean overwrite) {
         return ggfs.create(path, overwrite);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication,
+    @Override public IgniteFsOutputStream create(IgfsPath path, int bufSize, boolean overwrite, int replication,
         long blockSize, @Nullable Map<String, String> props) {
         return ggfs.create(path, bufSize, overwrite, replication, blockSize, props);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite,
+    @Override public IgniteFsOutputStream create(IgfsPath path, int bufSize, boolean overwrite,
         @Nullable IgniteUuid affKey, int replication, long blockSize, @Nullable Map<String, String> props) {
         return ggfs.create(path, bufSize, overwrite, affKey, replication, blockSize, props);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream append(IgniteFsPath path, boolean create) {
+    @Override public IgniteFsOutputStream append(IgfsPath path, boolean create) {
         return ggfs.append(path, create);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream append(IgniteFsPath path, int bufSize, boolean create,
+    @Override public IgniteFsOutputStream append(IgfsPath path, int bufSize, boolean create,
         @Nullable Map<String, String> props) {
         return ggfs.append(path, bufSize, create, props);
     }
 
     /** {@inheritDoc} */
-    @Override public void setTimes(IgniteFsPath path, long accessTime, long modificationTime) {
+    @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) {
         ggfs.setTimes(path, accessTime, modificationTime);
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len) {
+    @Override public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len) {
         return ggfs.affinity(path, start, len);
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len, long maxLen) {
+    @Override public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len, long maxLen) {
         return ggfs.affinity(path, start, len, maxLen);
     }
 
@@ -255,52 +255,52 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     }
 
     /** {@inheritDoc} */
-    @Override public long size(IgniteFsPath path) {
+    @Override public long size(IgfsPath path) {
         return ggfs.size(path);
     }
 
     /** {@inheritDoc} */
-    @Override public boolean exists(IgniteFsPath path) {
+    @Override public boolean exists(IgfsPath path) {
         return ggfs.exists(path);
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) {
+    @Nullable @Override public IgniteFsFile update(IgfsPath path, Map<String, String> props) {
         return ggfs.update(path, props);
     }
 
     /** {@inheritDoc} */
-    @Override public void rename(IgniteFsPath src, IgniteFsPath dest) {
+    @Override public void rename(IgfsPath src, IgfsPath dest) {
         ggfs.rename(src, dest);
     }
 
     /** {@inheritDoc} */
-    @Override public boolean delete(IgniteFsPath path, boolean recursive) {
+    @Override public boolean delete(IgfsPath path, boolean recursive) {
         return ggfs.delete(path, recursive);
     }
 
     /** {@inheritDoc} */
-    @Override public void mkdirs(IgniteFsPath path) {
+    @Override public void mkdirs(IgfsPath path) {
         ggfs.mkdirs(path);
     }
 
     /** {@inheritDoc} */
-    @Override public void mkdirs(IgniteFsPath path, @Nullable Map<String, String> props) {
+    @Override public void mkdirs(IgfsPath path, @Nullable Map<String, String> props) {
         ggfs.mkdirs(path, props);
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsPath> listPaths(IgniteFsPath path) {
+    @Override public Collection<IgfsPath> listPaths(IgfsPath path) {
         return ggfs.listPaths(path);
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) {
+    @Override public Collection<IgniteFsFile> listFiles(IgfsPath path) {
         return ggfs.listFiles(path);
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public IgniteFsFile info(IgniteFsPath path) {
+    @Nullable @Override public IgniteFsFile info(IgfsPath path) {
         return ggfs.info(path);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
index f28cc59..4a1c976 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
@@ -381,8 +381,8 @@ public class IgfsDataManager extends IgfsManager {
      * @return Requested data block or {@code null} if nothing found.
      * @throws IgniteCheckedException If failed.
      */
-    @Nullable public IgniteInternalFuture<byte[]> dataBlock(final IgfsFileInfo fileInfo, final IgniteFsPath path,
-        final long blockIdx, @Nullable final IgniteFsReader secReader)
+    @Nullable public IgniteInternalFuture<byte[]> dataBlock(final IgfsFileInfo fileInfo, final IgfsPath path,
+        final long blockIdx, @Nullable final IgfsReader secReader)
         throws IgniteCheckedException {
         //assert validTxState(any); // Allow this method call for any transaction state.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsEx.java
index 14b31f8..ab68423 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsEx.java
@@ -47,14 +47,14 @@ public interface IgfsEx extends IgniteFs {
     public IgfsPaths proxyPaths();
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path, int bufSize, int seqReadsBeforePrefetch)
+    @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize, int seqReadsBeforePrefetch)
         throws IgniteException;
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path) throws IgniteException;
+    @Override public IgfsInputStreamAdapter open(IgfsPath path) throws IgniteException;
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path, int bufSize) throws IgniteException;
+    @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize) throws IgniteException;
 
     /**
      * Gets global space counters.
@@ -124,7 +124,7 @@ public interface IgfsEx extends IgniteFs {
      * @param primary Whether the mode is PRIMARY.
      * @return {@code True} if path is excluded from evictions.
      */
-    public boolean evictExclude(IgniteFsPath path, boolean primary);
+    public boolean evictExclude(IgfsPath path, boolean primary);
 
     /**
      * Get next affinity key.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileImpl.java
index dfc4a79..0fa20bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileImpl.java
@@ -33,7 +33,7 @@ public final class IgfsFileImpl implements IgniteFsFile, Externalizable {
     private static final long serialVersionUID = 0L;
 
     /** Path to this file. */
-    private IgniteFsPath path;
+    private IgfsPath path;
 
     /** File id. */
     private IgniteUuid fileId;
@@ -68,7 +68,7 @@ public final class IgfsFileImpl implements IgniteFsFile, Externalizable {
      *
      * @param path Path.
      */
-    public IgfsFileImpl(IgniteFsPath path, IgfsFileInfo info, long globalGrpBlockSize) {
+    public IgfsFileImpl(IgfsPath path, IgfsFileInfo info, long globalGrpBlockSize) {
         A.notNull(path, "path");
         A.notNull(info, "info");
 
@@ -98,7 +98,7 @@ public final class IgfsFileImpl implements IgniteFsFile, Externalizable {
      * @param path Path.
      * @param entry Listing entry.
      */
-    public IgfsFileImpl(IgniteFsPath path, IgfsListingEntry entry, long globalGrpSize) {
+    public IgfsFileImpl(IgfsPath path, IgfsListingEntry entry, long globalGrpSize) {
         A.notNull(path, "path");
         A.notNull(entry, "entry");
 
@@ -118,7 +118,7 @@ public final class IgfsFileImpl implements IgniteFsFile, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsPath path() {
+    @Override public IgfsPath path() {
         return path;
     }
 
@@ -208,7 +208,7 @@ public final class IgfsFileImpl implements IgniteFsFile, Externalizable {
      * @param in Data input.
      */
     @Override public void readExternal(ObjectInput in) throws IOException {
-        path = new IgniteFsPath();
+        path = new IgfsPath();
 
         path.readExternal(in);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
index 868676a..99e5ddf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
@@ -80,7 +80,7 @@ public final class IgfsFileInfo implements Externalizable {
      * Original file path. This is a helper field used only in some
      * operations like delete.
      */
-    private IgniteFsPath path;
+    private IgfsPath path;
 
     /**
      * {@link Externalizable} support.
@@ -468,7 +468,7 @@ public final class IgfsFileInfo implements Externalizable {
     /**
      * @return Original file path. This is a helper field used only in some operations like delete.
      */
-    public IgniteFsPath path() {
+    public IgfsPath path() {
         return path;
     }
 
@@ -501,7 +501,7 @@ public final class IgfsFileInfo implements Externalizable {
         accessTime = in.readLong();
         modificationTime = in.readLong();
         evictExclude = in.readBoolean();
-        path = (IgniteFsPath)in.readObject();
+        path = (IgfsPath)in.readObject();
     }
 
     /** {@inheritDoc} */
@@ -550,7 +550,7 @@ public final class IgfsFileInfo implements Externalizable {
          * @param path A new path value.
          * @return This builder instance (for chaining).
          */
-        public Builder path(IgniteFsPath path) {
+        public Builder path(IgfsPath path) {
             info.path = path;
 
             return this;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileWorkerBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileWorkerBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileWorkerBatch.java
index 07c1d1b..e063404 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileWorkerBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileWorkerBatch.java
@@ -44,7 +44,7 @@ public class IgfsFileWorkerBatch {
     private final BlockingDeque<IgfsFileWorkerTask> queue = new LinkedBlockingDeque<>();
 
     /** Path to the file in the primary file system. */
-    private final IgniteFsPath path;
+    private final IgfsPath path;
 
     /** Output stream to the file. */
     private final OutputStream out;
@@ -61,7 +61,7 @@ public class IgfsFileWorkerBatch {
      * @param path Path to the file in the primary file system.
      * @param out Output stream opened to that file.
      */
-    IgfsFileWorkerBatch(IgniteFsPath path, OutputStream out) {
+    IgfsFileWorkerBatch(IgfsPath path, OutputStream out) {
         assert path != null;
         assert out != null;
 
@@ -191,7 +191,7 @@ public class IgfsFileWorkerBatch {
      *
      * @return Primary file system path.
      */
-    IgniteFsPath path() {
+    IgfsPath path() {
         return path;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java
----------------------------------------------------------------------
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 c7a56b6..bd7538d 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
@@ -89,13 +89,13 @@ public final class IgfsImpl implements IgfsEx {
     private final IgfsModeResolver modeRslvr;
 
     /** Connection to the secondary file system. */
-    private IgniteFsFileSystem secondaryFs;
+    private Igfs secondaryFs;
 
     /** Busy lock. */
     private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
 
     /** Writers map. */
-    private final ConcurrentHashMap8<IgniteFsPath, IgfsFileWorker> workerMap = new ConcurrentHashMap8<>();
+    private final ConcurrentHashMap8<IgfsPath, IgfsFileWorker> workerMap = new ConcurrentHashMap8<>();
 
     /** Delete futures. */
     private final ConcurrentHashMap8<IgniteUuid, GridFutureAdapter<Object>> delFuts = new ConcurrentHashMap8<>();
@@ -171,7 +171,7 @@ public final class IgfsImpl implements IgfsEx {
             }
         }
 
-        ArrayList<T2<IgniteFsPath, IgniteFsMode>> modes = null;
+        ArrayList<T2<IgfsPath, IgniteFsMode>> modes = null;
 
         if (!cfgModes.isEmpty()) {
             modes = new ArrayList<>(cfgModes.size());
@@ -180,7 +180,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgniteFsMode mode0 = secondaryFs == null ? mode.getValue() == PROXY ? PROXY : PRIMARY : mode.getValue();
 
                 try {
-                    modes.add(new T2<>(new IgniteFsPath(mode.getKey()), mode0));
+                    modes.add(new T2<>(new IgfsPath(mode.getKey()), mode0));
                 }
                 catch (IllegalArgumentException e) {
                     throw new IgniteCheckedException("Invalid path found in mode pattern: " + mode.getKey(), e);
@@ -264,7 +264,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return Created batch.
      * @throws IgniteCheckedException In case new batch cannot be created.
      */
-    private IgfsFileWorkerBatch newBatch(final IgniteFsPath path, OutputStream out) throws IgniteCheckedException {
+    private IgfsFileWorkerBatch newBatch(final IgfsPath path, OutputStream out) throws IgniteCheckedException {
         assert path != null;
         assert out != null;
 
@@ -327,15 +327,15 @@ public final class IgfsImpl implements IgfsEx {
      *
      * @param paths Paths to check.
      */
-    void await(IgniteFsPath... paths) {
+    void await(IgfsPath... paths) {
         assert paths != null;
 
-        for (Map.Entry<IgniteFsPath, IgfsFileWorker> workerEntry : workerMap.entrySet()) {
-            IgniteFsPath workerPath = workerEntry.getKey();
+        for (Map.Entry<IgfsPath, IgfsFileWorker> workerEntry : workerMap.entrySet()) {
+            IgfsPath workerPath = workerEntry.getKey();
 
             boolean await = false;
 
-            for (IgniteFsPath path : paths) {
+            for (IgfsPath path : paths) {
                 if (workerPath.isSubDirectoryOf(path) || workerPath.isSame(path))  {
                     await = true;
 
@@ -469,7 +469,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean exists(IgniteFsPath path) {
+    @Override public boolean exists(IgfsPath path) {
         try {
             A.notNull(path, "path");
 
@@ -510,7 +510,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile info(IgniteFsPath path) {
+    @Override public IgniteFsFile info(IgfsPath path) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -542,7 +542,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsPathSummary summary(IgniteFsPath path) {
+    @Override public IgfsPathSummary summary(IgfsPath path) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -553,9 +553,9 @@ public final class IgfsImpl implements IgfsEx {
                 IgniteUuid fileId = meta.fileId(path);
 
                 if (fileId == null)
-                    throw new IgniteFsFileNotFoundException("Failed to get path summary (path not found): " + path);
+                    throw new IgfsFileNotFoundException("Failed to get path summary (path not found): " + path);
 
-                IgniteFsPathSummary sum = new IgniteFsPathSummary(path);
+                IgfsPathSummary sum = new IgfsPathSummary(path);
 
                 summary0(fileId, sum);
 
@@ -573,7 +573,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) {
+    @Override public IgniteFsFile update(IgfsPath path, Map<String, String> props) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -632,7 +632,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public void rename(IgniteFsPath src, IgniteFsPath dest) {
+    @Override public void rename(IgfsPath src, IgfsPath dest) {
         if (enterBusy()) {
             try {
                 A.notNull(src, "src");
@@ -673,7 +673,7 @@ public final class IgfsImpl implements IgfsEx {
                     return;
                 }
 
-                IgniteFsPath destParent = dest.parent();
+                IgfsPath destParent = dest.parent();
 
                 // Resolve source file info.
                 FileDescriptor srcDesc = getFileDescriptor(src);
@@ -683,7 +683,7 @@ public final class IgfsImpl implements IgfsEx {
                     if (mode == PRIMARY)
                         checkConflictWithPrimary(src);
 
-                    throw new IgniteFsFileNotFoundException("Failed to rename (source path not found): " + src);
+                    throw new IgfsFileNotFoundException("Failed to rename (source path not found): " + src);
                 }
 
                 String srcFileName = src.name();
@@ -703,7 +703,7 @@ public final class IgfsImpl implements IgfsEx {
 
                     // Destination directory doesn't exist.
                     if (destDesc == null)
-                        throw new IgniteFsFileNotFoundException("Failed to rename (destination directory does not " +
+                        throw new IgfsFileNotFoundException("Failed to rename (destination directory does not " +
                             "exist): " + dest);
 
                     destFileName = dest.name();
@@ -723,7 +723,7 @@ public final class IgfsImpl implements IgfsEx {
                     if (evts.isRecordable(EVT_GGFS_FILE_RENAMED))
                         evts.record(new IgniteFsEvent(
                             src,
-                            newDest ? dest : new IgniteFsPath(dest, destFileName),
+                            newDest ? dest : new IgfsPath(dest, destFileName),
                             localNode(),
                             EVT_GGFS_FILE_RENAMED));
                 }
@@ -744,7 +744,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean delete(IgniteFsPath path, boolean recursive) {
+    @Override public boolean delete(IgfsPath path, boolean recursive) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -811,9 +811,9 @@ public final class IgfsImpl implements IgfsEx {
      *      {@code recursive} flag is false, will return {@code false}.
      * @throws IgniteCheckedException In case of error.
      */
-    private boolean delete0(FileDescriptor desc, @Nullable IgniteFsPath parentPath, boolean recursive)
+    private boolean delete0(FileDescriptor desc, @Nullable IgfsPath parentPath, boolean recursive)
         throws IgniteCheckedException {
-        IgniteFsPath curPath = parentPath == null ? new IgniteFsPath() : new IgniteFsPath(parentPath, desc.fileName);
+        IgfsPath curPath = parentPath == null ? new IgfsPath() : new IgfsPath(parentPath, desc.fileName);
 
         if (desc.isFile) {
             deleteFile(curPath, desc, true);
@@ -843,12 +843,12 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public void mkdirs(IgniteFsPath path) {
+    @Override public void mkdirs(IgfsPath path) {
         mkdirs(path, null);
     }
 
     /** {@inheritDoc} */
-    @Override public void mkdirs(IgniteFsPath path, @Nullable Map<String, String> props)  {
+    @Override public void mkdirs(IgfsPath path, @Nullable Map<String, String> props)  {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -881,7 +881,7 @@ public final class IgfsImpl implements IgfsEx {
 
                 IgniteUuid parentId = ROOT_ID;
 
-                IgniteFsPath curPath = path.root();
+                IgfsPath curPath = path.root();
 
                 for (int step = 0, size = components.size(); step < size; step++) {
                     IgniteUuid fileId = ids.get(step + 1); // Skip the first ROOT element.
@@ -891,7 +891,7 @@ public final class IgfsImpl implements IgfsEx {
 
                         String fileName = components.get(step); // Get current component name.
 
-                        curPath = new IgniteFsPath(curPath, fileName);
+                        curPath = new IgfsPath(curPath, fileName);
 
                         try {
                             // Fails only if parent is not a directory or if modified concurrently.
@@ -938,7 +938,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsPath> listPaths(final IgniteFsPath path) {
+    @Override public Collection<IgfsPath> listPaths(final IgfsPath path) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -958,9 +958,9 @@ public final class IgfsImpl implements IgfsEx {
                 if (childrenModes.contains(DUAL_SYNC) || childrenModes.contains(DUAL_ASYNC)) {
                     assert secondaryFs != null;
 
-                    Collection<IgniteFsPath> children = secondaryFs.listPaths(path);
+                    Collection<IgfsPath> children = secondaryFs.listPaths(path);
 
-                    for (IgniteFsPath child : children)
+                    for (IgfsPath child : children)
                         files.add(child.name());
                 }
 
@@ -971,12 +971,12 @@ public final class IgfsImpl implements IgfsEx {
                 else if (mode == PRIMARY) {
                     checkConflictWithPrimary(path);
 
-                    throw new IgniteFsFileNotFoundException("Failed to list files (path not found): " + path);
+                    throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
                 }
 
-                return F.viewReadOnly(files, new C1<String, IgniteFsPath>() {
-                    @Override public IgniteFsPath apply(String e) {
-                        return new IgniteFsPath(path, e);
+                return F.viewReadOnly(files, new C1<String, IgfsPath>() {
+                    @Override public IgfsPath apply(String e) {
+                        return new IgfsPath(path, e);
                     }
                 });
             }
@@ -992,7 +992,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(final IgniteFsPath path) {
+    @Override public Collection<IgniteFsFile> listFiles(final IgfsPath path) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -1036,7 +1036,7 @@ public final class IgfsImpl implements IgfsEx {
 
                         // Perform the listing.
                         for (Map.Entry<String, IgfsListingEntry> e : info.listing().entrySet()) {
-                            IgniteFsPath p = new IgniteFsPath(path, e.getKey());
+                            IgfsPath p = new IgfsPath(path, e.getKey());
 
                             files.add(new IgfsFileImpl(p, e.getValue(), data.groupBlockSize()));
                         }
@@ -1045,7 +1045,7 @@ public final class IgfsImpl implements IgfsEx {
                 else if (mode == PRIMARY) {
                     checkConflictWithPrimary(path);
 
-                    throw new IgniteFsFileNotFoundException("Failed to list files (path not found): " + path);
+                    throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
                 }
 
                 return files;
@@ -1072,17 +1072,17 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path) {
+    @Override public IgfsInputStreamAdapter open(IgfsPath path) {
         return open(path, cfg.getStreamBufferSize(), cfg.getSequentialReadsBeforePrefetch());
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path, int bufSize) {
+    @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize) {
         return open(path, bufSize, cfg.getSequentialReadsBeforePrefetch());
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsInputStreamAdapter open(IgniteFsPath path, int bufSize, int seqReadsBeforePrefetch) {
+    @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize, int seqReadsBeforePrefetch) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -1118,7 +1118,7 @@ public final class IgfsImpl implements IgfsEx {
                 if (info == null) {
                     checkConflictWithPrimary(path);
 
-                    throw new IgniteFsFileNotFoundException("File not found: " + path);
+                    throw new IgfsFileNotFoundException("File not found: " + path);
                 }
 
                 if (!info.isFile())
@@ -1145,18 +1145,18 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream create(IgniteFsPath path, boolean overwrite) {
+    @Override public IgniteFsOutputStream create(IgfsPath path, boolean overwrite) {
         return create0(path, cfg.getStreamBufferSize(), overwrite, null, 0, null, true);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication,
+    @Override public IgniteFsOutputStream create(IgfsPath path, int bufSize, boolean overwrite, int replication,
         long blockSize, @Nullable Map<String, String> props) {
         return create0(path, bufSize, overwrite, null, replication, props, false);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite,
+    @Override public IgniteFsOutputStream create(IgfsPath path, int bufSize, boolean overwrite,
         @Nullable IgniteUuid affKey, int replication, long blockSize, @Nullable Map<String, String> props) {
         return create0(path, bufSize, overwrite, affKey, replication, props, false);
     }
@@ -1174,7 +1174,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return Output stream.
      */
     private IgniteFsOutputStream create0(
-        final IgniteFsPath path,
+        final IgfsPath path,
         final int bufSize,
         final boolean overwrite,
         @Nullable IgniteUuid affKey,
@@ -1217,7 +1217,7 @@ public final class IgfsImpl implements IgfsEx {
                 }
 
                 // Re-create parents when working in PRIMARY mode. In DUAL mode this is done by MetaManager.
-                IgniteFsPath parent = path.parent();
+                IgfsPath parent = path.parent();
 
                 // Create missing parent directories if necessary.
                 if (parent != null)
@@ -1287,12 +1287,12 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream append(IgniteFsPath path, boolean create) {
+    @Override public IgniteFsOutputStream append(IgfsPath path, boolean create) {
         return append(path, cfg.getStreamBufferSize(), create, null);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsOutputStream append(final IgniteFsPath path, final int bufSize, boolean create,
+    @Override public IgniteFsOutputStream append(final IgfsPath path, final int bufSize, boolean create,
         @Nullable Map<String, String> props) {
         if (enterBusy()) {
             try {
@@ -1333,7 +1333,7 @@ public final class IgfsImpl implements IgfsEx {
                     if (!create) {
                         checkConflictWithPrimary(path);
 
-                        throw new IgniteFsFileNotFoundException("File not found: " + path);
+                        throw new IgfsFileNotFoundException("File not found: " + path);
                     }
 
                     if (parentId == null)
@@ -1374,7 +1374,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public void setTimes(IgniteFsPath path, long accessTime, long modificationTime) {
+    @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -1387,7 +1387,7 @@ public final class IgfsImpl implements IgfsEx {
                 if (desc == null) {
                     checkConflictWithPrimary(path);
 
-                    throw new IgniteFsFileNotFoundException("Failed to update times (path not found): " + path);
+                    throw new IgfsFileNotFoundException("Failed to update times (path not found): " + path);
                 }
 
                 // Cannot update times for root.
@@ -1413,7 +1413,7 @@ public final class IgfsImpl implements IgfsEx {
      * @param path Path to check.
      * @throws IgniteCheckedException If path exists.
      */
-    private void checkConflictWithPrimary(IgniteFsPath path) throws IgniteCheckedException {
+    private void checkConflictWithPrimary(IgfsPath path) throws IgniteCheckedException {
         if (secondaryFs != null) {
             if (secondaryFs.info(path) != null) {
                 throw new IgniteCheckedException("Path mapped to a PRIMARY mode found in secondary file " +
@@ -1423,12 +1423,12 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len) {
+    @Override public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len) {
         return affinity(path, start, len, 0L);
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len, long maxLen) {
+    @Override public Collection<IgniteFsBlockLocation> affinity(IgfsPath path, long start, long len, long maxLen) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -1456,7 +1456,7 @@ public final class IgfsImpl implements IgfsEx {
                 }
 
                 if (info == null)
-                    throw new IgniteFsFileNotFoundException("File not found: " + path);
+                    throw new IgfsFileNotFoundException("File not found: " + path);
 
                 if (!info.isFile())
                     throw new IgniteFsInvalidPathException("Failed to get affinity info for file (not a file): " +
@@ -1479,7 +1479,7 @@ public final class IgfsImpl implements IgfsEx {
     @Override public IgniteFsMetrics metrics() {
         if (enterBusy()) {
             try {
-                IgniteFsPathSummary sum = new IgniteFsPathSummary();
+                IgfsPathSummary sum = new IgfsPathSummary();
 
                 summary0(ROOT_ID, sum);
 
@@ -1530,7 +1530,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public long size(IgniteFsPath path) {
+    @Override public long size(IgfsPath path) {
         if (enterBusy()) {
             try {
                 A.notNull(path, "path");
@@ -1540,7 +1540,7 @@ public final class IgfsImpl implements IgfsEx {
                 if (nextId == null)
                     return 0;
 
-                IgniteFsPathSummary sum = new IgniteFsPathSummary(path);
+                IgfsPathSummary sum = new IgfsPathSummary(path);
 
                 summary0(nextId, sum);
 
@@ -1564,7 +1564,7 @@ public final class IgfsImpl implements IgfsEx {
      * @param sum Summary object that will collect information.
      * @throws IgniteCheckedException If failed.
      */
-    private void summary0(IgniteUuid fileId, IgniteFsPathSummary sum) throws IgniteCheckedException {
+    private void summary0(IgniteUuid fileId, IgfsPathSummary sum) throws IgniteCheckedException {
         assert sum != null;
 
         IgfsFileInfo info = meta.info(fileId);
@@ -1672,7 +1672,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return Detailed file descriptor or {@code null}, if file does not exist.
      * @throws IgniteCheckedException If failed.
      */
-    @Nullable private FileDescriptor getFileDescriptor(IgniteFsPath path) throws IgniteCheckedException {
+    @Nullable private FileDescriptor getFileDescriptor(IgfsPath path) throws IgniteCheckedException {
         List<IgniteUuid> ids = meta.fileIds(path);
         IgfsFileInfo fileInfo = meta.info(ids.get(ids.size() - 1));
 
@@ -1693,7 +1693,7 @@ public final class IgfsImpl implements IgfsEx {
      * @param rmvLocked Whether to remove this entry in case it is has explicit lock.
      * @throws IgniteCheckedException If failed.
      */
-    private void deleteFile(IgniteFsPath path, FileDescriptor desc, boolean rmvLocked) throws IgniteCheckedException {
+    private void deleteFile(IgfsPath path, FileDescriptor desc, boolean rmvLocked) throws IgniteCheckedException {
         IgniteUuid parentId = desc.parentId;
         IgniteUuid fileId = desc.fileId;
 
@@ -1729,7 +1729,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
-        Collection<IgniteFsPath> paths, @Nullable T arg) {
+        Collection<IgfsPath> paths, @Nullable T arg) {
         try {
             return executeAsync(task, rslvr, paths, arg).get();
         }
@@ -1740,7 +1740,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
-        Collection<IgniteFsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
+        Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
         try {
             return executeAsync(task, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg).get();
         }
@@ -1751,7 +1751,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls,
-        @Nullable IgfsRecordResolver rslvr, Collection<IgniteFsPath> paths, @Nullable T arg) {
+        @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) {
         try {
             return executeAsync(taskCls, rslvr, paths, arg).get();
         }
@@ -1762,7 +1762,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /** {@inheritDoc} */
     @Override public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls,
-        @Nullable IgfsRecordResolver rslvr, Collection<IgniteFsPath> paths, boolean skipNonExistentFiles,
+        @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles,
         long maxRangeSize, @Nullable T arg) {
         try {
             return executeAsync(taskCls, rslvr, paths, skipNonExistentFiles, maxRangeSize, arg).get();
@@ -1782,7 +1782,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return Execution future.
      */
     <T, R> IgniteInternalFuture<R> executeAsync(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
-        Collection<IgniteFsPath> paths, @Nullable T arg) {
+        Collection<IgfsPath> paths, @Nullable T arg) {
         return executeAsync(task, rslvr, paths, true, cfg.getMaximumTaskRangeLength(), arg);
     }
 
@@ -1801,7 +1801,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return Execution future.
      */
     <T, R> IgniteInternalFuture<R> executeAsync(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
-        Collection<IgniteFsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
+        Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
         return ggfsCtx.kernalContext().task().execute(task, new IgfsTaskArgsImpl<>(cfg.getName(), paths, rslvr,
             skipNonExistentFiles, maxRangeLen, arg));
     }
@@ -1816,7 +1816,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return Execution future.
      */
     <T, R> IgniteInternalFuture<R> executeAsync(Class<? extends IgfsTask<T, R>> taskCls,
-        @Nullable IgfsRecordResolver rslvr, Collection<IgniteFsPath> paths, @Nullable T arg) {
+        @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) {
         return executeAsync(taskCls, rslvr, paths, true, cfg.getMaximumTaskRangeLength(), arg);
     }
 
@@ -1834,14 +1834,14 @@ public final class IgfsImpl implements IgfsEx {
      * @return Execution future.
      */
     <T, R> IgniteInternalFuture<R> executeAsync(Class<? extends IgfsTask<T, R>> taskCls,
-        @Nullable IgfsRecordResolver rslvr, Collection<IgniteFsPath> paths, boolean skipNonExistentFiles,
+        @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles,
         long maxRangeLen, @Nullable T arg) {
         return ggfsCtx.kernalContext().task().execute((Class<IgfsTask<T, R>>)taskCls,
             new IgfsTaskArgsImpl<>(cfg.getName(), paths, rslvr, skipNonExistentFiles, maxRangeLen, arg));
     }
 
     /** {@inheritDoc} */
-    @Override public boolean evictExclude(IgniteFsPath path, boolean primary) {
+    @Override public boolean evictExclude(IgfsPath path, boolean primary) {
         assert path != null;
 
         try {
@@ -1863,7 +1863,7 @@ public final class IgfsImpl implements IgfsEx {
      * @return File info or {@code null} in case file is not found.
      * @throws IgniteCheckedException If failed.
      */
-    private IgfsFileInfo resolveFileInfo(IgniteFsPath path, IgniteFsMode mode) throws IgniteCheckedException {
+    private IgfsFileInfo resolveFileInfo(IgfsPath path, IgniteFsMode mode) throws IgniteCheckedException {
         assert path != null;
         assert mode != null;
 
@@ -1994,7 +1994,7 @@ public final class IgfsImpl implements IgfsEx {
          * @param batch Optional secondary file system batch.
          * @throws IgniteCheckedException In case of error.
          */
-        IgfsEventAwareOutputStream(IgniteFsPath path, IgfsFileInfo fileInfo,
+        IgfsEventAwareOutputStream(IgfsPath path, IgfsFileInfo fileInfo,
             IgniteUuid parentId, int bufSize, IgniteFsMode mode, @Nullable IgfsFileWorkerBatch batch)
             throws IgniteCheckedException {
             super(ggfsCtx, path, fileInfo, parentId, bufSize, mode, batch, metrics);
@@ -2034,8 +2034,8 @@ public final class IgfsImpl implements IgfsEx {
          * @param secReader Optional secondary file system reader.
          * @param metrics Metrics.
          */
-        IgfsEventAwareInputStream(IgfsContext ggfsCtx, IgniteFsPath path, IgfsFileInfo fileInfo,
-            int prefetchBlocks, int seqReadsBeforePrefetch, @Nullable IgniteFsReader secReader,
+        IgfsEventAwareInputStream(IgfsContext ggfsCtx, IgfsPath path, IgfsFileInfo fileInfo,
+            int prefetchBlocks, int seqReadsBeforePrefetch, @Nullable IgfsReader secReader,
             IgfsLocalMetrics metrics) {
             super(ggfsCtx, path, fileInfo, prefetchBlocks, seqReadsBeforePrefetch, secReader, metrics);
 
@@ -2217,7 +2217,7 @@ public final class IgfsImpl implements IgfsEx {
     /** {@inheritDoc} */
     @Override public boolean isProxy(URI path) {
         IgniteFsMode mode = F.isEmpty(cfg.getPathModes()) ? cfg.getDefaultMode() :
-            modeRslvr.resolveMode(new IgniteFsPath(path));
+            modeRslvr.resolveMode(new IgfsPath(path));
 
         return mode == PROXY;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamAdapter.java
index b41fb85..39ec4b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamAdapter.java
@@ -24,7 +24,7 @@ import java.io.*;
 /**
  * Implementation adapter providing necessary methods.
  */
-public abstract class IgfsInputStreamAdapter extends IgniteFsInputStream {
+public abstract class IgfsInputStreamAdapter extends IgfsInputStream {
     /** {@inheritDoc} */
     @Override public long length() {
         return fileInfo().length();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamImpl.java
index 95d3a00..3b1975c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsInputStreamImpl.java
@@ -45,13 +45,13 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
 
     /** Secondary file system reader. */
     @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-    private final IgniteFsReader secReader;
+    private final IgfsReader secReader;
 
     /** Logger. */
     private IgniteLogger log;
 
     /** Path to file. */
-    protected final IgniteFsPath path;
+    protected final IgfsPath path;
 
     /** File descriptor. */
     private volatile IgfsFileInfo fileInfo;
@@ -109,8 +109,8 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
      * @param secReader Optional secondary file system reader.
      * @param metrics Local GGFS metrics.
      */
-    IgfsInputStreamImpl(IgfsContext ggfsCtx, IgniteFsPath path, IgfsFileInfo fileInfo, int prefetchBlocks,
-        int seqReadsBeforePrefetch, @Nullable IgniteFsReader secReader, IgfsLocalMetrics metrics) {
+    IgfsInputStreamImpl(IgfsContext ggfsCtx, IgfsPath path, IgfsFileInfo fileInfo, int prefetchBlocks,
+        int seqReadsBeforePrefetch, @Nullable IgfsReader secReader, IgfsLocalMetrics metrics) {
         assert ggfsCtx != null;
         assert path != null;
         assert fileInfo != null;
@@ -126,7 +126,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
         meta = ggfsCtx.meta();
         data = ggfsCtx.data();
 
-        log = ggfsCtx.kernalContext().log(IgniteFsInputStream.class);
+        log = ggfsCtx.kernalContext().log(IgfsInputStream.class);
 
         maxLocCacheSize = (prefetchBlocks > 0 ? prefetchBlocks : 1) * 3 / 2;
 
@@ -396,7 +396,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
 
                     // File was deleted.
                     if (newInfo == null)
-                        throw new IgniteFsFileNotFoundException("Failed to read file block (file was concurrently " +
+                        throw new IgfsFileNotFoundException("Failed to read file block (file was concurrently " +
                                 "deleted) [path=" + path + ", blockIdx=" + blockIdx + ']');
 
                     fileInfo = newInfo;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/639ff503/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsJobImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsJobImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsJobImpl.java
index 7ed86e3..46efb05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsJobImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsJobImpl.java
@@ -40,7 +40,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
     private String ggfsName;
 
     /** GGFS path. */
-    private IgniteFsPath path;
+    private IgfsPath path;
 
     /** Start. */
     private long start;
@@ -67,7 +67,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
      * @param len Split length.
      * @param rslvr GGFS split resolver.
      */
-    public IgfsJobImpl(IgfsJob job, String ggfsName, IgniteFsPath path, long start, long len,
+    public IgfsJobImpl(IgfsJob job, String ggfsName, IgfsPath path, long start, long len,
         IgfsRecordResolver rslvr) {
         this.job = job;
         this.ggfsName = ggfsName;
@@ -81,7 +81,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
     @Override public Object execute() {
         IgniteFs fs = ignite.fileSystem(ggfsName);
 
-        try (IgniteFsInputStream in = fs.open(path)) {
+        try (IgfsInputStream in = fs.open(path)) {
             IgfsFileRange split = new IgfsFileRange(path, start, len);
 
             if (rslvr != null) {


Mime
View raw message