ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [27/57] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP (6)
Date Fri, 13 Feb 2015 10:54:37 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServer.java
index 1778c75..3442f40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServer.java
@@ -46,7 +46,7 @@ public class IgfsServer {
     private final IgniteLogger log;
 
     /** GGFS marshaller. */
-    private final GridGgfsMarshaller marsh;
+    private final IgfsMarshaller marsh;
 
     /** Endpoint configuration. */
     private final Map<String,String> endpointCfg;
@@ -82,7 +82,7 @@ public class IgfsServer {
 
         log = ggfsCtx.kernalContext().log(IgfsServer.class);
 
-        marsh = new GridGgfsMarshaller();
+        marsh = new IgfsMarshaller();
     }
 
     /**
@@ -201,7 +201,7 @@ public class IgfsServer {
         private IpcEndpoint endpoint;
 
         /** Data output stream. */
-        private final GridGgfsDataOutputStream out;
+        private final IgfsDataOutputStream out;
 
         /** Client session object. */
         private IgfsClientSession ses;
@@ -223,15 +223,15 @@ public class IgfsServer {
 
             ses = new IgfsClientSession();
 
-            out = new GridGgfsDataOutputStream(new BufferedOutputStream(endpoint.outputStream()));
+            out = new IgfsDataOutputStream(new BufferedOutputStream(endpoint.outputStream()));
         }
 
         /** {@inheritDoc} */
         @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
             try {
-                GridGgfsDataInputStream dis = new GridGgfsDataInputStream(endpoint.inputStream());
+                IgfsDataInputStream dis = new IgfsDataInputStream(endpoint.inputStream());
 
-                byte[] hdr = new byte[GridGgfsMarshaller.HEADER_SIZE];
+                byte[] hdr = new byte[IgfsMarshaller.HEADER_SIZE];
 
                 boolean first = true;
 
@@ -243,7 +243,7 @@ public class IgfsServer {
                     int ordinal = U.bytesToInt(hdr, 8);
 
                     if (first) { // First message must be HANDSHAKE.
-                        if (reqId != 0 || ordinal != GridGgfsIpcCommand.HANDSHAKE.ordinal()) {
+                        if (reqId != 0 || ordinal != IgfsIpcCommand.HANDSHAKE.ordinal()) {
                             U.warn(log, "Handshake failed.");
 
                             return;
@@ -252,30 +252,30 @@ public class IgfsServer {
                         first = false;
                     }
 
-                    final GridGgfsIpcCommand cmd = GridGgfsIpcCommand.valueOf(ordinal);
+                    final IgfsIpcCommand cmd = IgfsIpcCommand.valueOf(ordinal);
 
-                    GridGgfsMessage msg = marsh.unmarshall(cmd, hdr, dis);
+                    IgfsMessage msg = marsh.unmarshall(cmd, hdr, dis);
 
-                    IgniteInternalFuture<GridGgfsMessage> fut = hnd.handleAsync(ses, msg, dis);
+                    IgniteInternalFuture<IgfsMessage> fut = hnd.handleAsync(ses, msg, dis);
 
                     // If fut is null, no response is required.
                     if (fut != null) {
                         if (fut.isDone()) {
-                            GridGgfsMessage res;
+                            IgfsMessage res;
 
                             try {
                                 res = fut.get();
                             }
                             catch (IgniteCheckedException e) {
-                                res = new GridGgfsControlResponse();
+                                res = new IgfsControlResponse();
 
-                                ((GridGgfsControlResponse)res).error(e);
+                                ((IgfsControlResponse)res).error(e);
                             }
 
                             try {
                                 synchronized (out) {
                                     // Reuse header.
-                                    GridGgfsMarshaller.fillHeader(hdr, reqId, res.command());
+                                    IgfsMarshaller.fillHeader(hdr, reqId, res.command());
 
                                     marsh.marshall(res, hdr, out);
 
@@ -287,22 +287,22 @@ public class IgfsServer {
                             }
                         }
                         else {
-                            fut.listenAsync(new CIX1<IgniteInternalFuture<GridGgfsMessage>>() {
-                                @Override public void applyx(IgniteInternalFuture<GridGgfsMessage> fut) {
-                                    GridGgfsMessage res;
+                            fut.listenAsync(new CIX1<IgniteInternalFuture<IgfsMessage>>() {
+                                @Override public void applyx(IgniteInternalFuture<IgfsMessage> fut) {
+                                    IgfsMessage res;
 
                                     try {
                                         res = fut.get();
                                     }
                                     catch (IgniteCheckedException e) {
-                                        res = new GridGgfsControlResponse();
+                                        res = new IgfsControlResponse();
 
-                                        ((GridGgfsControlResponse)res).error(e);
+                                        ((IgfsControlResponse)res).error(e);
                                     }
 
                                     try {
                                         synchronized (out) {
-                                            byte[] hdr = GridGgfsMarshaller.createHeader(reqId, res.command());
+                                            byte[] hdr = IgfsMarshaller.createHeader(reqId, res.command());
 
                                             marsh.marshall(res, hdr, out);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerHandler.java
index b06f872..18028fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerHandler.java
@@ -38,8 +38,8 @@ public interface IgfsServerHandler {
      * @return Future that will be completed when response is ready or {@code null} if no
      *      response is required.
      */
-    @Nullable public IgniteInternalFuture<GridGgfsMessage> handleAsync(IgfsClientSession ses,
-        GridGgfsMessage msg, DataInput in);
+    @Nullable public IgniteInternalFuture<IgfsMessage> handleAsync(IgfsClientSession ses,
+        IgfsMessage msg, DataInput in);
 
     /**
      * Handles handles client close events.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorGgfsProfilerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorGgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorGgfsProfilerTask.java
index 33f838d..43281e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorGgfsProfilerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorGgfsProfilerTask.java
@@ -29,7 +29,7 @@ import java.nio.charset.*;
 import java.nio.file.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.fs.common.GridGgfsLogger.*;
+import static org.apache.ignite.internal.fs.common.IgfsLogger.*;
 import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
index 31385ca..2744432 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
@@ -123,7 +123,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
     private String uriAuthority;
 
     /** Client logger. */
-    private GridGgfsLogger clientLog;
+    private IgfsLogger clientLog;
 
     /** Secondary URI string. */
     private URI secondaryUri;
@@ -261,10 +261,10 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
                 Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_GGFS_LOG_BATCH_SIZE);
 
-                clientLog = GridGgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize);
+                clientLog = IgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize);
             }
             else
-                clientLog = GridGgfsLogger.disabledLogger();
+                clientLog = IgfsLogger.disabledLogger();
 
             modeRslvr = new IgfsModeResolver(paths.defaultMode(), paths.pathModes());
 
@@ -502,7 +502,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
                     long size = status != null ? status.getLen() : -1;
 
-                    long logId = GridGgfsLogger.nextId();
+                    long logId = IgfsLogger.nextId();
 
                     clientLog.logOpen(logId, path, PROXY, bufSize, size);
 
@@ -518,7 +518,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
                 long logId = -1;
 
                 if (clientLog.isLogEnabled()) {
-                    logId = GridGgfsLogger.nextId();
+                    logId = IgfsLogger.nextId();
 
                     clientLog.logOpen(logId, path, mode, bufSize, stream.length());
                 }
@@ -570,7 +570,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
                     secondaryFs.create(toSecondary(f), perm, overwrite, bufSize, replication, blockSize, progress);
 
                 if (clientLog.isLogEnabled()) {
-                    long logId = GridGgfsLogger.nextId();
+                    long logId = IgfsLogger.nextId();
 
                     clientLog.logCreate(logId, path, PROXY, overwrite, bufSize, replication, blockSize);
 
@@ -590,7 +590,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
                 long logId = -1;
 
                 if (clientLog.isLogEnabled()) {
-                    logId = GridGgfsLogger.nextId();
+                    logId = IgfsLogger.nextId();
 
                     clientLog.logCreate(logId, path, mode, overwrite, bufSize, replication, blockSize);
                 }
@@ -647,7 +647,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
                 FSDataOutputStream os = secondaryFs.append(toSecondary(f), bufSize, progress);
 
                 if (clientLog.isLogEnabled()) {
-                    long logId = GridGgfsLogger.nextId();
+                    long logId = IgfsLogger.nextId();
 
                     clientLog.logAppend(logId, path, PROXY, bufSize); // Don't have stream ID.
 
@@ -664,7 +664,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
                 long logId = -1;
 
                 if (clientLog.isLogEnabled()) {
-                    logId = GridGgfsLogger.nextId();
+                    logId = IgfsLogger.nextId();
 
                     clientLog.logAppend(logId, path, mode, bufSize);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/GridGgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/GridGgfsHadoopFileSystem.java
index 214ca0e..47095af 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/GridGgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/GridGgfsHadoopFileSystem.java
@@ -100,7 +100,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
     private String uriAuthority;
 
     /** Client logger. */
-    private GridGgfsLogger clientLog;
+    private IgfsLogger clientLog;
 
     /** Server block size. */
     private long grpBlockSize;
@@ -256,10 +256,10 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
                 Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_GGFS_LOG_BATCH_SIZE);
 
-                clientLog = GridGgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize);
+                clientLog = IgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize);
             }
             else
-                clientLog = GridGgfsLogger.disabledLogger();
+                clientLog = IgfsLogger.disabledLogger();
 
             modeRslvr = new IgfsModeResolver(paths.defaultMode(), paths.pathModes());
 
@@ -441,7 +441,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
                     long size = status != null ? status.getLen() : -1;
 
-                    long logId = GridGgfsLogger.nextId();
+                    long logId = IgfsLogger.nextId();
 
                     clientLog.logOpen(logId, path, PROXY, bufSize, size);
 
@@ -457,7 +457,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
                 long logId = -1;
 
                 if (clientLog.isLogEnabled()) {
-                    logId = GridGgfsLogger.nextId();
+                    logId = IgfsLogger.nextId();
 
                     clientLog.logOpen(logId, path, mode, bufSize, stream.length());
                 }
@@ -516,7 +516,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
                     replication, blockSize, progress, checksumOpt, createParent);
 
                 if (clientLog.isLogEnabled()) {
-                    long logId = GridGgfsLogger.nextId();
+                    long logId = IgfsLogger.nextId();
 
                     if (append)
                         clientLog.logAppend(logId, path, PROXY, bufSize); // Don't have stream ID.
@@ -541,7 +541,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
                     stream = rmtClient.append(path, create, permMap);
 
                     if (clientLog.isLogEnabled()) {
-                        logId = GridGgfsLogger.nextId();
+                        logId = IgfsLogger.nextId();
 
                         clientLog.logAppend(logId, path, mode, bufSize);
                     }
@@ -554,7 +554,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
                         permMap);
 
                     if (clientLog.isLogEnabled()) {
-                        logId = GridGgfsLogger.nextId();
+                        logId = IgfsLogger.nextId();
 
                         clientLog.logCreate(logId, path, mode, overwrite, bufSize, replication, blockSize);
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopInputStream.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopInputStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopInputStream.java
index db9f1a3..7d127c3 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopInputStream.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopInputStream.java
@@ -67,7 +67,7 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek
     private Log log;
 
     /** Client logger. */
-    private GridGgfsLogger clientLog;
+    private IgfsLogger clientLog;
 
     /** Read time. */
     private long readTime;
@@ -91,7 +91,7 @@ public final class GridGgfsHadoopInputStream extends InputStream implements Seek
      * @param clientLog Client logger.
      */
     public GridGgfsHadoopInputStream(GridGgfsHadoopStreamDelegate delegate, long limit, int bufSize, Log log,
-        GridGgfsLogger clientLog, long logStreamId) {
+        IgfsLogger clientLog, long logStreamId) {
         assert limit >= 0;
 
         this.delegate = delegate;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIo.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIo.java
index ba2b97f..adc06db 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIo.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIo.java
@@ -34,7 +34,7 @@ public interface GridGgfsHadoopIo {
      * @return Future that will be completed.
      * @throws IgniteCheckedException If a message cannot be sent (connection is broken or client was closed).
      */
-    public GridPlainFuture<GridGgfsMessage> send(GridGgfsMessage msg) throws IgniteCheckedException;
+    public GridPlainFuture<IgfsMessage> send(IgfsMessage msg) throws IgniteCheckedException;
 
     /**
      * Sends given GGFS client message and asynchronously awaits for response. When IO detects response
@@ -48,7 +48,7 @@ public interface GridGgfsHadoopIo {
      * @return Future that will be completed when response is returned from closure.
      * @throws IgniteCheckedException If a message cannot be sent (connection is broken or client was closed).
      */
-    public <T> GridPlainFuture<T> send(GridGgfsMessage msg, @Nullable byte[] outBuf, int outOff, int outLen)
+    public <T> GridPlainFuture<T> send(IgfsMessage msg, @Nullable byte[] outBuf, int outOff, int outLen)
         throws IgniteCheckedException;
 
     /**
@@ -57,7 +57,7 @@ public interface GridGgfsHadoopIo {
      * @param msg Message to send.
      * @throws IgniteCheckedException If send failed.
      */
-    public void sendPlain(GridGgfsMessage msg) throws IgniteCheckedException;
+    public void sendPlain(IgfsMessage msg) throws IgniteCheckedException;
 
     /**
      * Adds event listener that will be invoked when connection with server is lost or remote error has occurred.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java
index 75dc5d2..77a4a7f 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopIpcIo.java
@@ -54,10 +54,10 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
     private IpcEndpoint endpoint;
 
     /** Endpoint output stream. */
-    private GridGgfsDataOutputStream out;
+    private IgfsDataOutputStream out;
 
     /** Protocol. */
-    private final GridGgfsMarshaller marsh;
+    private final IgfsMarshaller marsh;
 
     /** Client reader thread. */
     private Thread reader;
@@ -90,7 +90,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
      * @param marsh Protocol.
      * @param log Logger to use.
      */
-    public GridGgfsHadoopIpcIo(String endpointAddr, GridGgfsMarshaller marsh, Log log) {
+    public GridGgfsHadoopIpcIo(String endpointAddr, IgfsMarshaller marsh, Log log) {
         assert endpointAddr != null;
         assert marsh != null;
 
@@ -136,7 +136,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
                     }
 
                     // Otherwise try creating a new one.
-                    clientIo = new GridGgfsHadoopIpcIo(endpoint, new GridGgfsMarshaller(), log);
+                    clientIo = new GridGgfsHadoopIpcIo(endpoint, new IgfsMarshaller(), log);
 
                     try {
                         clientIo.start();
@@ -239,7 +239,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
             endpoint = IpcEndpointFactory.connectEndpoint(
                     endpointAddr, new GridLoggerProxy(new GridGgfsHadoopJclLogger(log), null, null, ""));
 
-            out = new GridGgfsDataOutputStream(new BufferedOutputStream(endpoint.outputStream()));
+            out = new IgfsDataOutputStream(new BufferedOutputStream(endpoint.outputStream()));
 
             reader = new ReaderThread();
 
@@ -316,14 +316,14 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
     }
 
     /** {@inheritDoc} */
-    @Override public GridPlainFuture<GridGgfsMessage> send(GridGgfsMessage msg) throws IgniteCheckedException {
+    @Override public GridPlainFuture<IgfsMessage> send(IgfsMessage msg) throws IgniteCheckedException {
         return send(msg, null, 0, 0);
     }
 
     /** {@inheritDoc} */
-    @Override public <T> GridPlainFuture<T> send(GridGgfsMessage msg, @Nullable byte[] outBuf, int outOff,
+    @Override public <T> GridPlainFuture<T> send(IgfsMessage msg, @Nullable byte[] outBuf, int outOff,
         int outLen) throws IgniteCheckedException {
-        assert outBuf == null || msg.command() == GridGgfsIpcCommand.READ_BLOCK;
+        assert outBuf == null || msg.command() == IgfsIpcCommand.READ_BLOCK;
 
         if (!busyLock.readLock().tryLock())
             throw new GridGgfsHadoopCommunicationException("Failed to send message (client is being concurrently " +
@@ -341,7 +341,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
             fut.outputBuffer(outBuf);
             fut.outputOffset(outOff);
             fut.outputLength(outLen);
-            fut.read(msg.command() == GridGgfsIpcCommand.READ_BLOCK);
+            fut.read(msg.command() == IgfsIpcCommand.READ_BLOCK);
 
             GridGgfsHadoopFuture oldFut = reqMap.putIfAbsent(reqId, fut);
 
@@ -350,7 +350,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
             if (log.isDebugEnabled())
                 log.debug("Sending GGFS message [reqId=" + reqId + ", msg=" + msg + ']');
 
-            byte[] hdr = GridGgfsMarshaller.createHeader(reqId, msg.command());
+            byte[] hdr = IgfsMarshaller.createHeader(reqId, msg.command());
 
             IgniteCheckedException err = null;
 
@@ -382,7 +382,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
     }
 
     /** {@inheritDoc} */
-    @Override public void sendPlain(GridGgfsMessage msg) throws IgniteCheckedException {
+    @Override public void sendPlain(IgfsMessage msg) throws IgniteCheckedException {
         if (!busyLock.readLock().tryLock())
             throw new GridGgfsHadoopCommunicationException("Failed to send message (client is being " +
                 "concurrently closed).");
@@ -391,11 +391,11 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
             if (stopping)
                 throw new GridGgfsHadoopCommunicationException("Failed to send message (client is being concurrently closed).");
 
-            assert msg.command() == GridGgfsIpcCommand.WRITE_BLOCK;
+            assert msg.command() == IgfsIpcCommand.WRITE_BLOCK;
 
-            GridGgfsStreamControlRequest req = (GridGgfsStreamControlRequest)msg;
+            IgfsStreamControlRequest req = (IgfsStreamControlRequest)msg;
 
-            byte[] hdr = GridGgfsMarshaller.createHeader(-1, GridGgfsIpcCommand.WRITE_BLOCK);
+            byte[] hdr = IgfsMarshaller.createHeader(-1, IgfsIpcCommand.WRITE_BLOCK);
 
             U.longToBytes(req.streamId(), hdr, 12);
             U.intToBytes(req.length(), hdr, 20);
@@ -471,10 +471,10 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
             try {
                 InputStream in = endpoint.inputStream();
 
-                GridGgfsDataInputStream dis = new GridGgfsDataInputStream(in);
+                IgfsDataInputStream dis = new IgfsDataInputStream(in);
 
-                byte[] hdr = new byte[GridGgfsMarshaller.HEADER_SIZE];
-                byte[] msgHdr = new byte[GridGgfsControlResponse.RES_HEADER_SIZE];
+                byte[] hdr = new byte[IgfsMarshaller.HEADER_SIZE];
+                byte[] msgHdr = new byte[IgfsControlResponse.RES_HEADER_SIZE];
 
                 while (!Thread.currentThread().isInterrupted()) {
                     dis.readFully(hdr);
@@ -513,7 +513,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
                         }
                         else {
                             try {
-                                GridGgfsIpcCommand cmd = GridGgfsIpcCommand.valueOf(U.bytesToInt(hdr, 8));
+                                IgfsIpcCommand cmd = IgfsIpcCommand.valueOf(U.bytesToInt(hdr, 8));
 
                                 if (log.isDebugEnabled())
                                     log.debug("Received GGFS response [reqId=" + reqId + ", cmd=" + cmd + ']');
@@ -531,7 +531,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo {
                                         // Error code.
                                         Integer errCode = dis.readInt();
 
-                                        GridGgfsControlResponse.throwError(errCode, errMsg);
+                                        IgfsControlResponse.throwError(errCode, errMsg);
                                     }
 
                                     int blockLen = U.bytesToInt(msgHdr, 5);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutProc.java
index 0087039..ecec5ce 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutProc.java
@@ -29,47 +29,47 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.*;
 
-import static org.apache.ignite.internal.fs.common.GridGgfsIpcCommand.*;
+import static org.apache.ignite.internal.fs.common.IgfsIpcCommand.*;
 
 /**
  * Communication with external process (TCP or shmem).
  */
 public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIpcIoListener {
     /** Expected result is boolean. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, Boolean> BOOL_RES = createClosure();
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Boolean> BOOL_RES = createClosure();
 
     /** Expected result is boolean. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, Long> LONG_RES = createClosure();
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Long> LONG_RES = createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, IgniteFsFile> FILE_RES = createClosure();
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgniteFsFile> FILE_RES = createClosure();
 
     /** Expected result is {@code GridGgfsHandshakeResponse} */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>,
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
         IgfsHandshakeResponse> HANDSHAKE_RES = createClosure();
 
     /** Expected result is {@code GridGgfsStatus} */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, IgfsStatus> STATUS_RES =
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsStatus> STATUS_RES =
         createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>,
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
         IgfsInputStreamDescriptor> STREAM_DESCRIPTOR_RES = createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>,
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
         Collection<IgniteFsFile>> FILE_COL_RES = createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>,
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
         Collection<IgniteFsPath>> PATH_COL_RES = createClosure();
 
     /** Expected result is {@code GridGgfsPathSummary}. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, IgniteFsPathSummary> SUMMARY_RES =
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgniteFsPathSummary> SUMMARY_RES =
         createClosure();
 
     /** Expected result is {@code GridGgfsFile}. */
-    private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>,
+    private static final GridPlainClosure<GridPlainFuture<IgfsMessage>,
         Collection<IgniteFsBlockLocation>> BLOCK_LOCATION_COL_RES = createClosure();
 
     /** Grid name. */
@@ -143,7 +143,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public IgfsHandshakeResponse handshake(String logDir) throws IgniteCheckedException {
-        final GridGgfsHandshakeRequest req = new GridGgfsHandshakeRequest();
+        final IgfsHandshakeRequest req = new IgfsHandshakeRequest();
 
         req.gridName(grid);
         req.ggfsName(ggfs);
@@ -166,7 +166,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public IgniteFsFile info(IgniteFsPath path) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(INFO);
         msg.path(path);
@@ -176,7 +176,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(UPDATE);
         msg.path(path);
@@ -187,7 +187,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public Boolean setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(SET_TIMES);
         msg.path(path);
@@ -199,7 +199,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public Boolean rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(RENAME);
         msg.path(src);
@@ -210,7 +210,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public Boolean delete(IgniteFsPath path, boolean recursive) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(DELETE);
         msg.path(path);
@@ -222,7 +222,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
     /** {@inheritDoc} */
     @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len)
         throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(AFFINITY);
         msg.path(path);
@@ -234,7 +234,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public IgniteFsPathSummary contentSummary(IgniteFsPath path) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(PATH_SUMMARY);
         msg.path(path);
@@ -244,7 +244,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public Boolean mkdirs(IgniteFsPath path, Map<String, String> props) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(MAKE_DIRECTORIES);
         msg.path(path);
@@ -255,7 +255,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(LIST_FILES);
         msg.path(path);
@@ -265,7 +265,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public Collection<IgniteFsPath> listPaths(IgniteFsPath path) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(LIST_PATHS);
         msg.path(path);
@@ -275,12 +275,12 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public IgfsStatus fsStatus() throws IgniteCheckedException {
-        return io.send(new GridGgfsStatusRequest()).chain(STATUS_RES).get();
+        return io.send(new IgfsStatusRequest()).chain(STATUS_RES).get();
     }
 
     /** {@inheritDoc} */
     @Override public GridGgfsHadoopStreamDelegate open(IgniteFsPath path) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(OPEN_READ);
         msg.path(path);
@@ -294,7 +294,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
     /** {@inheritDoc} */
     @Override public GridGgfsHadoopStreamDelegate open(IgniteFsPath path,
         int seqReadsBeforePrefetch) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(OPEN_READ);
         msg.path(path);
@@ -309,7 +309,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
     /** {@inheritDoc} */
     @Override public GridGgfsHadoopStreamDelegate create(IgniteFsPath path, boolean overwrite, boolean colocate,
         int replication, long blockSize, @Nullable Map<String, String> props) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(OPEN_CREATE);
         msg.path(path);
@@ -327,7 +327,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
     /** {@inheritDoc} */
     @Override public GridGgfsHadoopStreamDelegate append(IgniteFsPath path, boolean create,
         @Nullable Map<String, String> props) throws IgniteCheckedException {
-        final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest();
+        final IgfsPathControlRequest msg = new IgfsPathControlRequest();
 
         msg.command(OPEN_APPEND);
         msg.path(path);
@@ -344,7 +344,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
         final @Nullable byte[] outBuf, final int outOff, final int outLen) {
         assert len > 0;
 
-        final GridGgfsStreamControlRequest msg = new GridGgfsStreamControlRequest();
+        final IgfsStreamControlRequest msg = new IgfsStreamControlRequest();
 
         msg.command(READ_BLOCK);
         msg.streamId((long) desc.target());
@@ -362,7 +362,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
     /** {@inheritDoc} */
     @Override public void writeData(GridGgfsHadoopStreamDelegate desc, byte[] data, int off, int len)
         throws IOException {
-        final GridGgfsStreamControlRequest msg = new GridGgfsStreamControlRequest();
+        final IgfsStreamControlRequest msg = new IgfsStreamControlRequest();
 
         msg.command(WRITE_BLOCK);
         msg.streamId((long) desc.target());
@@ -385,7 +385,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
 
     /** {@inheritDoc} */
     @Override public void closeStream(GridGgfsHadoopStreamDelegate desc) throws IOException {
-        final GridGgfsStreamControlRequest msg = new GridGgfsStreamControlRequest();
+        final IgfsStreamControlRequest msg = new IgfsStreamControlRequest();
 
         msg.command(CLOSE);
         msg.streamId((long)desc.target());
@@ -451,10 +451,10 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp
      * @return Conversion closure.
      */
     @SuppressWarnings("unchecked")
-    private static <T> GridPlainClosure<GridPlainFuture<GridGgfsMessage>, T> createClosure() {
-        return new GridPlainClosure<GridPlainFuture<GridGgfsMessage>, T>() {
-            @Override public T apply(GridPlainFuture<GridGgfsMessage> fut) throws IgniteCheckedException {
-                GridGgfsControlResponse res = (GridGgfsControlResponse)fut.get();
+    private static <T> GridPlainClosure<GridPlainFuture<IgfsMessage>, T> createClosure() {
+        return new GridPlainClosure<GridPlainFuture<IgfsMessage>, T>() {
+            @Override public T apply(GridPlainFuture<IgfsMessage> fut) throws IgniteCheckedException {
+                IgfsControlResponse res = (IgfsControlResponse)fut.get();
 
                 if (res.hasError())
                     res.throwError();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutputStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutputStream.java
index d4ed889..74650c9 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutputStream.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopOutputStream.java
@@ -32,7 +32,7 @@ public class GridGgfsHadoopOutputStream extends OutputStream implements GridGgfs
     private Log log;
 
     /** Client logger. */
-    private GridGgfsLogger clientLog;
+    private IgfsLogger clientLog;
 
     /** Log stream ID. */
     private long logStreamId;
@@ -69,7 +69,7 @@ public class GridGgfsHadoopOutputStream extends OutputStream implements GridGgfs
      * @param clientLog Client logger.
      */
     public GridGgfsHadoopOutputStream(GridGgfsHadoopStreamDelegate delegate, Log log,
-        GridGgfsLogger clientLog, long logStreamId) {
+        IgfsLogger clientLog, long logStreamId) {
         this.delegate = delegate;
         this.log = log;
         this.clientLog = clientLog;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyInputStream.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyInputStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyInputStream.java
index 832e548..9cea672 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyInputStream.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyInputStream.java
@@ -30,7 +30,7 @@ public class GridGgfsHadoopProxyInputStream extends InputStream implements Seeka
     private final FSDataInputStream is;
 
     /** Client logger. */
-    private final GridGgfsLogger clientLog;
+    private final IgfsLogger clientLog;
 
     /** Log stream ID. */
     private final long logStreamId;
@@ -56,7 +56,7 @@ public class GridGgfsHadoopProxyInputStream extends InputStream implements Seeka
      * @param is Actual input stream to the secondary file system.
      * @param clientLog Client log.
      */
-    public GridGgfsHadoopProxyInputStream(FSDataInputStream is, GridGgfsLogger clientLog, long logStreamId) {
+    public GridGgfsHadoopProxyInputStream(FSDataInputStream is, IgfsLogger clientLog, long logStreamId) {
         assert is != null;
         assert clientLog != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyOutputStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyOutputStream.java
index 882c424..687cb27 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyOutputStream.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/GridGgfsHadoopProxyOutputStream.java
@@ -30,7 +30,7 @@ public class GridGgfsHadoopProxyOutputStream extends OutputStream {
     private FSDataOutputStream os;
 
     /** Client logger. */
-    private final GridGgfsLogger clientLog;
+    private final IgfsLogger clientLog;
 
     /** Log stream ID. */
     private final long logStreamId;
@@ -57,7 +57,7 @@ public class GridGgfsHadoopProxyOutputStream extends OutputStream {
      * @param clientLog Client logger.
      * @param logStreamId Log stream ID.
      */
-    public GridGgfsHadoopProxyOutputStream(FSDataOutputStream os, GridGgfsLogger clientLog, long logStreamId) {
+    public GridGgfsHadoopProxyOutputStream(FSDataOutputStream os, IgfsLogger clientLog, long logStreamId) {
         assert os != null;
         assert clientLog != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/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 e088693..f989611 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
@@ -134,7 +134,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest {
             GridGgfsHadoopStreamDelegate delegate = client.create(path, true, false, 1, 1024, null);
 
             final GridGgfsHadoopOutputStream ggfsOut = new GridGgfsHadoopOutputStream(delegate, LOG,
-                GridGgfsLogger.disabledLogger(), 0);
+                IgfsLogger.disabledLogger(), 0);
 
             // This call should return fine as exception is thrown for the first time.
             ggfsOut.write(data);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerSelfTest.java
index a5cedf1..3ddacf2 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerSelfTest.java
@@ -25,7 +25,7 @@ import java.io.*;
 import java.util.*;
 
 import static org.apache.ignite.ignitefs.IgniteFsMode.*;
-import static org.apache.ignite.internal.fs.common.GridGgfsLogger.*;
+import static org.apache.ignite.internal.fs.common.IgfsLogger.*;
 
 /**
  * Grid GGFS client logger test.
@@ -87,14 +87,14 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testCreateDelete() throws Exception {
-        GridGgfsLogger log = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
-        GridGgfsLogger sameLog0 = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger sameLog0 = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         // Loggers for the same endpoint must be the same object.
         assert log == sameLog0;
 
-        GridGgfsLogger otherLog = GridGgfsLogger.logger("other" + ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger otherLog = IgfsLogger.logger("other" + ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         // Logger for another endpoint must be different.
         assert log != otherLog;
@@ -110,7 +110,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest {
         // When there are multiple loggers, closing one must not force flushing.
         assert !logFile.exists();
 
-        GridGgfsLogger sameLog1 = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger sameLog1 = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         assert sameLog0 == sameLog1;
 
@@ -125,7 +125,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest {
 
         logFile.delete();
 
-        GridGgfsLogger sameLog2 = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger sameLog2 = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         // This time we expect new logger instance to be created.
         assert sameLog0 != sameLog2;
@@ -142,7 +142,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testLogRead() throws Exception {
-        GridGgfsLogger log = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         log.logOpen(1, PATH, PRIMARY, 2, 3L);
         log.logRandomRead(1, 4L, 5);
@@ -172,7 +172,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testLogWrite() throws Exception {
-        GridGgfsLogger log = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         log.logCreate(1, PATH, PRIMARY, true, 2, new Integer(3).shortValue(), 4L);
         log.logAppend(2, PATH, PRIMARY, 8);
@@ -197,7 +197,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest {
      */
     @SuppressWarnings("TooBroadScope")
     public void testLogMisc() throws Exception {
-        GridGgfsLogger log = GridGgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
+        IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10);
 
         String newFile = "/dir3/file.test";
         String file1 = "/dir3/file1.test";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b20d898b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
index 8f19aa8..ef51041 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
@@ -320,6 +320,6 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT
 
         field.setAccessible(true);
 
-        return ((GridGgfsLogger)field.get(fs)).isLogEnabled();
+        return ((IgfsLogger)field.get(fs)).isLogEnabled();
     }
 }


Mime
View raw message