WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d67d8e83 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d67d8e83 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d67d8e83 Branch: refs/heads/ignite-3553 Commit: d67d8e8323b8c8ffa30e9802800c746cb95624ce Parents: 0275af3 Author: vozerov-gridgain <[email protected]> Authored: Wed Jul 27 10:45:32 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Jul 27 10:45:32 2016 +0300 ---------------------------------------------------------------------- .../igfs/client/IgfsClientClosureManager.java | 22 +++++--------------- 1 file changed, 5 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d67d8e83/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientClosureManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientClosureManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientClosureManager.java index 760a1b2..1065d5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientClosureManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientClosureManager.java @@ -28,6 +28,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; import org.jetbrains.annotations.Nullable; +import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; @@ -36,10 +37,11 @@ import java.util.concurrent.ConcurrentLinkedDeque; * Manager to handle IGFS client closures. */ public class IgfsClientClosureManager extends IgfsManager { - /** Pending closures received when manager is not started yet. */ - private final ConcurrentLinkedDeque startupClos = new ConcurrentLinkedDeque(); + /** Pending input operations received when manager is not started yet. */ + private final ConcurrentLinkedDeque<IgfsClientClosureInOperation> inOps = new ConcurrentLinkedDeque<>(); - private final Map<Long, Operation> ops = new ConcurrentHashMap<>(); + /** Outgoing operations. */ + private final Map<Long, IgfsClientClosureOutOperation> outOps = new ConcurrentHashMap<>(); /** Marshaller. */ private final Marshaller marsh; @@ -148,18 +150,4 @@ public class IgfsClientClosureManager extends IgfsManager { @Override public String toString() { return S.toString(IgfsClientClosureManager.class, this); } - - /** - * Outgoing operation. - */ - private static class OutOperation { - /** Target node ID. */ - private final UUID nodeId; - - /** Target operation. */ - private final IgfsClientAbstractCallable target; - - /** Future, completed when operation is ready. */ - private final IgniteInternalFuture fut; - } }
