Merge branches 'ignite-394' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-394
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerCacheUpdaters.java
modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerFuture.java
modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerUpdateJob.java
modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImplSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c9f8eb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c9f8eb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c9f8eb2
Branch: refs/heads/sprint-2
Commit: 0c9f8eb247e46f1b0ca262b2ff708fad09ff4e79
Parents: 00fd3c3
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Wed Mar 11 17:19:43 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Wed Mar 11 17:19:43 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/codegen/MessageCodeGenerator.java | 2 +-
.../internal/processors/cache/GridCacheAdapter.java | 11 ++++++-----
.../cache/version/GridCacheRawVersionedEntry.java | 2 +-
.../processors/datastream/IgniteDataStreamerImpl.java | 3 +--
.../datastream/IgniteDataStreamerProcessor.java | 3 +--
.../datastream/IgniteDataStreamerUpdateJob.java | 3 +--
.../processors/dr/IgniteDrDataStreamerCacheUpdater.java | 3 +--
.../datastream/IgniteDataStreamerImplSelfTest.java | 4 +---
.../datastream/IgniteDataStreamerProcessorSelfTest.java | 4 ++--
9 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 3de8326..090417b 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -18,7 +18,7 @@
package org.apache.ignite.codegen;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.dataload.*;
+import org.apache.ignite.internal.processors.datastream.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index eec6f80..581a42f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3732,10 +3732,10 @@ public abstract class GridCacheAdapter<K, V> implements
GridCache<K, V>,
final ExpiryPolicy plc = plc0 != null ? plc0 : ctx.expiry();
if (ctx.store().isLocalStore()) {
- IgniteDataStreamerImpl<K, V> ldr = ctx.kernalContext().<K,
V>dataStream().dataLoader(ctx.namex());
+ IgniteDataStreamerImpl ldr =
ctx.kernalContext().dataStream().dataStreamer(ctx.namex());
try {
- ldr.updater(new IgniteDrDataStreamerCacheUpdater<K, V>());
+ ldr.updater(new IgniteDrDataStreamerCacheUpdater());
LocalStoreLoadClosure c = new LocalStoreLoadClosure(p, ldr,
plc);
@@ -3883,7 +3883,8 @@ public abstract class GridCacheAdapter<K, V> implements
GridCache<K, V>,
* @throws IgniteCheckedException If failed.
*/
private void localLoadAndUpdate(final Collection<? extends K> keys) throws
IgniteCheckedException {
- try (final IgniteDataLoader<K, V> ldr = ctx.kernalContext().<K,
V>dataLoad().dataLoader(ctx.namex(), false)) {
+ try (final IgniteDataStreamerImpl<KeyCacheObject, CacheObject> ldr =
+ ctx.kernalContext().<KeyCacheObject,
CacheObject>dataStream().dataStreamer(ctx.namex())) {
ldr.allowOverwrite(true);
ldr.skipStore(true);
@@ -3925,10 +3926,10 @@ public abstract class GridCacheAdapter<K, V> implements
GridCache<K, V>,
Collection<KeyCacheObject> keys0 = ctx.cacheKeysView(keys);
if (ctx.store().isLocalStore()) {
- IgniteDataLoaderImpl<K, V> ldr = ctx.kernalContext().<K,
V>dataLoad().dataLoader(ctx.namex(), false);
+ IgniteDataStreamerImpl ldr =
ctx.kernalContext().dataStream().dataStreamer(ctx.namex());
try {
- ldr.updater(new GridDrDataLoadCacheUpdater<K, V>());
+ ldr.updater(new IgniteDrDataStreamerCacheUpdater());
LocalStoreLoadClosure c = new LocalStoreLoadClosure(null, ldr,
plc0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index 500e466..b0291b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.version;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.dataload.*;
+import org.apache.ignite.internal.processors.datastream.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.plugin.extensions.communication.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/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
index 3aada24..a7d2e31 100644
---
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
@@ -30,7 +30,6 @@ 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.dataload.*;
import org.apache.ignite.internal.processors.dr.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
@@ -1354,7 +1353,7 @@ public class IgniteDataStreamerImpl<K, V> implements
IgniteDataStreamer<K, V>, D
* Isolated updater which only loads entry initial value.
*/
private static class IsolatedUpdater implements Updater<KeyCacheObject,
CacheObject>,
- GridDataLoadCacheUpdaters.InternalUpdater {
+ IgniteDataStreamerCacheUpdaters.InternalUpdater {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/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
index cc4fca4..1b08a2c 100644
---
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
@@ -22,7 +22,6 @@ 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.processors.dataload.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -142,7 +141,7 @@ public class IgniteDataStreamerProcessor<K, V> extends
GridProcessorAdapter {
* @param cacheName Cache name ({@code null} for default cache).
* @return Data loader.
*/
- public IgniteDataStreamerImpl<K, V> dataLoader(@Nullable String cacheName)
{
+ public IgniteDataStreamerImpl<K, V> dataStreamer(@Nullable String
cacheName) {
if (!busyLock.enterBusy())
throw new IllegalStateException("Failed to create data streamer
(grid is stopping).");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/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
index 32a8f8d..645c317 100644
---
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
@@ -20,7 +20,6 @@ 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.processors.dataload.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.jetbrains.annotations.*;
@@ -146,6 +145,6 @@ class IgniteDataStreamerUpdateJob implements
GridPlainCallable<Object> {
* @return {@code True} if need to unwrap internal entries.
*/
private boolean unwrapEntries() {
- return !(updater instanceof GridDataLoadCacheUpdaters.InternalUpdater);
+ return !(updater instanceof
IgniteDataStreamerCacheUpdaters.InternalUpdater);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/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 3c7fe8a..e0b25b69 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
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.dr.*;
import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastream.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -33,7 +32,7 @@ import java.util.*;
/**
* Data center replication cache updater for data streamer.
*/
-public class IgniteDrDataStreamerCacheUpdater<K, V> implements
IgniteDataStreamer.Updater<K, V>,
+public class IgniteDrDataStreamerCacheUpdater implements
IgniteDataStreamer.Updater<KeyCacheObject, CacheObject>,
IgniteDataStreamerCacheUpdaters.InternalUpdater {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImplSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImplSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImplSelfTest.java
index 23fa39e..f8f59df 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImplSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerImplSelfTest.java
@@ -21,8 +21,6 @@ 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.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -127,7 +125,7 @@ public class IgniteDataStreamerImplSelfTest extends
GridCommonAbstractTest {
Ignite g0 = grid(0);
- IgniteDataStreamerImpl<Integer, String> dataLdr =
g0.dataStreamer(null);
+ IgniteDataStreamer<Integer, String> dataLdr =
g0.dataStreamer(null);
Map<Integer, String> map = U.newHashMap(KEYS_COUNT);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c9f8eb2/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessorSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessorSelfTest.java
index 2996426..037c55b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastream/IgniteDataStreamerProcessorSelfTest.java
@@ -882,10 +882,10 @@ public class IgniteDataStreamerProcessorSelfTest extends
GridCommonAbstractTest
startGrid(2);
startGrid(3);
- try (IgniteDataLoader<String, TestObject> ldr =
ignite.dataLoader(null)) {
+ try (IgniteDataStreamer<String, TestObject> ldr =
ignite.dataStreamer(null)) {
ldr.allowOverwrite(true);
- ldr.updater(new IgniteDataLoader.Updater<String, TestObject>()
{
+ ldr.updater(new IgniteDataStreamer.Updater<String,
TestObject>() {
@Override public void update(IgniteCache<String,
TestObject> cache,
Collection<Map.Entry<String, TestObject>> entries) {
for (Map.Entry<String, TestObject> e : entries) {
