Repository: incubator-ignite Updated Branches: refs/heads/ignite-394 36b7c8f74 -> 43e533eb8
# ignite-394: dataLoad<er> -> dataStream<er> methods renaming Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43e533eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43e533eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43e533eb Branch: refs/heads/ignite-394 Commit: 43e533eb81290286514fe9f1a8866d6d6b6ca8f9 Parents: 36b7c8f Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Mar 3 21:49:12 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Mar 3 21:49:12 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheDataLoaderExample.java | 2 +- .../datagrid/CachePopularNumbersExample.java | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../ignite/internal/GridKernalContext.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 4 +-- .../processors/cache/GridCacheAdapter.java | 6 ++--- .../GridDistributedCacheAdapter.java | 2 +- .../dataload/IgniteDataStreamerProcessor.java | 6 ++--- .../processors/igfs/IgfsDataManager.java | 2 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 2 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../dataload/GridDataLoaderImplSelfTest.java | 4 +-- .../dataload/GridDataLoaderPerformanceTest.java | 2 +- .../IgniteDataStreamerProcessorSelfTest.java | 28 ++++++++++---------- .../loadtests/colocation/GridTestMain.java | 2 +- .../loadtests/discovery/GridGcTimeoutTest.java | 2 +- .../mapper/GridContinuousMapperLoadTest1.java | 2 +- .../mapper/GridContinuousMapperLoadTest2.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 2 +- .../scala/org/apache/ignite/scalar/scalar.scala | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 4 +-- .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- 26 files changed, 46 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java index 4cdbfd4..8984fdd 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java @@ -63,7 +63,7 @@ public class CacheDataLoaderExample { long start = System.currentTimeMillis(); - try (IgniteDataStreamer<Integer, String> ldr = ignite.dataLoader(CACHE_NAME)) { + try (IgniteDataStreamer<Integer, String> ldr = ignite.dataStreamer(CACHE_NAME)) { // Configure loader. ldr.perNodeBufferSize(1024); ldr.perNodeParallelLoadOperations(8); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java index 1fc737b..7cf4ef9 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java @@ -92,7 +92,7 @@ public class CachePopularNumbersExample { * @throws IgniteException If failed. */ private static void streamData(final Ignite ignite) throws IgniteException { - try (IgniteDataStreamer<Integer, Long> ldr = ignite.dataLoader(CACHE_NAME)) { + try (IgniteDataStreamer<Integer, Long> ldr = ignite.dataStreamer(CACHE_NAME)) { // Set larger per-node buffer size since our state is relatively small. ldr.perNodeBufferSize(2048); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index 44d4ba9..343d65d 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -210,7 +210,7 @@ public interface Ignite extends AutoCloseable { * @param cacheName Cache name ({@code null} for default cache). * @return Data loader. */ - public <K, V> IgniteDataStreamer<K, V> dataLoader(@Nullable String cacheName); + public <K, V> IgniteDataStreamer<K, V> dataStreamer(@Nullable String cacheName); /** * Gets an instance of IGFS - Ignite In-Memory File System, if one is not http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index c497c06..53bd9d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -247,7 +247,7 @@ public interface GridKernalContext extends Iterable<GridComponent> { * * @return Data loader processor. */ - public <K, V> IgniteDataStreamerProcessor<K, V> dataLoad(); + public <K, V> IgniteDataStreamerProcessor<K, V> dataStream(); /** * Gets file system processor. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 71a357e..a38ca92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -660,7 +660,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public <K, V> IgniteDataStreamerProcessor<K, V> dataLoad() { + @Override public <K, V> IgniteDataStreamerProcessor<K, V> dataStream() { return (IgniteDataStreamerProcessor<K, V>)dataLdrProc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 2299f3e..60df162 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -2346,11 +2346,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K, V> IgniteDataStreamer<K, V> dataLoader(@Nullable String cacheName) { + @Override public <K, V> IgniteDataStreamer<K, V> dataStreamer(@Nullable String cacheName) { guard(); try { - return ctx.<K, V>dataLoad().dataLoader(cacheName); + return ctx.<K, V>dataStream().dataStreamer(cacheName); } finally { unguard(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/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 6ed5699..61fa262 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 @@ -3877,7 +3877,7 @@ 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>dataLoad().dataLoader(ctx.namex(), false); + IgniteDataStreamerImpl<K, V> ldr = ctx.kernalContext().<K, V>dataStream().dataStreamer(ctx.namex(), false); try { ldr.updater(new GridDrDataLoadCacheUpdater<K, V>()); @@ -4043,7 +4043,7 @@ 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 IgniteDataStreamer<K, V> ldr = ctx.kernalContext().<K, V>dataLoad().dataLoader(ctx.namex(), false)) { + try (final IgniteDataStreamer<K, V> ldr = ctx.kernalContext().<K, V>dataStream().dataStreamer(ctx.namex(), false)) { ldr.allowOverwrite(true); ldr.skipStore(true); @@ -4086,7 +4086,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final ExpiryPolicy plc0 = plc != null ? plc : ctx.expiry(); if (ctx.store().isLocalStore()) { - IgniteDataStreamerImpl<K, V> ldr = ctx.kernalContext().<K, V>dataLoad().dataLoader(ctx.namex(), false); + IgniteDataStreamerImpl<K, V> ldr = ctx.kernalContext().<K, V>dataStream().dataStreamer(ctx.namex(), false); try { ldr.updater(new GridDrDataLoadCacheUpdater<K, V>()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index c99efc6..5791b8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -276,7 +276,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter else dht = (GridDhtCacheAdapter<K, V>)cacheAdapter; - try (IgniteDataStreamer<K, V> dataLdr = ignite.dataLoader(cacheName)) { + try (IgniteDataStreamer<K, V> dataLdr = ignite.dataStreamer(cacheName)) { ((IgniteDataStreamerImpl)dataLdr).maxRemapCount(0); dataLdr.updater(GridDataLoadCacheUpdaters.<K, V>batched()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessor.java index a2effbc..3b25d17 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessor.java @@ -142,7 +142,7 @@ public class IgniteDataStreamerProcessor<K, V> extends GridProcessorAdapter { * @param compact {@code true} if data loader should transfer data in compact format. * @return Data loader. */ - public IgniteDataStreamerImpl<K, V> dataLoader(@Nullable String cacheName, boolean compact) { + public IgniteDataStreamerImpl<K, V> dataStreamer(@Nullable String cacheName, boolean compact) { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to create data loader (grid is stopping)."); @@ -173,8 +173,8 @@ public class IgniteDataStreamerProcessor<K, V> extends GridProcessorAdapter { * @param cacheName Cache name ({@code null} for default cache). * @return Data loader. */ - public IgniteDataStreamer<K, V> dataLoader(@Nullable String cacheName) { - return dataLoader(cacheName, true); + public IgniteDataStreamer<K, V> dataStreamer(@Nullable String cacheName) { + return dataStreamer(cacheName, true); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/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 49b78f3..cc9bfd6 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 @@ -304,7 +304,7 @@ public class IgfsDataManager extends IgfsManager { */ private IgniteDataStreamer<IgfsBlockKey, byte[]> dataLoader() { IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = - igfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataLoad().dataLoader(dataCachePrj.name()); + igfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataStream().dataStreamer(dataCachePrj.name()); IgfsConfiguration cfg = igfsCtx.configuration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java index b60b76b..ce77038 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java @@ -99,7 +99,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom public void testTxConsistency() throws Exception { startGridsMultiThreaded(GRID_CNT); - IgniteDataStreamer<Object, Object> ldr = grid(0).dataLoader(null); + IgniteDataStreamer<Object, Object> ldr = grid(0).dataStreamer(null); for (int i = 0; i < RANGE; i++) { ldr.addData(i, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/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 414fc42..332a6fe 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 @@ -140,7 +140,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac * @param g Grid. */ private static void realTimePopulate(final Ignite g) { - try (IgniteDataStreamer<Integer, Long> ldr = g.dataLoader(null)) { + try (IgniteDataStreamer<Integer, Long> ldr = g.dataStreamer(null)) { // Sets max values to 1 so cache metrics have correct values. ldr.perNodeParallelLoadOperations(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index ecb2411..08e7225 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -108,7 +108,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe info("Inserting " + cnt + " keys to cache."); - try (IgniteDataStreamer<Integer, String> ldr = grid(0).dataLoader(null)) { + try (IgniteDataStreamer<Integer, String> ldr = grid(0).dataStreamer(null)) { for (int i = 0; i < cnt; i++) ldr.addData(i, Integer.toString(i)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index 5ac6dae..0f733b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -141,7 +141,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb info("Inserting " + cnt + " keys to cache."); - try (IgniteDataStreamer<Integer, String> ldr = grid(1).dataLoader(null)) { + try (IgniteDataStreamer<Integer, String> ldr = grid(1).dataStreamer(null)) { for (int i = 0; i < cnt; i++) ldr.addData(i, Integer.toString(i)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java index 501e56c..2d1d79d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -87,7 +87,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { Ignite g4 = grid(4); - IgniteDataStreamer<Object, Object> dataLdr = g4.dataLoader(null); + IgniteDataStreamer<Object, Object> dataLdr = g4.dataStreamer(null); dataLdr.perNodeBufferSize(32); @@ -134,7 +134,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { else fail("Expected GridOptimizedMarshaller, but found: " + marsh.getClass().getName()); - IgniteDataStreamer<Integer, String> dataLdr = g0.dataLoader(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/43e533eb/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java index fc1a1cb..89a2170 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java @@ -137,7 +137,7 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest { Ignite ignite = startGrid(); - final IgniteDataStreamer<Integer, String> ldr = ignite.dataLoader(null); + final IgniteDataStreamer<Integer, String> ldr = ignite.dataStreamer(null); ldr.perNodeBufferSize(8192); ldr.updater(GridDataLoadCacheUpdaters.<Integer, String>batchedSorted()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessorSelfTest.java index 393642d..a1ba67f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerProcessorSelfTest.java @@ -176,7 +176,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest Ignite g2 = startGrid(2); startGrid(3); - final IgniteDataStreamer<Integer, Integer> ldr = g1.dataLoader(null); + final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null); ldr.updater(GridDataLoadCacheUpdaters.<Integer, Integer>batchedSorted()); @@ -218,7 +218,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest assertEquals(total, s2 + s3); - final IgniteDataStreamer<Integer, Integer> rmvLdr = g2.dataLoader(null); + final IgniteDataStreamer<Integer, Integer> rmvLdr = g2.dataStreamer(null); rmvLdr.updater(GridDataLoadCacheUpdaters.<Integer, Integer>batchedSorted()); @@ -298,7 +298,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest final int cnt = 40_000; final int threads = 10; - try (final IgniteDataStreamer<Integer, Integer> ldr = g1.dataLoader(null)) { + try (final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null)) { final AtomicInteger idxGen = new AtomicInteger(); IgniteInternalFuture<?> f1 = multithreadedAsync(new Callable<Object>() { @@ -358,7 +358,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest new byte[] {1}, new boolean[] {true, false}, new char[] {2, 3}, new short[] {3, 4}, new int[] {4, 5}, new long[] {5, 6}, new float[] {6, 7}, new double[] {7, 8}); - IgniteDataStreamer<Object, Object> dataLdr = g1.dataLoader(null); + IgniteDataStreamer<Object, Object> dataLdr = g1.dataStreamer(null); for (int i = 0, size = arrays.size(); i < 1000; i++) { Object arr = arrays.get(i % size); @@ -416,7 +416,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest Ignite g1 = grid(1); // Get and configure loader. - final IgniteDataStreamer<Integer, Integer> ldr = g1.dataLoader(null); + final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null); ldr.updater(GridDataLoadCacheUpdaters.<Integer, Integer>individual()); ldr.perNodeBufferSize(2); @@ -518,7 +518,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest try { Ignite g1 = startGrid(1); - IgniteDataStreamer<Object, Object> ldr = g1.dataLoader(null); + IgniteDataStreamer<Object, Object> ldr = g1.dataStreamer(null); ldr.close(false); @@ -537,7 +537,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest try { // Create another loader. - ldr = g1.dataLoader("UNKNOWN_CACHE"); + ldr = g1.dataStreamer("UNKNOWN_CACHE"); assert false; } @@ -552,7 +552,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest ldr.future().get(); // Create another loader. - ldr = g1.dataLoader(null); + ldr = g1.dataStreamer(null); // Cancel with future. ldr.future().cancel(); @@ -578,7 +578,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest } // Create another loader. - ldr = g1.dataLoader(null); + ldr = g1.dataStreamer(null); // This will close loader. stopGrid(getTestGridName(1), false); @@ -676,7 +676,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest final IgniteCache<Integer, Integer> c = g.jcache(null); - final IgniteDataStreamer<Integer, Integer> ldr = g.dataLoader(null); + final IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null); ldr.perNodeBufferSize(10); @@ -728,7 +728,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest IgniteCache<Integer, Integer> c = g.jcache(null); - IgniteDataStreamer<Integer, Integer> ldr = g.dataLoader(null); + IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null); ldr.perNodeBufferSize(10); @@ -775,7 +775,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest assertTrue(c.localSize() == 0); - IgniteDataStreamer<Integer, Integer> ldr = g.dataLoader(null); + IgniteDataStreamer<Integer, Integer> ldr = g.dataStreamer(null); ldr.perNodeBufferSize(10); ldr.autoFlushFrequency(3000); @@ -820,7 +820,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest for (int i = 0; i < 1000; i++) storeMap.put(i, i); - try (IgniteDataStreamer<Object, Object> ldr = ignite.dataLoader(null)) { + try (IgniteDataStreamer<Object, Object> ldr = ignite.dataStreamer(null)) { ldr.allowOverwrite(true); assertFalse(ldr.skipStore()); @@ -838,7 +838,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest for (int i = 1000; i < 2000; i++) assertEquals(i, storeMap.get(i)); - try (IgniteDataStreamer<Object, Object> ldr = ignite.dataLoader(null)) { + try (IgniteDataStreamer<Object, Object> ldr = ignite.dataStreamer(null)) { ldr.allowOverwrite(true); ldr.skipStore(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java index 769f201..f127fb3 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java @@ -180,7 +180,7 @@ public class GridTestMain { ExecutorCompletionService<Object> execSvc = new ExecutorCompletionService<>(Executors.newFixedThreadPool(numThreads)); - try (IgniteDataStreamer<GridTestKey, Long> ldr = G.ignite().dataLoader("partitioned")) { + try (IgniteDataStreamer<GridTestKey, Long> ldr = G.ignite().dataStreamer("partitioned")) { for (int i = 0; i < numThreads; i++) { final int threadId = i; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java index 4ec0d82..0aed2ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/discovery/GridGcTimeoutTest.java @@ -40,7 +40,7 @@ public class GridGcTimeoutTest { public static void main(String[] args) { Ignite g = G.start(U.resolveIgniteUrl(CFG_PATH)); - IgniteDataStreamer<Long, String> ldr = g.dataLoader(null); + IgniteDataStreamer<Long, String> ldr = g.dataStreamer(null); ldr.perNodeBufferSize(16 * 1024); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest1.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest1.java index 50c7eba..b722cb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest1.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest1.java @@ -33,7 +33,7 @@ public class GridContinuousMapperLoadTest1 { try (Ignite g = G.start("examples/config/example-cache.xml")) { int max = 30000; - IgniteDataStreamer<Integer, TestObject> ldr = g.dataLoader("replicated"); + IgniteDataStreamer<Integer, TestObject> ldr = g.dataStreamer("replicated"); for (int i = 0; i < max; i++) ldr.addData(i, new TestObject(i, "Test object: " + i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest2.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest2.java index c6f364a..f8693ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest2.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridContinuousMapperLoadTest2.java @@ -57,7 +57,7 @@ public class GridContinuousMapperLoadTest2 { try { int max = 20000; - IgniteDataStreamer<Integer, TestObject> ldr = g.dataLoader("replicated"); + IgniteDataStreamer<Integer, TestObject> ldr = g.dataStreamer("replicated"); for (int i = 0; i < max; i++) ldr.addData(i, new TestObject(i, "Test object: " + i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index d4dcf22..0737fde 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -171,7 +171,7 @@ public class IgniteMock implements Ignite { } /** {@inheritDoc} */ - @Override public <K, V> IgniteDataStreamer<K, V> dataLoader(@Nullable String cacheName) { + @Override public <K, V> IgniteDataStreamer<K, V> dataStreamer(@Nullable String cacheName) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala index 53d6f26..5ed58f8 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala @@ -295,7 +295,7 @@ object scalar extends ScalarConversions { @inline def dataLoader$[K, V]( @Nullable cacheName: String, bufSize: Int): IgniteDataStreamer[K, V] = { - val dl = ignite$.dataLoader[K, V](cacheName) + val dl = ignite$.dataStreamer[K, V](cacheName) dl.perNodeBufferSize(bufSize) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index f9f6e9e..0da2809 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -247,10 +247,10 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public <K, V> IgniteDataStreamer<K, V> dataLoader(@Nullable String cacheName) { + @Override public <K, V> IgniteDataStreamer<K, V> dataStreamer(@Nullable String cacheName) { assert g != null; - return g.dataLoader(cacheName); + return g.dataStreamer(cacheName); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java index b70d618..172c142 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java @@ -40,7 +40,7 @@ public class IgniteSqlQueryBenchmark extends IgniteCacheAbstractBenchmark { long start = System.nanoTime(); - try (IgniteDataStreamer<Integer, Person> dataLdr = ignite().dataLoader(cache.getName())) { + try (IgniteDataStreamer<Integer, Person> dataLdr = ignite().dataStreamer(cache.getName())) { for (int i = 0; i < args.range() && !Thread.currentThread().isInterrupted(); i++) { dataLdr.addData(i, new Person(i, "firstName" + i, "lastName" + i, i * 1000)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java index f6ba47a..19ab337 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java @@ -39,7 +39,7 @@ public class IgniteSqlQueryJoinBenchmark extends IgniteCacheAbstractBenchmark { long start = System.nanoTime(); - try (IgniteDataStreamer<Object, Object> dataLdr = ignite().dataLoader(cache.getName())) { + try (IgniteDataStreamer<Object, Object> dataLdr = ignite().dataStreamer(cache.getName())) { final int orgRange = args.range() / 10; // Populate organizations.
