ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/50] [abbrv] incubator-ignite git commit: renaming wip
Date Thu, 12 Mar 2015 15:16:17 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImpl.java
deleted file mode 100644
index a7d2e31..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImpl.java
+++ /dev/null
@@ -1,1405 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.datastream;
-
-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.deployment.*;
-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.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.cacheobject.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-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.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-
-/**
- * Data streamer implementation.
- */
-@SuppressWarnings("unchecked")
-public class IgniteDataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed {
-    /** Isolated updater. */
-    private static final Updater ISOLATED_UPDATER = new IsolatedUpdater();
-
-    /** Cache updater. */
-    private Updater<K, V> updater = ISOLATED_UPDATER;
-
-    /** */
-    private byte[] updaterBytes;
-
-    /** Max remap count before issuing an error. */
-    private static final int DFLT_MAX_REMAP_CNT = 32;
-
-    /** Log reference. */
-    private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
-
-    /** Logger. */
-    private static IgniteLogger log;
-
-    /** Cache name ({@code null} for default cache). */
-    private final String cacheName;
-
-
-    /** Per-node buffer size. */
-    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-    private int bufSize = DFLT_PER_NODE_BUFFER_SIZE;
-
-    /** */
-    private int parallelOps = DFLT_MAX_PARALLEL_OPS;
-
-    /** */
-    private long autoFlushFreq;
-
-    /** Mapping. */
-    @GridToStringInclude
-    private ConcurrentMap<UUID, Buffer> bufMappings = new ConcurrentHashMap8<>();
-
-    /** Discovery listener. */
-    private final GridLocalEventListener discoLsnr;
-
-    /** Context. */
-    private final GridKernalContext ctx;
-
-    /** */
-    private final IgniteCacheObjectProcessor cacheObjProc;
-
-    /** */
-    private final CacheObjectContext cacheObjCtx;
-
-    /** Communication topic for responses. */
-    private final Object topic;
-
-    /** */
-    private byte[] topicBytes;
-
-    /** {@code True} if data loader has been cancelled. */
-    private volatile boolean cancelled;
-
-    /** Active futures of this data loader. */
-    @GridToStringInclude
-    private final Collection<IgniteInternalFuture<?>> activeFuts = new GridConcurrentHashSet<>();
-
-    /** Closure to remove from active futures. */
-    @GridToStringExclude
-    private final IgniteInClosure<IgniteInternalFuture<?>> rmvActiveFut = new IgniteInClosure<IgniteInternalFuture<?>>() {
-        @Override public void apply(IgniteInternalFuture<?> t) {
-            boolean rmv = activeFuts.remove(t);
-
-            assert rmv;
-        }
-    };
-
-    /** Job peer deploy aware. */
-    private volatile GridPeerDeployAware jobPda;
-
-    /** Deployment class. */
-    private Class<?> depCls;
-
-    /** Future to track loading finish. */
-    private final GridFutureAdapter<?> fut;
-
-    /** Public API future to track loading finish. */
-    private final IgniteFuture<?> publicFut;
-
-    /** Busy lock. */
-    private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
-
-    /** Closed flag. */
-    private final AtomicBoolean closed = new AtomicBoolean();
-
-    /** */
-    private volatile long lastFlushTime = U.currentTimeMillis();
-
-    /** */
-    private final DelayQueue<IgniteDataStreamerImpl<K, V>> flushQ;
-
-    /** */
-    private boolean skipStore;
-
-    /** */
-    private int maxRemapCnt = DFLT_MAX_REMAP_CNT;
-
-    /** Whether a warning at {@link IgniteDataStreamerImpl#allowOverwrite()} printed */
-    private static boolean isWarningPrinted;
-
-    /**
-     * @param ctx Grid kernal context.
-     * @param cacheName Cache name.
-     * @param flushQ Flush queue.
-     */
-    public IgniteDataStreamerImpl(
-        final GridKernalContext ctx,
-        @Nullable final String cacheName,
-        DelayQueue<IgniteDataStreamerImpl<K, V>> flushQ
-    ) {
-        assert ctx != null;
-
-        this.ctx = ctx;
-        this.cacheObjProc = ctx.cacheObjects();
-
-        if (log == null)
-            log = U.logger(ctx, logRef, IgniteDataStreamerImpl.class);
-
-        ClusterNode node = F.first(ctx.grid().cluster().forCacheNodes(cacheName).nodes());
-
-        if (node == null)
-            throw new IllegalStateException("Cache doesn't exist: " + cacheName);
-
-        this.cacheObjCtx = ctx.cacheObjects().contextForCache(node, cacheName);
-        this.cacheName = cacheName;
-        this.flushQ = flushQ;
-
-        discoLsnr = new GridLocalEventListener() {
-            @Override public void onEvent(Event evt) {
-                assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT;
-
-                DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
-
-                UUID id = discoEvt.eventNode().id();
-
-                // Remap regular mappings.
-                final Buffer buf = bufMappings.remove(id);
-
-                if (buf != null) {
-                    // Only async notification is possible since
-                    // discovery thread may be trapped otherwise.
-                    ctx.closure().callLocalSafe(
-                        new Callable<Object>() {
-                            @Override public Object call() throws Exception {
-                                buf.onNodeLeft();
-
-                                return null;
-                            }
-                        },
-                        true /* system pool */
-                    );
-                }
-            }
-        };
-
-        ctx.event().addLocalEventListener(discoLsnr, EVT_NODE_FAILED, EVT_NODE_LEFT);
-
-        // Generate unique topic for this loader.
-        topic = TOPIC_DATALOAD.topic(IgniteUuid.fromUuid(ctx.localNodeId()));
-
-        ctx.io().addMessageListener(topic, new GridMessageListener() {
-            @Override public void onMessage(UUID nodeId, Object msg) {
-                assert msg instanceof GridDataLoadResponse;
-
-                GridDataLoadResponse res = (GridDataLoadResponse)msg;
-
-                if (log.isDebugEnabled())
-                    log.debug("Received data load response: " + res);
-
-                Buffer buf = bufMappings.get(nodeId);
-
-                if (buf != null)
-                    buf.onResponse(res);
-
-                else if (log.isDebugEnabled())
-                    log.debug("Ignoring response since node has left [nodeId=" + nodeId + ", ");
-            }
-        });
-
-        if (log.isDebugEnabled())
-            log.debug("Added response listener within topic: " + topic);
-
-        fut = new IgniteDataStreamerFuture(ctx, this);
-
-        publicFut = new IgniteFutureImpl<>(fut);
-    }
-
-    /**
-     * @return Cache object context.
-     */
-    public CacheObjectContext cacheObjectContext() {
-        return cacheObjCtx;
-    }
-
-    /**
-     * Enters busy lock.
-     */
-    private void enterBusy() {
-        if (!busyLock.enterBusy())
-            throw new IllegalStateException("Data streamer has been closed.");
-    }
-
-    /**
-     * Leaves busy lock.
-     */
-    private void leaveBusy() {
-        busyLock.leaveBusy();
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteFuture<?> future() {
-        return publicFut;
-    }
-
-    /**
-     * @return Internal future.
-     */
-    public IgniteInternalFuture<?> internalFuture() {
-        return fut;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void deployClass(Class<?> depCls) {
-        this.depCls = depCls;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void updater(Updater<K, V> updater) {
-        A.notNull(updater, "updater");
-
-        this.updater = updater;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean allowOverwrite() {
-        boolean allow = updater != ISOLATED_UPDATER;
-
-        if (!allow && !isWarningPrinted) {
-            synchronized (this) {
-                if (!isWarningPrinted) {
-                    log.warning("Data streamer will not overwrite existing cache entries for better performance " +
-                        "(to change, set allowOverwrite to true)");
-
-                    isWarningPrinted = true;
-                }
-            }
-        }
-
-        return allow;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void allowOverwrite(boolean allow) {
-        if (allow == allowOverwrite())
-            return;
-
-        ClusterNode node = F.first(ctx.grid().cluster().forCacheNodes(cacheName).nodes());
-
-        if (node == null)
-            throw new IgniteException("Failed to get node for cache: " + cacheName);
-
-        updater = allow ? IgniteDataStreamerCacheUpdaters.<K, V>individual() : ISOLATED_UPDATER;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean skipStore() {
-        return skipStore;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void skipStore(boolean skipStore) {
-        this.skipStore = skipStore;
-    }
-
-    /** {@inheritDoc} */
-    @Override @Nullable public String cacheName() {
-        return cacheName;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int perNodeBufferSize() {
-        return bufSize;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void perNodeBufferSize(int bufSize) {
-        A.ensure(bufSize > 0, "bufSize > 0");
-
-        this.bufSize = bufSize;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int perNodeParallelStreamOperations() {
-        return parallelOps;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void perNodeParallelStreamOperations(int parallelOps) {
-        this.parallelOps = parallelOps;
-    }
-
-    /** {@inheritDoc} */
-    @Override public long autoFlushFrequency() {
-        return autoFlushFreq;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void autoFlushFrequency(long autoFlushFreq) {
-        A.ensure(autoFlushFreq >= 0, "autoFlushFreq >= 0");
-
-        long old = this.autoFlushFreq;
-
-        if (autoFlushFreq != old) {
-            this.autoFlushFreq = autoFlushFreq;
-
-            if (autoFlushFreq != 0 && old == 0)
-                flushQ.add(this);
-            else if (autoFlushFreq == 0)
-                flushQ.remove(this);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteFuture<?> addData(Map<K, V> entries) throws IllegalStateException {
-        A.notNull(entries, "entries");
-
-        return addData(entries.entrySet());
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteFuture<?> addData(Collection<? extends Map.Entry<K, V>> entries) {
-        A.notEmpty(entries, "entries");
-
-        enterBusy();
-
-        try {
-            GridFutureAdapter<Object> resFut = new GridFutureAdapter<>();
-
-            resFut.listen(rmvActiveFut);
-
-            activeFuts.add(resFut);
-
-            Collection<KeyCacheObject> keys = null;
-
-            if (entries.size() > 1) {
-                keys = new GridConcurrentHashSet<>(entries.size(), U.capacity(entries.size()), 1);
-
-                for (Map.Entry<K, V> entry : entries)
-                    keys.add(cacheObjProc.toCacheKeyObject(cacheObjCtx, entry.getKey(), true));
-            }
-
-            Collection<? extends IgniteDataLoaderEntry> entries0 = F.viewReadOnly(entries, new C1<Entry<K, V>, IgniteDataLoaderEntry>() {
-                @Override public IgniteDataLoaderEntry apply(Entry<K, V> e) {
-                    KeyCacheObject key = cacheObjProc.toCacheKeyObject(cacheObjCtx, e.getKey(), true);
-                    CacheObject val = cacheObjProc.toCacheObject(cacheObjCtx, e.getValue(), true);
-
-                    return new IgniteDataLoaderEntry(key, val);
-                }
-            });
-
-            load0(entries0, resFut, keys, 0);
-
-            return new IgniteFutureImpl<>(resFut);
-        }
-        catch (IgniteException e) {
-            return new IgniteFinishedFutureImpl<>(e);
-        }
-        finally {
-            leaveBusy();
-        }
-    }
-
-    /**
-     * @param key Key.
-     * @param val Value.
-     * @return Future.
-     */
-    public IgniteFuture<?> addDataInternal(KeyCacheObject key, CacheObject val) {
-        return addDataInternal(Collections.singleton(new IgniteDataLoaderEntry(key, val)));
-    }
-
-    /**
-     * @param key Key.
-     * @return Future.
-     */
-    public IgniteFuture<?> removeDataInternal(KeyCacheObject key) {
-        return addDataInternal(Collections.singleton(new IgniteDataLoaderEntry(key, null)));
-    }
-
-    /**
-     * @param entries Entries.
-     * @return Future.
-     */
-    public IgniteFuture<?> addDataInternal(Collection<? extends IgniteDataLoaderEntry> entries) {
-        enterBusy();
-
-        GridFutureAdapter<Object> resFut = new GridFutureAdapter<>();
-
-        try {
-            resFut.listen(rmvActiveFut);
-
-            activeFuts.add(resFut);
-
-            Collection<KeyCacheObject> keys = null;
-
-            if (entries.size() > 1) {
-                keys = new GridConcurrentHashSet<>(entries.size(), U.capacity(entries.size()), 1);
-
-                for (IgniteDataLoaderEntry entry : entries)
-                    keys.add(entry.getKey());
-            }
-
-            load0(entries, resFut, keys, 0);
-
-            return new IgniteFutureImpl<>(resFut);
-        }
-        catch (Throwable e) {
-            resFut.onDone(e);
-
-            if (e instanceof Error)
-                throw e;
-
-            return new IgniteFinishedFutureImpl<>(e);
-        }
-        finally {
-            leaveBusy();
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteFuture<?> addData(Map.Entry<K, V> entry) {
-        A.notNull(entry, "entry");
-
-        return addData(F.asList(entry));
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteFuture<?> addData(K key, V val) {
-        A.notNull(key, "key");
-
-        KeyCacheObject key0 = cacheObjProc.toCacheKeyObject(cacheObjCtx, key, true);
-        CacheObject val0 = cacheObjProc.toCacheObject(cacheObjCtx, val, true);
-
-        return addDataInternal(Collections.singleton(new IgniteDataLoaderEntry(key0, val0)));
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteFuture<?> removeData(K key) {
-        return addData(key, null);
-    }
-
-    /**
-     * @param entries Entries.
-     * @param resFut Result future.
-     * @param activeKeys Active keys.
-     * @param remaps Remaps count.
-     */
-    private void load0(
-        Collection<? extends IgniteDataLoaderEntry> entries,
-        final GridFutureAdapter<Object> resFut,
-        @Nullable final Collection<KeyCacheObject> activeKeys,
-        final int remaps
-    ) {
-        assert entries != null;
-
-        Map<ClusterNode, Collection<IgniteDataLoaderEntry>> mappings = new HashMap<>();
-
-        boolean initPda = ctx.deploy().enabled() && jobPda == null;
-
-        for (IgniteDataLoaderEntry entry : entries) {
-            List<ClusterNode> nodes;
-
-            try {
-                KeyCacheObject key = entry.getKey();
-
-                assert key != null;
-
-                if (initPda) {
-                    jobPda = new DataStreamerPda(key.value(cacheObjCtx, false),
-                        entry.getValue() != null ? entry.getValue().value(cacheObjCtx, false) : null,
-                        updater);
-
-                    initPda = false;
-                }
-
-                nodes = nodes(key);
-            }
-            catch (IgniteCheckedException e) {
-                resFut.onDone(e);
-
-                return;
-            }
-
-            if (F.isEmpty(nodes)) {
-                resFut.onDone(new ClusterTopologyException("Failed to map key to node " +
-                    "(no nodes with cache found in topology) [infos=" + entries.size() +
-                    ", cacheName=" + cacheName + ']'));
-
-                return;
-            }
-
-            for (ClusterNode node : nodes) {
-                Collection<IgniteDataLoaderEntry> col = mappings.get(node);
-
-                if (col == null)
-                    mappings.put(node, col = new ArrayList<>());
-
-                col.add(entry);
-            }
-        }
-
-        for (final Map.Entry<ClusterNode, Collection<IgniteDataLoaderEntry>> e : mappings.entrySet()) {
-            final UUID nodeId = e.getKey().id();
-
-            Buffer buf = bufMappings.get(nodeId);
-
-            if (buf == null) {
-                Buffer old = bufMappings.putIfAbsent(nodeId, buf = new Buffer(e.getKey()));
-
-                if (old != null)
-                    buf = old;
-            }
-
-            final Collection<IgniteDataLoaderEntry> entriesForNode = e.getValue();
-
-            IgniteInClosure<IgniteInternalFuture<?>> lsnr = new IgniteInClosure<IgniteInternalFuture<?>>() {
-                @Override public void apply(IgniteInternalFuture<?> t) {
-                    try {
-                        t.get();
-
-                        if (activeKeys != null) {
-                            for (IgniteDataLoaderEntry e : entriesForNode)
-                                activeKeys.remove(e.getKey());
-
-                            if (activeKeys.isEmpty())
-                                resFut.onDone();
-                        }
-                        else {
-                            assert entriesForNode.size() == 1;
-
-                            // That has been a single key,
-                            // so complete result future right away.
-                            resFut.onDone();
-                        }
-                    }
-                    catch (IgniteCheckedException e1) {
-                        if (log.isDebugEnabled())
-                            log.debug("Future finished with error [nodeId=" + nodeId + ", err=" + e1 + ']');
-
-                        if (cancelled) {
-                            resFut.onDone(new IgniteCheckedException("Data streamer has been cancelled: " +
-                                IgniteDataStreamerImpl.this, e1));
-                        }
-                        else if (remaps + 1 > maxRemapCnt) {
-                            resFut.onDone(new IgniteCheckedException("Failed to finish operation (too many remaps): "
-                                + remaps), e1);
-                        }
-                        else
-                            load0(entriesForNode, resFut, activeKeys, remaps + 1);
-                    }
-                }
-            };
-
-            GridFutureAdapter<?> f;
-
-            try {
-                f = buf.update(entriesForNode, lsnr);
-            }
-            catch (IgniteInterruptedCheckedException e1) {
-                resFut.onDone(e1);
-
-                return;
-            }
-
-            if (ctx.discovery().node(nodeId) == null) {
-                if (bufMappings.remove(nodeId, buf))
-                    buf.onNodeLeft();
-
-                if (f != null)
-                    f.onDone(new ClusterTopologyCheckedException("Failed to wait for request completion " +
-                        "(node has left): " + nodeId));
-            }
-        }
-    }
-
-    /**
-     * @param key Key to map.
-     * @return Nodes to send requests to.
-     * @throws IgniteCheckedException If failed.
-     */
-    private List<ClusterNode> nodes(KeyCacheObject key) throws IgniteCheckedException {
-        GridAffinityProcessor aff = ctx.affinity();
-
-        return !allowOverwrite() ? aff.mapKeyToPrimaryAndBackups(cacheName, key) :
-            Collections.singletonList(aff.mapKeyToNode(cacheName, key));
-    }
-
-    /**
-     * Performs flush.
-     *
-     * @throws IgniteCheckedException If failed.
-     */
-    private void doFlush() throws IgniteCheckedException {
-        lastFlushTime = U.currentTimeMillis();
-
-        List<IgniteInternalFuture> activeFuts0 = null;
-
-        int doneCnt = 0;
-
-        for (IgniteInternalFuture<?> f : activeFuts) {
-            if (!f.isDone()) {
-                if (activeFuts0 == null)
-                    activeFuts0 = new ArrayList<>((int)(activeFuts.size() * 1.2));
-
-                activeFuts0.add(f);
-            }
-            else {
-                f.get();
-
-                doneCnt++;
-            }
-        }
-
-        if (activeFuts0 == null || activeFuts0.isEmpty())
-            return;
-
-        while (true) {
-            Queue<IgniteInternalFuture<?>> q = null;
-
-            for (Buffer buf : bufMappings.values()) {
-                IgniteInternalFuture<?> flushFut = buf.flush();
-
-                if (flushFut != null) {
-                    if (q == null)
-                        q = new ArrayDeque<>(bufMappings.size() * 2);
-
-                    q.add(flushFut);
-                }
-            }
-
-            if (q != null) {
-                assert !q.isEmpty();
-
-                boolean err = false;
-
-                for (IgniteInternalFuture fut = q.poll(); fut != null; fut = q.poll()) {
-                    try {
-                        fut.get();
-                    }
-                    catch (IgniteCheckedException e) {
-                        if (log.isDebugEnabled())
-                            log.debug("Failed to flush buffer: " + e);
-
-                        err = true;
-                    }
-                }
-
-                if (err)
-                    // Remaps needed - flush buffers.
-                    continue;
-            }
-
-            doneCnt = 0;
-
-            for (int i = 0; i < activeFuts0.size(); i++) {
-                IgniteInternalFuture f = activeFuts0.get(i);
-
-                if (f == null)
-                    doneCnt++;
-                else if (f.isDone()) {
-                    f.get();
-
-                    doneCnt++;
-
-                    activeFuts0.set(i, null);
-                }
-                else
-                    break;
-            }
-
-            if (doneCnt == activeFuts0.size())
-                return;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    @Override public void flush() throws IgniteException {
-        enterBusy();
-
-        try {
-            doFlush();
-        }
-        catch (IgniteCheckedException e) {
-            throw U.convertException(e);
-        }
-        finally {
-            leaveBusy();
-        }
-    }
-
-    /**
-     * Flushes every internal buffer if buffer was flushed before passed in
-     * threshold.
-     * <p>
-     * Does not wait for result and does not fail on errors assuming that this method
-     * should be called periodically.
-     */
-    @Override public void tryFlush() throws IgniteInterruptedException {
-        if (!busyLock.enterBusy())
-            return;
-
-        try {
-            for (Buffer buf : bufMappings.values())
-                buf.flush();
-
-            lastFlushTime = U.currentTimeMillis();
-        }
-        catch (IgniteInterruptedCheckedException e) {
-            throw U.convertException(e);
-        }
-        finally {
-            leaveBusy();
-        }
-    }
-
-    /**
-     * @param cancel {@code True} to close with cancellation.
-     * @throws IgniteException If failed.
-     */
-    @Override public void close(boolean cancel) throws IgniteException {
-        try {
-            closeEx(cancel);
-        }
-        catch (IgniteCheckedException e) {
-            throw U.convertException(e);
-        }
-    }
-
-    /**
-     * @param cancel {@code True} to close with cancellation.
-     * @throws IgniteCheckedException If failed.
-     */
-    public void closeEx(boolean cancel) throws IgniteCheckedException {
-        if (!closed.compareAndSet(false, true))
-            return;
-
-        busyLock.block();
-
-        if (log.isDebugEnabled())
-            log.debug("Closing data streamer [ldr=" + this + ", cancel=" + cancel + ']');
-
-        IgniteCheckedException e = null;
-
-        try {
-            // Assuming that no methods are called on this loader after this method is called.
-            if (cancel) {
-                cancelled = true;
-
-                for (Buffer buf : bufMappings.values())
-                    buf.cancelAll();
-            }
-            else
-                doFlush();
-
-            ctx.event().removeLocalEventListener(discoLsnr);
-
-            ctx.io().removeMessageListener(topic);
-        }
-        catch (IgniteCheckedException e0) {
-            e = e0;
-        }
-
-        fut.onDone(null, e);
-
-        if (e != null)
-            throw e;
-    }
-
-    /**
-     * @return {@code true} If the loader is closed.
-     */
-    boolean isClosed() {
-        return fut.isDone();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() throws IgniteException {
-        close(false);
-    }
-
-    /**
-     * @return Max remap count.
-     */
-    public int maxRemapCount() {
-        return maxRemapCnt;
-    }
-
-    /**
-     * @param maxRemapCnt New max remap count.
-     */
-    public void maxRemapCount(int maxRemapCnt) {
-        this.maxRemapCnt = maxRemapCnt;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(IgniteDataStreamerImpl.class, this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public long getDelay(TimeUnit unit) {
-        return unit.convert(nextFlushTime() - U.currentTimeMillis(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * @return Next flush time.
-     */
-    private long nextFlushTime() {
-        return lastFlushTime + autoFlushFreq;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int compareTo(Delayed o) {
-        return nextFlushTime() > ((IgniteDataStreamerImpl)o).nextFlushTime() ? 1 : -1;
-    }
-
-    /**
-     *
-     */
-    private class Buffer {
-        /** Node. */
-        private final ClusterNode node;
-
-        /** Active futures. */
-        private final Collection<IgniteInternalFuture<Object>> locFuts;
-
-        /** Buffered entries. */
-        private List<IgniteDataLoaderEntry> entries;
-
-        /** */
-        @GridToStringExclude
-        private GridFutureAdapter<Object> curFut;
-
-        /** Local node flag. */
-        private final boolean isLocNode;
-
-        /** ID generator. */
-        private final AtomicLong idGen = new AtomicLong();
-
-        /** Active futures. */
-        private final ConcurrentMap<Long, GridFutureAdapter<Object>> reqs;
-
-        /** */
-        private final Semaphore sem;
-
-        /** Closure to signal on task finish. */
-        @GridToStringExclude
-        private final IgniteInClosure<IgniteInternalFuture<Object>> signalC = new IgniteInClosure<IgniteInternalFuture<Object>>() {
-            @Override public void apply(IgniteInternalFuture<Object> t) {
-                signalTaskFinished(t);
-            }
-        };
-
-        /**
-         * @param node Node.
-         */
-        Buffer(ClusterNode node) {
-            assert node != null;
-
-            this.node = node;
-
-            locFuts = new GridConcurrentHashSet<>();
-            reqs = new ConcurrentHashMap8<>();
-
-            // Cache local node flag.
-            isLocNode = node.equals(ctx.discovery().localNode());
-
-            entries = newEntries();
-            curFut = new GridFutureAdapter<>();
-            curFut.listen(signalC);
-
-            sem = new Semaphore(parallelOps);
-        }
-
-        /**
-         * @param newEntries Infos.
-         * @param lsnr Listener for the operation future.
-         * @throws IgniteInterruptedCheckedException If failed.
-         * @return Future for operation.
-         */
-        @Nullable GridFutureAdapter<?> update(Iterable<IgniteDataLoaderEntry> newEntries,
-            IgniteInClosure<IgniteInternalFuture<?>> lsnr) throws IgniteInterruptedCheckedException {
-            List<IgniteDataLoaderEntry> entries0 = null;
-            GridFutureAdapter<Object> curFut0;
-
-            synchronized (this) {
-                curFut0 = curFut;
-
-                curFut0.listen(lsnr);
-
-                for (IgniteDataLoaderEntry entry : newEntries)
-                    entries.add(entry);
-
-                if (entries.size() >= bufSize) {
-                    entries0 = entries;
-
-                    entries = newEntries();
-                    curFut = new GridFutureAdapter<>();
-                    curFut.listen(signalC);
-                }
-            }
-
-            if (entries0 != null) {
-                submit(entries0, curFut0);
-
-                if (cancelled)
-                    curFut0.onDone(new IgniteCheckedException("Data streamer has been cancelled: " + IgniteDataStreamerImpl.this));
-            }
-
-            return curFut0;
-        }
-
-        /**
-         * @return Fresh collection with some space for outgrowth.
-         */
-        private List<IgniteDataLoaderEntry> newEntries() {
-            return new ArrayList<>((int)(bufSize * 1.2));
-        }
-
-        /**
-         * @return Future if any submitted.
-         *
-         * @throws IgniteInterruptedCheckedException If thread has been interrupted.
-         */
-        @Nullable IgniteInternalFuture<?> flush() throws IgniteInterruptedCheckedException {
-            List<IgniteDataLoaderEntry> entries0 = null;
-            GridFutureAdapter<Object> curFut0 = null;
-
-            synchronized (this) {
-                if (!entries.isEmpty()) {
-                    entries0 = entries;
-                    curFut0 = curFut;
-
-                    entries = newEntries();
-                    curFut = new GridFutureAdapter<>();
-                    curFut.listen(signalC);
-                }
-            }
-
-            if (entries0 != null)
-                submit(entries0, curFut0);
-
-            // Create compound future for this flush.
-            GridCompoundFuture<Object, Object> res = null;
-
-            for (IgniteInternalFuture<Object> f : locFuts) {
-                if (res == null)
-                    res = new GridCompoundFuture<>();
-
-                res.add(f);
-            }
-
-            for (IgniteInternalFuture<Object> f : reqs.values()) {
-                if (res == null)
-                    res = new GridCompoundFuture<>();
-
-                res.add(f);
-            }
-
-            if (res != null)
-                res.markInitialized();
-
-            return res;
-        }
-
-        /**
-         * Increments active tasks count.
-         *
-         * @throws IgniteInterruptedCheckedException If thread has been interrupted.
-         */
-        private void incrementActiveTasks() throws IgniteInterruptedCheckedException {
-            U.acquire(sem);
-        }
-
-        /**
-         * @param f Future that finished.
-         */
-        private void signalTaskFinished(IgniteInternalFuture<Object> f) {
-            assert f != null;
-
-            sem.release();
-        }
-
-        /**
-         * @param entries Entries to submit.
-         * @param curFut Current future.
-         * @throws IgniteInterruptedCheckedException If interrupted.
-         */
-        private void submit(final Collection<IgniteDataLoaderEntry> entries, final GridFutureAdapter<Object> curFut)
-            throws IgniteInterruptedCheckedException {
-            assert entries != null;
-            assert !entries.isEmpty();
-            assert curFut != null;
-
-            incrementActiveTasks();
-
-            IgniteInternalFuture<Object> fut;
-
-            if (isLocNode) {
-                fut = ctx.closure().callLocalSafe(
-                    new IgniteDataStreamerUpdateJob(ctx, log, cacheName, entries, false, skipStore, updater), false);
-
-                locFuts.add(fut);
-
-                fut.listen(new IgniteInClosure<IgniteInternalFuture<Object>>() {
-                    @Override public void apply(IgniteInternalFuture<Object> t) {
-                        try {
-                            boolean rmv = locFuts.remove(t);
-
-                            assert rmv;
-
-                            curFut.onDone(t.get());
-                        }
-                        catch (IgniteCheckedException e) {
-                            curFut.onDone(e);
-                        }
-                    }
-                });
-            }
-            else {
-                try {
-                    for (IgniteDataLoaderEntry e : entries) {
-                        e.getKey().prepareMarshal(cacheObjCtx);
-
-                        CacheObject val = e.getValue();
-
-                        if (val != null)
-                            val.prepareMarshal(cacheObjCtx);
-                    }
-
-                    if (updaterBytes == null) {
-                        assert updater != null;
-
-                        updaterBytes = ctx.config().getMarshaller().marshal(updater);
-                    }
-
-                    if (topicBytes == null)
-                        topicBytes = ctx.config().getMarshaller().marshal(topic);
-                }
-                catch (IgniteCheckedException e) {
-                    U.error(log, "Failed to marshal (request will not be sent).", e);
-
-                    return;
-                }
-
-                GridDeployment dep = null;
-                GridPeerDeployAware jobPda0 = null;
-
-                if (ctx.deploy().enabled()) {
-                    try {
-                        jobPda0 = jobPda;
-
-                        assert jobPda0 != null;
-
-                        dep = ctx.deploy().deploy(jobPda0.deployClass(), jobPda0.classLoader());
-
-                        GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(cacheName);
-
-                        if (cache != null)
-                            cache.context().deploy().onEnter();
-                    }
-                    catch (IgniteCheckedException e) {
-                        U.error(log, "Failed to deploy class (request will not be sent): " + jobPda0.deployClass(), e);
-
-                        return;
-                    }
-
-                    if (dep == null)
-                        U.warn(log, "Failed to deploy class (request will be sent): " + jobPda0.deployClass());
-                }
-
-                long reqId = idGen.incrementAndGet();
-
-                fut = curFut;
-
-                reqs.put(reqId, (GridFutureAdapter<Object>)fut);
-
-                GridDataLoadRequest req = new GridDataLoadRequest(
-                    reqId,
-                    topicBytes,
-                    cacheName,
-                    updaterBytes,
-                    entries,
-                    true,
-                    skipStore,
-                    dep != null ? dep.deployMode() : null,
-                    dep != null ? jobPda0.deployClass().getName() : null,
-                    dep != null ? dep.userVersion() : null,
-                    dep != null ? dep.participants() : null,
-                    dep != null ? dep.classLoaderId() : null,
-                    dep == null);
-
-                try {
-                    ctx.io().send(node, TOPIC_DATALOAD, req, PUBLIC_POOL);
-
-                    if (log.isDebugEnabled())
-                        log.debug("Sent request to node [nodeId=" + node.id() + ", req=" + req + ']');
-                }
-                catch (IgniteCheckedException e) {
-                    if (ctx.discovery().alive(node) && ctx.discovery().pingNode(node.id()))
-                        ((GridFutureAdapter<Object>)fut).onDone(e);
-                    else
-                        ((GridFutureAdapter<Object>)fut).onDone(new ClusterTopologyCheckedException("Failed to send " +
-                            "request (node has left): " + node.id()));
-                }
-            }
-        }
-
-        /**
-         *
-         */
-        void onNodeLeft() {
-            assert !isLocNode;
-            assert bufMappings.get(node.id()) != this;
-
-            if (log.isDebugEnabled())
-                log.debug("Forcibly completing futures (node has left): " + node.id());
-
-            Exception e = new ClusterTopologyCheckedException("Failed to wait for request completion " +
-                "(node has left): " + node.id());
-
-            for (GridFutureAdapter<Object> f : reqs.values())
-                f.onDone(e);
-
-            // Make sure to complete current future.
-            GridFutureAdapter<Object> curFut0;
-
-            synchronized (this) {
-                curFut0 = curFut;
-            }
-
-            curFut0.onDone(e);
-        }
-
-        /**
-         * @param res Response.
-         */
-        void onResponse(GridDataLoadResponse res) {
-            if (log.isDebugEnabled())
-                log.debug("Received data load response: " + res);
-
-            GridFutureAdapter<?> f = reqs.remove(res.requestId());
-
-            if (f == null) {
-                if (log.isDebugEnabled())
-                    log.debug("Future for request has not been found: " + res.requestId());
-
-                return;
-            }
-
-            Throwable err = null;
-
-            byte[] errBytes = res.errorBytes();
-
-            if (errBytes != null) {
-                try {
-                    GridPeerDeployAware jobPda0 = jobPda;
-
-                    err = ctx.config().getMarshaller().unmarshal(
-                        errBytes,
-                        jobPda0 != null ? jobPda0.classLoader() : U.gridClassLoader());
-                }
-                catch (IgniteCheckedException e) {
-                    f.onDone(null, new IgniteCheckedException("Failed to unmarshal response.", e));
-
-                    return;
-                }
-            }
-
-            f.onDone(null, err);
-
-            if (log.isDebugEnabled())
-                log.debug("Finished future [fut=" + f + ", reqId=" + res.requestId() + ", err=" + err + ']');
-        }
-
-        /**
-         *
-         */
-        void cancelAll() {
-            IgniteCheckedException err = new IgniteCheckedException("Data streamer has been cancelled: " + IgniteDataStreamerImpl.this);
-
-            for (IgniteInternalFuture<?> f : locFuts) {
-                try {
-                    f.cancel();
-                }
-                catch (IgniteCheckedException e) {
-                    U.error(log, "Failed to cancel mini-future.", e);
-                }
-            }
-
-            for (GridFutureAdapter<?> f : reqs.values())
-                f.onDone(err);
-        }
-
-        /** {@inheritDoc} */
-        @Override public String toString() {
-            int size;
-
-            synchronized (this) {
-                size = entries.size();
-            }
-
-            return S.toString(Buffer.class, this,
-                "entriesCnt", size,
-                "locFutsSize", locFuts.size(),
-                "reqsSize", reqs.size());
-        }
-    }
-
-    /**
-     * Data streamer peer-deploy aware.
-     */
-    private class DataStreamerPda implements GridPeerDeployAware {
-        /** */
-        private static final long serialVersionUID = 0L;
-
-        /** Deploy class. */
-        private Class<?> cls;
-
-        /** Class loader. */
-        private ClassLoader ldr;
-
-        /** Collection of objects to detect deploy class and class loader. */
-        private Collection<Object> objs;
-
-        /**
-         * Constructs data streamer peer-deploy aware.
-         *
-         * @param objs Collection of objects to detect deploy class and class loader.
-         */
-        private DataStreamerPda(Object... objs) {
-            this.objs = Arrays.asList(objs);
-        }
-
-        /** {@inheritDoc} */
-        @Override public Class<?> deployClass() {
-            if (cls == null) {
-                Class<?> cls0 = null;
-
-                if (depCls != null)
-                    cls0 = depCls;
-                else {
-                    for (Iterator<Object> it = objs.iterator(); (cls0 == null || U.isJdk(cls0)) && it.hasNext();) {
-                        Object o = it.next();
-
-                        if (o != null)
-                            cls0 = U.detectClass(o);
-                    }
-
-                    if (cls0 == null || U.isJdk(cls0))
-                        cls0 = IgniteDataStreamerImpl.class;
-                }
-
-                assert cls0 != null : "Failed to detect deploy class [objs=" + objs + ']';
-
-                cls = cls0;
-            }
-
-            return cls;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClassLoader classLoader() {
-            if (ldr == null) {
-                ClassLoader ldr0 = deployClass().getClassLoader();
-
-                // Safety.
-                if (ldr0 == null)
-                    ldr0 = U.gridClassLoader();
-
-                assert ldr0 != null : "Failed to detect classloader [objs=" + objs + ']';
-
-                ldr = ldr0;
-            }
-
-            return ldr;
-        }
-    }
-
-    /**
-     * Isolated updater which only loads entry initial value.
-     */
-    private static class IsolatedUpdater implements Updater<KeyCacheObject, CacheObject>,
-        IgniteDataStreamerCacheUpdaters.InternalUpdater {
-        /** */
-        private static final long serialVersionUID = 0L;
-
-        /** {@inheritDoc} */
-        @Override public void update(IgniteCache<KeyCacheObject, CacheObject> cache,
-            Collection<Map.Entry<KeyCacheObject, CacheObject>> entries) {
-            IgniteCacheProxy<KeyCacheObject, CacheObject> proxy = (IgniteCacheProxy<KeyCacheObject, CacheObject>)cache;
-
-            GridCacheAdapter<KeyCacheObject, CacheObject> internalCache = proxy.context().cache();
-
-            if (internalCache.isNear())
-                internalCache = internalCache.context().near().dht();
-
-            GridCacheContext cctx = internalCache.context();
-
-            long topVer = cctx.affinity().affinityTopologyVersion();
-
-            GridCacheVersion ver = cctx.versions().next(topVer);
-
-            for (Map.Entry<KeyCacheObject, CacheObject> e : entries) {
-                try {
-                    e.getKey().finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader());
-
-                    GridCacheEntryEx entry = internalCache.entryEx(e.getKey(), topVer);
-
-                    entry.unswap(true, false);
-
-                    entry.initialValue(e.getValue(),
-                        ver,
-                        CU.TTL_ETERNAL,
-                        CU.EXPIRE_TIME_ETERNAL,
-                        false,
-                        topVer,
-                        GridDrType.DR_LOAD);
-
-                    cctx.evicts().touch(entry, topVer);
-                }
-                catch (GridDhtInvalidPartitionException | GridCacheEntryRemovedException ignored) {
-                    // No-op.
-                }
-                catch (IgniteCheckedException ex) {
-                    IgniteLogger log = cache.unwrap(Ignite.class).log();
-
-                    U.error(log, "Failed to set initial value for cache entry: " + e, ex);
-                }
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessor.java
deleted file mode 100644
index 1b08a2c..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessor.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.datastream;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.*;
-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.marshaller.*;
-import org.apache.ignite.thread.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-
-/**
- *
- */
-public class IgniteDataStreamerProcessor<K, V> extends GridProcessorAdapter {
-    /** Loaders map (access is not supposed to be highly concurrent). */
-    private Collection<IgniteDataStreamerImpl> ldrs = new GridConcurrentHashSet<>();
-
-    /** Busy lock. */
-    private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
-
-    /** Flushing thread. */
-    private Thread flusher;
-
-    /** */
-    private final DelayQueue<IgniteDataStreamerImpl<K, V>> flushQ = new DelayQueue<>();
-
-    /** Marshaller. */
-    private final Marshaller marsh;
-
-    /**
-     * @param ctx Kernal context.
-     */
-    public IgniteDataStreamerProcessor(GridKernalContext ctx) {
-        super(ctx);
-
-        ctx.io().addMessageListener(TOPIC_DATALOAD, new GridMessageListener() {
-            @Override public void onMessage(UUID nodeId, Object msg) {
-                assert msg instanceof GridDataLoadRequest;
-
-                processDataLoadRequest(nodeId, (GridDataLoadRequest)msg);
-            }
-        });
-
-        marsh = ctx.config().getMarshaller();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void start() throws IgniteCheckedException {
-        if (ctx.config().isDaemon())
-            return;
-
-        flusher = new IgniteThread(new GridWorker(ctx.gridName(), "grid-data-loader-flusher", log) {
-            @Override protected void body() throws InterruptedException {
-                while (!isCancelled()) {
-                    IgniteDataStreamerImpl<K, V> ldr = flushQ.take();
-
-                    if (!busyLock.enterBusy())
-                        return;
-
-                    try {
-                        if (ldr.isClosed())
-                            continue;
-
-                        ldr.tryFlush();
-
-                        flushQ.offer(ldr);
-                    }
-                    finally {
-                        busyLock.leaveBusy();
-                    }
-                }
-            }
-        });
-
-        flusher.start();
-
-        if (log.isDebugEnabled())
-            log.debug("Started data streamer processor.");
-    }
-
-    /** {@inheritDoc} */
-    @Override public void onKernalStop(boolean cancel) {
-        if (ctx.config().isDaemon())
-            return;
-
-        ctx.io().removeMessageListener(TOPIC_DATALOAD);
-
-        busyLock.block();
-
-        U.interrupt(flusher);
-        U.join(flusher, log);
-
-        for (IgniteDataStreamerImpl<?, ?> ldr : ldrs) {
-            if (log.isDebugEnabled())
-                log.debug("Closing active data streamer on grid stop [ldr=" + ldr + ", cancel=" + cancel + ']');
-
-            try {
-                ldr.closeEx(cancel);
-            }
-            catch (IgniteInterruptedCheckedException e) {
-                U.warn(log, "Interrupted while waiting for completion of the data streamer: " + ldr, e);
-            }
-            catch (IgniteCheckedException e) {
-                U.error(log, "Failed to close data streamer: " + ldr, e);
-            }
-        }
-
-        if (log.isDebugEnabled())
-            log.debug("Stopped data streamer processor.");
-    }
-
-    /**
-     * @param cacheName Cache name ({@code null} for default cache).
-     * @return Data loader.
-     */
-    public IgniteDataStreamerImpl<K, V> dataStreamer(@Nullable String cacheName) {
-        if (!busyLock.enterBusy())
-            throw new IllegalStateException("Failed to create data streamer (grid is stopping).");
-
-        try {
-            final IgniteDataStreamerImpl<K, V> ldr = new IgniteDataStreamerImpl<>(ctx, cacheName, flushQ);
-
-            ldrs.add(ldr);
-
-            ldr.internalFuture().listen(new CI1<IgniteInternalFuture<?>>() {
-                @Override public void apply(IgniteInternalFuture<?> f) {
-                    boolean b = ldrs.remove(ldr);
-
-                    assert b : "Loader has not been added to set: " + ldr;
-
-                    if (log.isDebugEnabled())
-                        log.debug("Loader has been completed: " + ldr);
-                }
-            });
-
-            return ldr;
-        }
-        finally {
-            busyLock.leaveBusy();
-        }
-    }
-
-    /**
-     * @param nodeId Sender ID.
-     * @param req Request.
-     */
-    private void processDataLoadRequest(UUID nodeId, GridDataLoadRequest req) {
-        if (!busyLock.enterBusy()) {
-            if (log.isDebugEnabled())
-                log.debug("Ignoring data load request (node is stopping): " + req);
-
-            return;
-        }
-
-        try {
-            if (log.isDebugEnabled())
-                log.debug("Processing data load request: " + req);
-
-            Object topic;
-
-            try {
-                topic = marsh.unmarshal(req.responseTopicBytes(), null);
-            }
-            catch (IgniteCheckedException e) {
-                U.error(log, "Failed to unmarshal topic from request: " + req, e);
-
-                return;
-            }
-
-            ClassLoader clsLdr;
-
-            if (req.forceLocalDeployment())
-                clsLdr = U.gridClassLoader();
-            else {
-                GridDeployment dep = ctx.deploy().getGlobalDeployment(
-                    req.deploymentMode(),
-                    req.sampleClassName(),
-                    req.sampleClassName(),
-                    req.userVersion(),
-                    nodeId,
-                    req.classLoaderId(),
-                    req.participants(),
-                    null);
-
-                if (dep == null) {
-                    sendResponse(nodeId,
-                        topic,
-                        req.requestId(),
-                        new IgniteCheckedException("Failed to get deployment for request [sndId=" + nodeId +
-                            ", req=" + req + ']'),
-                        false);
-
-                    return;
-                }
-
-                clsLdr = dep.classLoader();
-            }
-
-            IgniteDataStreamer.Updater<K, V> updater;
-
-            try {
-                updater = marsh.unmarshal(req.updaterBytes(), clsLdr);
-            }
-            catch (IgniteCheckedException e) {
-                U.error(log, "Failed to unmarshal message [nodeId=" + nodeId + ", req=" + req + ']', e);
-
-                sendResponse(nodeId, topic, req.requestId(), e, false);
-
-                return;
-            }
-
-            Collection<IgniteDataLoaderEntry> col = req.entries();
-
-            IgniteDataStreamerUpdateJob job = new IgniteDataStreamerUpdateJob(ctx,
-                log,
-                req.cacheName(),
-                col,
-                req.ignoreDeploymentOwnership(),
-                req.skipStore(),
-                updater);
-
-            Exception err = null;
-
-            try {
-                job.call();
-            }
-            catch (Exception e) {
-                U.error(log, "Failed to finish update job.", e);
-
-                err = e;
-            }
-
-            sendResponse(nodeId, topic, req.requestId(), err, req.forceLocalDeployment());
-        }
-        finally {
-            busyLock.leaveBusy();
-        }
-    }
-
-    /**
-     * @param nodeId Node ID.
-     * @param resTopic Response topic.
-     * @param reqId Request ID.
-     * @param err Error.
-     * @param forceLocDep Force local deployment.
-     */
-    private void sendResponse(UUID nodeId, Object resTopic, long reqId, @Nullable Throwable err,
-        boolean forceLocDep) {
-        byte[] errBytes;
-
-        try {
-            errBytes = err != null ? marsh.marshal(err) : null;
-        }
-        catch (IgniteCheckedException e) {
-            U.error(log, "Failed to marshal message.", e);
-
-            return;
-        }
-
-        GridDataLoadResponse res = new GridDataLoadResponse(reqId, errBytes, forceLocDep);
-
-        try {
-            ctx.io().send(nodeId, resTopic, res, PUBLIC_POOL);
-        }
-        catch (IgniteCheckedException e) {
-            if (ctx.discovery().alive(nodeId))
-                U.error(log, "Failed to respond to node [nodeId=" + nodeId + ", res=" + res + ']', e);
-            else if (log.isDebugEnabled())
-                log.debug("Node has left the grid: " + nodeId);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void printMemoryStats() {
-        X.println(">>>");
-        X.println(">>> Data streamer processor memory stats [grid=" + ctx.gridName() + ']');
-        X.println(">>>   ldrsSize: " + ldrs.size());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerUpdateJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerUpdateJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerUpdateJob.java
deleted file mode 100644
index 645c317..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerUpdateJob.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.datastream;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Job to put entries to cache on affinity node.
- */
-class IgniteDataStreamerUpdateJob implements GridPlainCallable<Object> {
-    /** */
-    private final GridKernalContext ctx;
-
-    /** */
-    private final IgniteLogger log;
-
-    /** Cache name. */
-    private final String cacheName;
-
-    /** Entries to put. */
-    private final Collection<IgniteDataLoaderEntry> col;
-
-    /** {@code True} to ignore deployment ownership. */
-    private final boolean ignoreDepOwnership;
-
-    /** */
-    private final boolean skipStore;
-
-    /** */
-    private final IgniteDataStreamer.Updater updater;
-
-    /**
-     * @param ctx Context.
-     * @param log Log.
-     * @param cacheName Cache name.
-     * @param col Entries to put.
-     * @param ignoreDepOwnership {@code True} to ignore deployment ownership.
-     * @param skipStore Skip store flag.
-     * @param updater Updater.
-     */
-    IgniteDataStreamerUpdateJob(
-        GridKernalContext ctx,
-        IgniteLogger log,
-        @Nullable String cacheName,
-        Collection<IgniteDataLoaderEntry> col,
-        boolean ignoreDepOwnership,
-        boolean skipStore,
-        IgniteDataStreamer.Updater updater) {
-        this.ctx = ctx;
-        this.log = log;
-
-        assert col != null && !col.isEmpty();
-        assert updater != null;
-
-        this.cacheName = cacheName;
-        this.col = col;
-        this.ignoreDepOwnership = ignoreDepOwnership;
-        this.skipStore = skipStore;
-        this.updater = updater;
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    @Override public Object call() throws Exception {
-        if (log.isDebugEnabled())
-            log.debug("Running put job [nodeId=" + ctx.localNodeId() + ", size=" + col.size() + ']');
-
-//        TODO IGNITE-77: restore adapter usage.
-//        GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(cacheName);
-//
-//        IgniteFuture<?> f = cache.context().preloader().startFuture();
-//
-//        if (!f.isDone())
-//            f.get();
-//
-//        if (ignoreDepOwnership)
-//            cache.context().deploy().ignoreOwnership(true);
-
-        IgniteCacheProxy cache = ctx.cache().jcache(cacheName);
-
-        if (skipStore)
-            cache = (IgniteCacheProxy<?, ?>)cache.withSkipStore();
-
-        if (ignoreDepOwnership)
-            cache.context().deploy().ignoreOwnership(true);
-
-        try {
-            final GridCacheContext cctx = cache.context();
-
-            for (IgniteDataLoaderEntry e : col) {
-                e.getKey().finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader());
-
-                CacheObject val = e.getValue();
-
-                if (val != null)
-                    val.finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader());
-            }
-
-            if (unwrapEntries()) {
-                Collection<Map.Entry> col0 = F.viewReadOnly(col, new C1<IgniteDataLoaderEntry, Map.Entry>() {
-                    @Override public Map.Entry apply(IgniteDataLoaderEntry e) {
-                        return e.toEntry(cctx);
-                    }
-                });
-
-                updater.update(cache, col0);
-            }
-            else
-                updater.update(cache, col);
-
-            return null;
-        }
-        finally {
-            if (ignoreDepOwnership)
-                cache.context().deploy().ignoreOwnership(false);
-
-            if (log.isDebugEnabled())
-                log.debug("Update job finished on node: " + ctx.localNodeId());
-        }
-    }
-
-    /**
-     * @return {@code True} if need to unwrap internal entries.
-     */
-    private boolean unwrapEntries() {
-        return !(updater instanceof IgniteDataStreamerCacheUpdaters.InternalUpdater);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
index e0b25b69..9ceeb0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
@@ -33,7 +33,7 @@ import java.util.*;
  * Data center replication cache updater for data streamer.
  */
 public class IgniteDrDataStreamerCacheUpdater implements IgniteDataStreamer.Updater<KeyCacheObject, CacheObject>,
-    IgniteDataStreamerCacheUpdaters.InternalUpdater {
+    DataStreamerCacheUpdaters.InternalUpdater {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/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 412a07a..378ef6b 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
@@ -313,9 +313,9 @@ public class IgfsDataManager extends IgfsManager {
             ldr.perNodeBufferSize(cfg.getPerNodeBatchSize());
 
         if (cfg.getPerNodeParallelBatchCount() > 0)
-            ldr.perNodeParallelStreamOperations(cfg.getPerNodeParallelBatchCount());
+            ldr.perNodeParallelOperations(cfg.getPerNodeParallelBatchCount());
 
-        ldr.updater(IgniteDataStreamerCacheUpdaters.<IgfsBlockKey, byte[]>batchedSorted());
+        ldr.updater(DataStreamerCacheUpdaters.<IgfsBlockKey, byte[]>batchedSorted());
 
         return ldr;
     }
@@ -1745,7 +1745,8 @@ public class IgfsDataManager extends IgfsManager {
                                 ldr.close(isCancelled());
                             }
                             catch (IgniteException e) {
-                                log.error("Failed to stop data streamer while shutting down igfs async delete thread.", e);
+                                log.error("Failed to stop data streamer while shutting down " +
+                                    "igfs async delete thread.", e);
                             }
                             finally {
                                 fut.onDone(); // Complete future.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index 26d50f7..56f481d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -142,7 +142,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
     private static void realTimePopulate(final Ignite g) {
         try (IgniteDataStreamer<Integer, Long> ldr = g.dataStreamer(null)) {
             // Sets max values to 1 so cache metrics have correct values.
-            ldr.perNodeParallelStreamOperations(1);
+            ldr.perNodeParallelOperations(1);
 
             // Count closure which increments a count on remote node.
             ldr.updater(new IncrementingUpdater());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2c679e5/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/DataStreamerImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/DataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/DataStreamerImplSelfTest.java
new file mode 100644
index 0000000..9f6356b
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/DataStreamerImplSelfTest.java
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.datastream;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
+/**
+ * Tests for {@code IgniteDataStreamerImpl}.
+ */
+public class DataStreamerImplSelfTest extends GridCommonAbstractTest {
+    /** IP finder. */
+    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+    /** Number of keys to load via data streamer. */
+    private static final int KEYS_COUNT = 1000;
+
+    /** Started grid counter. */
+    private static int cnt;
+
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+        TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+        discoSpi.setIpFinder(IP_FINDER);
+
+        cfg.setDiscoverySpi(discoSpi);
+
+        // Forth node goes without cache.
+        if (cnt < 4)
+            cfg.setCacheConfiguration(cacheConfiguration());
+
+        cnt++;
+
+        return cfg;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNullPointerExceptionUponDataStreamerClosing() throws Exception {
+        try {
+            startGrids(5);
+
+            final CyclicBarrier barrier = new CyclicBarrier(2);
+
+            multithreadedAsync(new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    U.awaitQuiet(barrier);
+
+                    G.stopAll(true);
+
+                    return null;
+                }
+            }, 1);
+
+            Ignite g4 = grid(4);
+
+            IgniteDataStreamer<Object, Object> dataLdr = g4.dataStreamer(null);
+
+            dataLdr.perNodeBufferSize(32);
+
+            for (int i = 0; i < 100000; i += 2) {
+                dataLdr.addData(i, i);
+                dataLdr.removeData(i + 1);
+            }
+
+            U.awaitQuiet(barrier);
+
+            info("Closing data streamer.");
+
+            try {
+                dataLdr.close(true);
+            }
+            catch (IllegalStateException ignore) {
+                // This is ok to ignore this exception as test is racy by it's nature -
+                // grid is stopping in different thread.
+            }
+        }
+        finally {
+            G.stopAll(true);
+        }
+    }
+
+    /**
+     * Data streamer should correctly load entries from HashMap in case of grids with more than one node
+     *  and with GridOptimizedMarshaller that requires serializable.
+     *
+     * @throws Exception If failed.
+     */
+    public void testAddDataFromMap() throws Exception {
+        try {
+            cnt = 0;
+
+            startGrids(2);
+
+            Ignite g0 = grid(0);
+
+            IgniteDataStreamer<Integer, String> dataLdr = g0.dataStreamer(null);
+
+            Map<Integer, String> map = U.newHashMap(KEYS_COUNT);
+
+            for (int i = 0; i < KEYS_COUNT; i ++)
+                map.put(i, String.valueOf(i));
+
+            dataLdr.addData(map);
+
+            dataLdr.close();
+
+            Random rnd = new Random();
+
+            IgniteCache<Integer, String> c = g0.jcache(null);
+
+            for (int i = 0; i < KEYS_COUNT; i ++) {
+                Integer k = rnd.nextInt(KEYS_COUNT);
+
+                String v = c.get(k);
+
+                assertEquals(k.toString(), v);
+            }
+        }
+        finally {
+            G.stopAll(true);
+        }
+    }
+
+    /**
+     * Gets cache configuration.
+     *
+     * @return Cache configuration.
+     */
+    private CacheConfiguration cacheConfiguration() {
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
+
+        cacheCfg.setCacheMode(PARTITIONED);
+        cacheCfg.setBackups(1);
+        cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+
+        return cacheCfg;
+    }
+
+    /**
+     *
+     */
+    private static class TestObject implements Serializable {
+        /** */
+        private int val;
+
+        /**
+         */
+        private TestObject() {
+            // No-op.
+        }
+
+        /**
+         * @param val Value.
+         */
+        private TestObject(int val) {
+            this.val = val;
+        }
+
+        public Integer val() {
+            return val;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return val;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object obj) {
+            return obj instanceof TestObject && ((TestObject)obj).val == val;
+        }
+    }
+}


Mime
View raw message