ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/40] incubator-ignite git commit: # ignite-394: "data loader" -> "data streamer"
Date Thu, 12 Mar 2015 13:08:01 GMT
# ignite-394: "data loader" -> "data streamer"


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f63999a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f63999a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f63999a

Branch: refs/heads/sprint-2
Commit: 9f63999a2a5ebe3e6b140dd3cd806f5c46fe8b83
Parents: 350ec49
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Mar 3 22:09:15 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Mar 3 22:09:15 2015 +0300

----------------------------------------------------------------------
 .../datagrid/CacheDataStreamerExample.java      |  2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  2 +-
 .../org/apache/ignite/IgniteDataStreamer.java   | 22 ++++++++++----------
 .../ignite/internal/GridKernalContext.java      |  2 +-
 .../dataload/IgniteDataStreamerImpl.java        |  8 +++----
 .../dataload/IgniteDataStreamerProcessor.java   | 14 ++++++-------
 .../dr/GridDrDataLoadCacheUpdater.java          |  2 +-
 .../processors/igfs/IgfsDataManager.java        | 14 ++++++-------
 .../internal/processors/igfs/IgfsImpl.java      |  4 ++--
 .../processors/streamer/IgniteStreamerImpl.java |  2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |  2 +-
 .../IgniteDataStreamerImplSelfTest.java         |  4 ++--
 .../IgniteDataStreamerPerformanceTest.java      |  2 +-
 .../IgniteDataStreamerProcessorSelfTest.java    |  4 ++--
 .../loadtests/colocation/GridTestMain.java      |  2 +-
 .../scala/org/apache/ignite/scalar/scalar.scala |  4 ++--
 16 files changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
index fc1ef78..e5db76d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
@@ -53,7 +53,7 @@ public class CacheDataStreamerExample {
 
         try (Ignite ignite = Ignition.start("examples/config/example-cache.xml")) {
             System.out.println();
-            System.out.println(">>> Cache data loader example started.");
+            System.out.println(">>> Cache data streamer example started.");
 
             // Clean up caches on all nodes before run.
             ignite.jcache(CACHE_NAME).clear();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 f13def0..fa73464 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -203,7 +203,7 @@ public interface Ignite extends AutoCloseable {
     public IgniteTransactions transactions();
 
     /**
-     * Gets a new instance of data loader associated with given cache name. Data streamer
+     * Gets a new instance of data streamer associated with given cache name. Data streamer
      * is responsible for loading external data into in-memory data grid. For more information
      * refer to {@link IgniteDataStreamer} documentation.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index ca9726d..22aa0c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -44,7 +44,7 @@ import java.util.*;
  * {@code IgniteDataStreamer} supports the following configuration properties:
  * <ul>
  *  <li>
- *      {@link #perNodeBufferSize(int)} - when entries are added to data loader via
+ *      {@link #perNodeBufferSize(int)} - when entries are added to data streamer via
  *      {@link #addData(Object, Object)} method, they are not sent to in-memory data grid
right
  *      away and are buffered internally for better performance and network utilization.
  *      This setting controls the size of internal per-node buffer before buffered data
@@ -53,7 +53,7 @@ import java.util.*;
  *  </li>
  *  <li>
  *      {@link #perNodeParallelLoadOperations(int)} - sometimes data may be added
- *      to the data loader via {@link #addData(Object, Object)} method faster than it can
+ *      to the data streamer via {@link #addData(Object, Object)} method faster than it can
  *      be put in cache. In this case, new buffered load messages are sent to remote nodes
  *      before responses from previous ones are received. This could cause unlimited heap
  *      memory utilization growth on local and remote nodes. To control memory utilization,
@@ -70,8 +70,8 @@ import java.util.*;
  *      changing), but it won't be lost anyway. Disabled by default (default value is {@code
0}).
  *  </li>
  *  <li>
- *      {@link #allowOverwrite(boolean)} - defines if data loader will assume that there
are no other concurrent
- *      updates and allow data loader choose most optimal concurrent implementation.
+ *      {@link #allowOverwrite(boolean)} - defines if data streamer will assume that there
are no other concurrent
+ *      updates and allow data streamer choose most optimal concurrent implementation.
  *  </li>
  *  <li>
  *      {@link #updater(IgniteDataStreamer.Updater)} - defines how cache will be updated
with loaded entries.
@@ -79,7 +79,7 @@ import java.util.*;
  *  </li>
  *  <li>
  *      {@link #deployClass(Class)} - optional deploy class for peer deployment. All classes
- *      loaded by a data loader must be class-loadable from the same class-loader.
+ *      loaded by a data streamer must be class-loadable from the same class-loader.
  *      Ignite will make the best effort to detect the most suitable class-loader
  *      for data loading. However, in complex cases, where compound or deeply nested
  *      class-loaders are used, it is best to specify a deploy class which can be any
@@ -102,7 +102,7 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable
{
     public String cacheName();
 
     /**
-     * Gets flag value indicating that this data loader assumes that there are no other concurrent
updates to the cache.
+     * Gets flag value indicating that this data streamer assumes that there are no other
concurrent updates to the cache.
      * Default is {@code true}.
      *
      * @return Flag value.
@@ -110,7 +110,7 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable
{
     public boolean allowOverwrite();
 
     /**
-     * Sets flag indicating that this data loader should assume that there are no other concurrent
updates to the cache.
+     * Sets flag indicating that this data streamer should assume that there are no other
concurrent updates to the cache.
      * Should not be used when custom cache updater set using {@link #updater(IgniteDataStreamer.Updater)}
method.
      * Default is {@code true}. When this flag is set, updates will not be propagated to
the cache store.
      *
@@ -212,7 +212,7 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable
{
     public IgniteFuture<?> future();
 
     /**
-     * Optional deploy class for peer deployment. All classes loaded by a data loader
+     * Optional deploy class for peer deployment. All classes loaded by a data streamer
      * must be class-loadable from the same class-loader. Ignite will make the best
      * effort to detect the most suitable class-loader for data loading. However,
      * in complex cases, where compound or deeply nested class-loaders are used,
@@ -224,7 +224,7 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable
{
     public void deployClass(Class<?> depCls);
 
     /**
-     * Sets custom cache updater to this data loader.
+     * Sets custom cache updater to this data streamer.
      *
      * @param updater Cache updater.
      */
@@ -348,12 +348,12 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable
{
     public void close(boolean cancel) throws IgniteException, IgniteInterruptedException;
 
     /**
-     * Closes data loader. This method is identical to calling {@link #close(boolean) close(false)}
method.
+     * Closes data streamer. This method is identical to calling {@link #close(boolean) close(false)}
method.
      * <p>
      * The method is invoked automatically on objects managed by the
      * {@code try-with-resources} statement.
      *
-     * @throws IgniteException If failed to close data loader.
+     * @throws IgniteException If failed to close data streamer.
      * @throws IgniteInterruptedException If thread has been interrupted.
      */
     @Override public void close() throws IgniteException, IgniteInterruptedException;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 6d502bf..616eac7 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
@@ -243,7 +243,7 @@ public interface GridKernalContext extends Iterable<GridComponent>
{
     public GridSegmentationProcessor segmentation();
 
     /**
-     * Gets data loader processor.
+     * Gets data streamer processor.
      *
      * @return Data streamer processor.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
index 2e7517b..80d08c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
@@ -112,10 +112,10 @@ public class IgniteDataStreamerImpl<K, V> implements IgniteDataStreamer<K,
V>, D
     /** */
     private byte[] topicBytes;
 
-    /** {@code True} if data loader has been cancelled. */
+    /** {@code True} if data streamer has been cancelled. */
     private volatile boolean cancelled;
 
-    /** Active futures of this data loader. */
+    /** Active futures of this data streamer. */
     @GridToStringInclude
     private final Collection<IgniteInternalFuture<?>> activeFuts = new GridConcurrentHashSet<>();
 
@@ -720,7 +720,7 @@ public class IgniteDataStreamerImpl<K, V> implements IgniteDataStreamer<K,
V>, D
         busyLock.block();
 
         if (log.isDebugEnabled())
-            log.debug("Closing data loader [ldr=" + this + ", cancel=" + cancel + ']');
+            log.debug("Closing data streamer [ldr=" + this + ", cancel=" + cancel + ']');
 
         IgniteCheckedException e = null;
 
@@ -1207,7 +1207,7 @@ public class IgniteDataStreamerImpl<K, V> implements IgniteDataStreamer<K,
V>, D
         private Collection<Object> objs;
 
         /**
-         * Constructs data loader peer-deploy aware.
+         * Constructs data streamer peer-deploy aware.
          *
          * @param objs Collection of objects to detect deploy class and class loader.
          */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 c01d451..69ea440 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
@@ -103,7 +103,7 @@ public class IgniteDataStreamerProcessor<K, V> extends GridProcessorAdapter
{
         flusher.start();
 
         if (log.isDebugEnabled())
-            log.debug("Started data loader processor.");
+            log.debug("Started data streamer processor.");
     }
 
     /** {@inheritDoc} */
@@ -120,31 +120,31 @@ public class IgniteDataStreamerProcessor<K, V> extends GridProcessorAdapter
{
 
         for (IgniteDataStreamerImpl<?, ?> ldr : ldrs) {
             if (log.isDebugEnabled())
-                log.debug("Closing active data loader on grid stop [ldr=" + ldr + ", cancel="
+ cancel + ']');
+                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 loader:
" + ldr, 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 loader: " + ldr, e);
+                U.error(log, "Failed to close data streamer: " + ldr, e);
             }
         }
 
         if (log.isDebugEnabled())
-            log.debug("Stopped data loader processor.");
+            log.debug("Stopped data streamer processor.");
     }
 
     /**
      * @param cacheName Cache name ({@code null} for default cache).
-     * @param compact {@code true} if data loader should transfer data in compact format.
+     * @param compact {@code true} if data streamer should transfer data in compact format.
      * @return Data streamer.
      */
     public IgniteDataStreamerImpl<K, V> dataStreamer(@Nullable String cacheName, boolean
compact) {
         if (!busyLock.enterBusy())
-            throw new IllegalStateException("Failed to create data loader (grid is stopping).");
+            throw new IllegalStateException("Failed to create data streamer (grid is stopping).");
 
         try {
             final IgniteDataStreamerImpl<K, V> ldr = new IgniteDataStreamerImpl<>(ctx,
cacheName, flushQ, compact);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
index e34eb16..95f7ccb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
@@ -29,7 +29,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import java.util.*;
 
 /**
- * Data center replication cache updater for data loader.
+ * Data center replication cache updater for data streamer.
  */
 public class GridDrDataLoadCacheUpdater<K, V> implements IgniteDataStreamer.Updater<K,
V> {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 cc9bfd6..d585352 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
@@ -298,11 +298,11 @@ public class IgfsDataManager extends IgfsManager {
     }
 
     /**
-     * Creates new instance of explicit data loader.
+     * Creates new instance of explicit data streamer.
      *
-     * @return New instance of data loader.
+     * @return New instance of data streamer.
      */
-    private IgniteDataStreamer<IgfsBlockKey, byte[]> dataLoader() {
+    private IgniteDataStreamer<IgfsBlockKey, byte[]> dataStreamer() {
         IgniteDataStreamer<IgfsBlockKey, byte[]> ldr =
             igfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataStream().dataStreamer(dataCachePrj.name());
 
@@ -641,7 +641,7 @@ public class IgfsDataManager extends IgfsManager {
                 ", cleanNonColocated=" + cleanNonColocated + ", startIdx=" + startIdx + ",
endIdx=" + endIdx + ']');
 
         try {
-            try (IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = dataLoader()) {
+            try (IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = dataStreamer()) {
                 for (long idx = startIdx; idx <= endIdx; idx++) {
                     ldr.removeData(new IgfsBlockKey(fileInfo.id(), range.affinityKey(), fileInfo.evictExclude(),
                         idx));
@@ -667,7 +667,7 @@ public class IgfsDataManager extends IgfsManager {
         long endIdx = range.endOffset() / fileInfo.blockSize();
 
         try {
-            try (IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = dataLoader()) {
+            try (IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = dataStreamer()) {
                 long bytesProcessed = 0;
 
                 for (long idx = startIdx; idx <= endIdx; idx++) {
@@ -1705,7 +1705,7 @@ public class IgfsDataManager extends IgfsManager {
                         break;
                     }
 
-                    IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = dataLoader();
+                    IgniteDataStreamer<IgfsBlockKey, byte[]> ldr = dataStreamer();
 
                     try {
                         IgfsFileMap map = fileInfo.fileMap();
@@ -1743,7 +1743,7 @@ public class IgfsDataManager extends IgfsManager {
                                 ldr.close(isCancelled());
                             }
                             catch (IgniteException e) {
-                                log.error("Failed to stop data loader 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/9f63999a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index eff987e..40e2fda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -47,8 +47,8 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.igfs.IgfsMode.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridTopic.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
 
 /**
@@ -1255,7 +1255,7 @@ public final class IgfsImpl implements IgfsEx {
                             "directory): " + path);
 
                     // Remove old file from the tree.
-                    // Only one file is deleted, so we use internal data loader.
+                    // Only one file is deleted, so we use internal data streamer.
                     deleteFile(path, new FileDescriptor(parentId, fileName, oldId, oldInfo.isFile()),
false);
 
                     if (evts.isRecordable(EVT_IGFS_FILE_DELETED))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
index c70f8e6..c37a89d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
@@ -1155,7 +1155,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable
{
         private Collection<Object> objs;
 
         /**
-         * Constructs data loader peer-deploy aware.
+         * Constructs data streamer peer-deploy aware.
          *
          * @param objs Collection of objects to detect deploy class and class loader.
          */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 332a6fe..683935c 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
@@ -135,7 +135,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
     }
 
     /**
-     * Populates cache with data loader.
+     * Populates cache with data streamer.
      *
      * @param g Grid.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImplSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImplSelfTest.java
index c84d9db..b0d8625 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImplSelfTest.java
@@ -42,7 +42,7 @@ public class IgniteDataStreamerImplSelfTest extends GridCommonAbstractTest
{
     /** IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
 
-    /** Number of keys to load via data loader. */
+    /** Number of keys to load via data streamer. */
     private static final int KEYS_COUNT = 1000;
 
     /** Started grid counter. */
@@ -98,7 +98,7 @@ public class IgniteDataStreamerImplSelfTest extends GridCommonAbstractTest
{
 
             U.awaitQuiet(barrier);
 
-            info("Closing data loader.");
+            info("Closing data streamer.");
 
             try {
                 dataLdr.close(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerPerformanceTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerPerformanceTest.java
index 5f18df8..b3dd71b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerPerformanceTest.java
@@ -34,7 +34,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.events.EventType.*;
 
 /**
- * Data streamer performance test. Compares group lock data loader to traditional lock.
+ * Data streamer performance test. Compares group lock data streamer to traditional lock.
  * <p>
  * Disable assertions and give at least 2 GB heap to run this test.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 a1ba67f..8eefebf 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
@@ -207,7 +207,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest
 
             l1.await();
 
-            // This will wait until data loader finishes loading.
+            // This will wait until data streamer finishes loading.
             stopGrid(getTestGridName(1), false);
 
             f1.get();
@@ -342,7 +342,7 @@ public class IgniteDataStreamerProcessorSelfTest extends GridCommonAbstractTest
     }
 
     /**
-     * Test primitive arrays can be passed into data loader.
+     * Test primitive arrays can be passed into data streamer.
      *
      * @throws Exception If failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 f127fb3..7d3dee8 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
@@ -168,7 +168,7 @@ public class GridTestMain {
     }
 
     /**
-     * Generates and loads data directly through cache API using data loader.
+     * Generates and loads data directly through cache API using data streamer.
      * This method is provided as example and is not called directly because
      * data is loaded through {@link GridTestCacheStore} store.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/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 5ed58f8..b12c679 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
@@ -286,11 +286,11 @@ object scalar extends ScalarConversions {
         }
 
     /**
-     * Gets a new instance of data loader associated with given cache name.
+     * Gets a new instance of data streamer associated with given cache name.
      *
      * @param cacheName Cache name (`null` for default cache).
      * @param bufSize Per node buffer size.
-     * @return New instance of data loader.
+     * @return New instance of data streamer.
      */
     @inline def dataLoader$[K, V](
         @Nullable cacheName: String,


Mime
View raw message