http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java index 120745c..d1f5e4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java @@ -17,13 +17,14 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import java.util.Map; +import org.apache.ignite.internal.GridDirectMap; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * IGFS write blocks message. @@ -170,4 +171,4 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { @Override public byte fieldsCount() { return 3; } -} +} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java index db48064..943165e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java @@ -17,12 +17,11 @@ package org.apache.ignite.internal.processors.igfs; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.Closeable; +import java.util.Iterator; +import java.util.concurrent.ConcurrentMap; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; /** * IGFS client session. Effectively used to manage lifecycle of opened resources and close them on @@ -72,4 +71,4 @@ public class IgfsClientSession { public Iterator<Closeable> registeredResources() { return rsrcMap.values().iterator(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java index c2c24ca..412c45b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java @@ -17,12 +17,13 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.nio.*; +import java.nio.ByteBuffer; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.jetbrains.annotations.Nullable; /** * Base class for all IGFS communication messages sent between nodes. @@ -76,4 +77,4 @@ public abstract class IgfsCommunicationMessage implements Message { @Override public byte fieldsCount() { return 0; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java index 24b56d3..2b08f28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java @@ -17,16 +17,17 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.util.typedef.F; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS; /** * IGFS context holding all required components for IGFS instance. @@ -201,4 +202,4 @@ public class IgfsContext { return mgr; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index 602924d..c571f41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -17,44 +17,83 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.transactions.*; -import org.apache.ignite.internal.processors.datastreamer.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.util.worker.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.thread.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import javax.cache.processor.*; -import java.io.*; -import java.nio.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.concurrent.locks.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; -import static org.apache.ignite.transactions.TransactionConcurrency.*; -import static org.apache.ignite.transactions.TransactionIsolation.*; +import java.io.DataInput; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Deque; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import javax.cache.processor.EntryProcessor; +import javax.cache.processor.MutableEntry; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteInterruptedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cache.affinity.AffinityKeyMapper; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.igfs.IgfsBlockLocation; +import org.apache.ignite.igfs.IgfsException; +import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper; +import org.apache.ignite.igfs.IgfsOutOfSpaceException; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable; +import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.cache.GridCacheAdapter; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; +import org.apache.ignite.internal.processors.datastreamer.DataStreamerCacheUpdaters; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.lang.GridPlainCallable; +import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.CX1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.worker.GridWorker; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.thread.IgniteThreadPoolExecutor; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; +import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; +import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; +import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** * Cache based file's data container. @@ -1883,4 +1922,4 @@ public class IgfsDataManager extends IgfsManager { onDone(true); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java index 8656745..ef3dd43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java @@ -17,16 +17,16 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.marshaller.Marshaller; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.jetbrains.annotations.Nullable; /** * Indicates that entry scheduled for delete was actually deleted. @@ -184,4 +184,4 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { @Override public String toString() { return S.toString(IgfsDeleteMessage.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java index 1b2d3fe..98672e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java @@ -17,25 +17,31 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.locks.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.events.IgfsEvent; +import org.apache.ignite.internal.IgniteFutureCancelledCheckedException; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException; +import org.apache.ignite.internal.managers.communication.GridIoPolicy; +import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; +import org.apache.ignite.internal.util.future.GridCompoundFuture; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; + +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_PURGED; +import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS; +import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID; /** * IGFS worker for removal from the trash directory. @@ -346,4 +352,4 @@ public class IgfsDeleteWorker extends IgfsThread { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java index 361f75f..8ff7247 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java @@ -17,14 +17,15 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.net.*; +import java.net.URI; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; /** * Internal API extension for {@link org.apache.ignite.IgniteFileSystem}. @@ -175,4 +176,4 @@ public interface IgfsEx extends IgniteFileSystem { * @return Secondary file system wrapper. */ public IgfsSecondaryFileSystem asSecondary(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index d18ea82..5f083b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -17,15 +17,22 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; +import org.jetbrains.annotations.Nullable; /** * Affinity range. @@ -364,4 +371,4 @@ public class IgfsFileAffinityRange implements Message, Externalizable { @Override public String toString() { return S.toString(IgfsFileAffinityRange.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java index fddfa20..5d7389b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java @@ -17,13 +17,19 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collections; +import java.util.Map; +import org.apache.ignite.igfs.IgfsFile; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; /** * File or directory information. @@ -249,4 +255,4 @@ public final class IgfsFileImpl implements IgfsFile, Externalizable { @Override public String toString() { return S.toString(IgfsFileImpl.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java index de7d077..116d585 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java @@ -17,17 +17,22 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.configuration.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collections; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.GridLeanMap; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; /** * Unmodifiable file information. @@ -567,4 +572,4 @@ public final class IgfsFileInfo implements Externalizable { return info; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java index 8f16ff2..2c0358b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java @@ -17,17 +17,21 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; - -import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_MOVED; /** * Auxiliary class that is responsible for managing file affinity keys allocation by ranges. @@ -358,4 +362,4 @@ public class IgfsFileMap implements Externalizable { @Override public String toString() { return S.toString(IgfsFileMap.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java index 1a2f3cb..6bea187 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerBatch.java @@ -17,13 +17,15 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.OutputStream; +import java.util.concurrent.BlockingDeque; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Work batch is an abstraction of the logically grouped tasks. @@ -193,4 +195,4 @@ public abstract class IgfsFileWorkerBatch implements Runnable { * Callback invoked when execution finishes. */ protected abstract void onDone(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java index 61949d7..773d758 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java @@ -17,30 +17,51 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.util.worker.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.thread.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.locks.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; -import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.util.GridConcurrentHashSet; +import org.apache.ignite.internal.util.GridSpinReadWriteLock; +import org.apache.ignite.internal.util.typedef.CX1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.internal.util.worker.GridWorker; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.thread.IgniteThread; +import org.jetbrains.annotations.Nullable; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; +import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; +import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS; +import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL; +import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_INITIAL; +import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_MOVED; +import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.RANGE_STATUS_MOVING; /** * IGFS fragmentizer manager. @@ -828,4 +849,4 @@ public class IgfsFragmentizerManager extends IgfsManager { return this == o; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java index cf657e3..75d77bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java @@ -17,15 +17,16 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; -import java.util.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import java.util.Collection; +import org.apache.ignite.internal.GridDirectCollection; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Fragmentizer request. Sent from coordinator to other IGFS nodes when colocated part of file @@ -151,4 +152,4 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { @Override public byte fieldsCount() { return 2; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java index 6dd7534..b0f8a6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; - -import java.io.*; -import java.nio.*; +import java.io.Externalizable; +import java.nio.ByteBuffer; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.MessageReader; +import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Fragmentizer response. @@ -113,4 +113,4 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { @Override public byte fieldsCount() { return 1; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java index 61efe32..1ba98ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java @@ -17,9 +17,11 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Handshake message. @@ -119,4 +121,4 @@ public class IgfsHandshakeResponse implements Externalizable { if (in.readBoolean()) sampling = in.readBoolean(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java index 4795478..094c241 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.CacheConfiguration; /** * IGFS utility processor adapter. @@ -46,4 +46,4 @@ public interface IgfsHelper { * @return {@code True} if IGFS block key. */ public abstract boolean isIgfsBlockKey(Object key); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java index f15e0df..29e75a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java @@ -17,11 +17,13 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cache.eviction.*; -import org.apache.ignite.cache.eviction.igfs.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cache.eviction.EvictionFilter; +import org.apache.ignite.cache.eviction.EvictionPolicy; +import org.apache.ignite.cache.eviction.igfs.IgfsEvictionFilter; +import org.apache.ignite.cache.eviction.igfs.IgfsPerBlockLruEvictionPolicy; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.internal.util.typedef.internal.U; /** * IGFS utils processor. @@ -52,4 +54,4 @@ public class IgfsHelperImpl implements IgfsHelper { @Override public boolean isIgfsBlockKey(Object key) { return key instanceof IgfsBlockKey; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index c3495e9..695db38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -17,42 +17,104 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cache.eviction.*; -import org.apache.ignite.cache.eviction.igfs.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.mapreduce.*; -import org.apache.ignite.igfs.secondary.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.*; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cache.eviction.EvictionPolicy; +import org.apache.ignite.cache.eviction.igfs.IgfsPerBlockLruEvictionPolicy; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; +import org.apache.ignite.events.IgfsEvent; +import org.apache.ignite.igfs.IgfsBlockLocation; +import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException; +import org.apache.ignite.igfs.IgfsFile; +import org.apache.ignite.igfs.IgfsInvalidPathException; +import org.apache.ignite.igfs.IgfsMetrics; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.IgfsOutputStream; +import org.apache.ignite.igfs.IgfsParentNotDirectoryException; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.IgfsPathAlreadyExistsException; +import org.apache.ignite.igfs.IgfsPathIsDirectoryException; +import org.apache.ignite.igfs.IgfsPathNotFoundException; +import org.apache.ignite.igfs.IgfsPathSummary; +import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; +import org.apache.ignite.igfs.mapreduce.IgfsTask; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.managers.communication.GridMessageListener; +import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; +import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.GridSpinBusyLock; +import org.apache.ignite.internal.util.future.GridCompoundFuture; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.thread.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.igfs.IgfsMode.*; -import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.IgniteNodeAttributes.*; -import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.thread.IgniteThreadPoolExecutor; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + +import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED; +import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED; +import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CLOSED_READ; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CLOSED_WRITE; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CREATED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_READ; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_WRITE; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_RENAMED; +import static org.apache.ignite.events.EventType.EVT_IGFS_META_UPDATED; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; +import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; +import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC; +import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC; +import static org.apache.ignite.igfs.IgfsMode.PRIMARY; +import static org.apache.ignite.igfs.IgfsMode.PROXY; +import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS; +import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.ROOT_ID; +import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID; /** * Cache-based IGFS implementation. @@ -2140,4 +2202,4 @@ public final class IgfsImpl implements IgfsEx { return t; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java index fc333b5..afcece7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java @@ -17,10 +17,9 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; - -import java.io.*; +import java.io.IOException; +import org.apache.ignite.igfs.IgfsInputStream; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable; /** * Implementation adapter providing necessary methods. @@ -48,4 +47,4 @@ public abstract class IgfsInputStreamAdapter extends IgfsInputStream * @throws IOException If read failed. */ public abstract byte[][] readChunks(long pos, int len) throws IOException; -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java index 7a98fb9..ac42d44 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java @@ -17,7 +17,10 @@ package org.apache.ignite.internal.processors.igfs; -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; /** * IGFS input stream descriptor - includes stream id and length. @@ -75,4 +78,4 @@ public class IgfsInputStreamDescriptor implements Externalizable { streamId = in.readLong(); len = in.readLong(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java index 6c35032..62f8034 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java @@ -17,19 +17,30 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.locks.*; +import java.io.EOFException; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.igfs.IgfsCorruptedFileException; +import org.apache.ignite.igfs.IgfsInputStream; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.IgfsPathNotFoundException; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.GridConcurrentHashSet; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteInClosure; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Input stream to read data from grid cache with separate blocks. @@ -531,4 +542,4 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter { @Override public String toString() { return S.toString(IgfsInputStreamImpl.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java index 8126487..cd93278 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInvalidRangeException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; +import org.apache.ignite.IgniteCheckedException; /** * Internal exception thrown when attempted to update range that is no longer present @@ -40,4 +40,4 @@ public class IgfsInvalidRangeException extends IgniteCheckedException { public IgfsInvalidRangeException(Throwable cause) { super(cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java index cfe6ed4..0ed7c0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java @@ -17,21 +17,34 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.igfs.common.*; -import org.apache.ignite.internal.processors.closure.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.io.Closeable; +import java.io.DataInput; +import java.io.IOException; +import java.util.Iterator; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.igfs.IgfsOutOfSpaceException; +import org.apache.ignite.igfs.IgfsOutputStream; +import org.apache.ignite.igfs.IgfsUserContext; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.igfs.common.IgfsControlResponse; +import org.apache.ignite.internal.igfs.common.IgfsHandshakeRequest; +import org.apache.ignite.internal.igfs.common.IgfsIpcCommand; +import org.apache.ignite.internal.igfs.common.IgfsMessage; +import org.apache.ignite.internal.igfs.common.IgfsPathControlRequest; +import org.apache.ignite.internal.igfs.common.IgfsStreamControlRequest; +import org.apache.ignite.internal.processors.closure.GridClosurePolicy; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.lang.GridPlainCallable; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteOutClosure; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; /** * IGFS IPC handler. @@ -569,4 +582,4 @@ class IgfsIpcHandler implements IgfsServerHandler { @Nullable private Closeable resource(IgfsClientSession ses, Long rsrcId) { return ses.resource(rsrcId); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java index fa90e21..d9d68ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java @@ -17,14 +17,20 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.mapreduce.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.resources.*; - -import java.io.*; +import java.io.IOException; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.igfs.IgfsInputStream; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.mapreduce.IgfsFileRange; +import org.apache.ignite.igfs.mapreduce.IgfsJob; +import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; +import org.apache.ignite.internal.GridInternalWrapper; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.resources.LoggerResource; /** * IGFS job implementation. @@ -114,4 +120,4 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> { @Override public IgfsJob userObject() { return job; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java index 508b52a..1cdc8a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Map; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; /** * Directory listing entry. @@ -194,4 +197,4 @@ public class IgfsListingEntry implements Externalizable { @Override public String toString() { return S.toString(IgfsListingEntry.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java index d715e9a..8245bbd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.jsr166.*; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.lang.IgniteBiTuple; +import org.jsr166.LongAdder8; /** * Value object holding all local IGFS metrics which cannot be determined using file system traversal. @@ -209,4 +209,4 @@ public class IgfsLocalMetrics { bytesRead = F.t(new LongAdder8(), new LongAdder8()); bytesWritten = F.t(new LongAdder8(), new LongAdder8()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java index b33ee15..1217d0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; - -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; /** * Abstract class for IGFS managers. @@ -152,4 +152,4 @@ public abstract class IgfsManager { protected String kernalStopInfo() { return "Cache manager received onKernalStop() callback: " + getClass().getSimpleName(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java index aabe503..5611f33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java @@ -17,34 +17,75 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.transactions.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import javax.cache.processor.*; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.events.EventType.*; -import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*; -import static org.apache.ignite.transactions.TransactionConcurrency.*; -import static org.apache.ignite.transactions.TransactionIsolation.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.CountDownLatch; +import javax.cache.processor.EntryProcessor; +import javax.cache.processor.MutableEntry; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteInterruptedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.events.IgfsEvent; +import org.apache.ignite.igfs.IgfsConcurrentModificationException; +import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException; +import org.apache.ignite.igfs.IgfsException; +import org.apache.ignite.igfs.IgfsFile; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.IgfsPathAlreadyExistsException; +import org.apache.ignite.igfs.IgfsPathIsDirectoryException; +import org.apache.ignite.igfs.IgfsPathIsNotDirectoryException; +import org.apache.ignite.igfs.IgfsPathNotFoundException; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.GridCacheInternal; +import org.apache.ignite.internal.processors.cache.IgniteInternalCache; +import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.GridLeanMap; +import org.apache.ignite.internal.util.GridSpinBusyLock; +import org.apache.ignite.internal.util.lang.GridClosureException; +import org.apache.ignite.internal.util.lang.IgniteOutClosureX; +import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED; +import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CREATED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_PURGED; +import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_RENAMED; +import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.ROOT_ID; +import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID; +import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.builder; +import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** * Cache based structure (meta data) manager. @@ -3026,4 +3067,4 @@ public class IgfsMetaManager extends IgfsManager { return S.toString(UpdatePath.class, this); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java index 41e296e..c8ad049 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java @@ -17,10 +17,12 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.igfs.IgfsMetrics; +import org.apache.ignite.internal.util.typedef.internal.S; /** * IGFS metrics adapter. @@ -236,4 +238,4 @@ public class IgfsMetricsAdapter implements IgfsMetrics, Externalizable { @Override public String toString() { return S.toString(IgfsMetricsAdapter.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java index fd0c485..70da103 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java @@ -17,12 +17,18 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; +import org.apache.ignite.internal.util.typedef.T2; +import org.jetbrains.annotations.Nullable; /** * @@ -174,4 +180,4 @@ public class IgfsModeResolver { // Path and prefix components had same length and all of them matched. return true; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java index ca83145..492927b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.CacheConfiguration; /** * No-op utils processor adapter. @@ -38,4 +38,4 @@ public class IgfsNoopHelper implements IgfsHelper { @Override public boolean isIgfsBlockKey(Object key) { return false; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java index 41dcc31..08eef8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java @@ -17,16 +17,17 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.mapreduce.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.ipc.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.mapreduce.IgfsJob; +import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.util.ipc.IpcServerEndpoint; +import org.apache.ignite.internal.util.typedef.X; +import org.jetbrains.annotations.Nullable; /** * Nop Ignite file system processor implementation. @@ -68,4 +69,4 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter { long start, long length, IgfsRecordResolver recRslv) { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java index 6edc209..43de61e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamAdapter.java @@ -17,13 +17,15 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; +import java.io.DataInput; +import java.io.IOException; +import java.nio.ByteBuffer; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.igfs.IgfsOutputStream; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * Output stream to store data into grid cache with separate blocks. @@ -260,4 +262,4 @@ abstract class IgfsOutputStreamAdapter extends IgfsOutputStream { @Override public String toString() { return S.toString(IgfsOutputStreamAdapter.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java index 01359b5..c297eed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java @@ -17,20 +17,30 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.nio.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.igfs.IgfsMode.*; +import java.io.DataInput; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.nio.ByteBuffer; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.igfs.IgfsException; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.IgfsPathNotFoundException; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.IgniteUuid; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC; +import static org.apache.ignite.igfs.IgfsMode.PRIMARY; +import static org.apache.ignite.igfs.IgfsMode.PROXY; /** * Output stream to store data into grid cache with separate blocks. @@ -502,4 +512,4 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter { return S.toString(ReserveSpaceClosure.class, this); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java index d1dd576..fbf89ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java @@ -17,13 +17,18 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Description of path modes. @@ -121,4 +126,4 @@ public class IgfsPaths implements Externalizable { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index f3522a8..5b8cf86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -17,31 +17,48 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.mapreduce.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.util.ipc.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.jetbrains.annotations.*; -import org.jsr166.*; - -import java.util.*; -import java.util.concurrent.*; - -import static org.apache.ignite.IgniteSystemProperties.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentMap; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.cache.affinity.AffinityKeyMapper; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.FileSystemConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper; +import org.apache.ignite.igfs.IgfsMode; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.mapreduce.IgfsJob; +import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.IgniteNodeAttributes; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.util.ipc.IpcServerEndpoint; +import org.apache.ignite.internal.util.typedef.C1; +import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteClosure; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; +import static org.apache.ignite.IgniteSystemProperties.getBoolean; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.*; -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.igfs.IgfsMode.*; -import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES; +import static org.apache.ignite.igfs.IgfsMode.PROXY; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS; /** * Fully operational Ignite file system processor. @@ -424,4 +441,4 @@ public class IgfsProcessor extends IgfsProcessorAdapter { ", loc" + propName + "=" + locVal + ", ggfName=" + igfsName + ']'); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java index ee38ab3..6648c7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java @@ -17,16 +17,16 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.mapreduce.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.util.ipc.*; -import org.jetbrains.annotations.*; - -import java.util.*; +import java.util.Collection; +import org.apache.ignite.IgniteFileSystem; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.mapreduce.IgfsJob; +import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.util.ipc.IpcServerEndpoint; +import org.jetbrains.annotations.Nullable; /** * Ignite file system processor adapter. @@ -77,4 +77,4 @@ public abstract class IgfsProcessorAdapter extends GridProcessorAdapter { */ @Nullable public abstract ComputeJob createJob(IgfsJob job, @Nullable String igfsName, IgfsPath path, long start, long length, IgfsRecordResolver recRslv); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java index 439c8ce..52c9e0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java @@ -17,11 +17,14 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.apache.ignite.internal.processors.cache.GridCacheInternal; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Internal key used to track if sampling enabled or disabled for particular IGFS instance. @@ -80,4 +83,4 @@ class IgfsSamplingKey implements GridCacheInternal, Externalizable { @Override public String toString() { return S.toString(IgfsSamplingKey.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java index 44ee90f..23d6322 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java @@ -17,13 +17,16 @@ package org.apache.ignite.internal.processors.igfs; -import org.apache.ignite.*; -import org.apache.ignite.igfs.*; -import org.apache.ignite.igfs.secondary.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import java.io.OutputStream; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import org.apache.ignite.IgniteException; +import org.apache.ignite.igfs.IgfsFile; +import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; +import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable; +import org.jetbrains.annotations.Nullable; /** * Secondary file system over native IGFS. @@ -123,4 +126,4 @@ class IgfsSecondaryFileSystemImpl implements IgfsSecondaryFileSystem { @Override public void close() throws IgniteException { // No-op. } -} +} \ No newline at end of file
