ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-432' and 'ignite-sprint-2' of github.com:ggprivate/ggprivate into ignite-432
Date Thu, 19 Mar 2015 04:05:50 GMT
Merge branches 'ignite-432' and 'ignite-sprint-2' of github.com:ggprivate/ggprivate into ignite-432

Conflicts:
	modules/core/src/main/java/org/gridgain/grid/internal/interop/GridInteropCache.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/52e0ec67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52e0ec67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52e0ec67

Branch: refs/heads/ignite-496
Commit: 52e0ec678b9407c99870ca89a637f2eb8f2199bf
Parents: 291f3ba
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Mar 18 17:24:41 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Mar 18 17:24:41 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e0ec67/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
index 1987e47..4acb81c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
@@ -31,7 +31,7 @@ import java.util.concurrent.*;
 import static java.util.concurrent.TimeUnit.*;
 
 /**
- * This adepter designed to support stores with bulk loading from stream-like source.
+ * This adapter designed to support stores with bulk loading from stream-like source.
  * <p>
  * This class processes input data in the following way:
  * <ul>
@@ -100,7 +100,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> implements
CacheStore<K
      * Note that returned iterator doesn't have to be thread-safe. Thus it could
      * operate on raw streams, DB connections, etc. without additional synchronization.
      *
-     * @param args Arguments passes into {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate,
Object...)} method.
+     * @param args Arguments passes into {@link IgniteCache#loadCache(IgniteBiPredicate,
Object...)} method.
      * @return Iterator over input records.
      * @throws CacheLoaderException If iterator can't be created with the given arguments.
      */
@@ -113,7 +113,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> implements
CacheStore<K
      * If {@code null} is returned then this record will be just skipped.
      *
      * @param rec A raw data record.
-     * @param args Arguments passed into {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate,
Object...)} method.
+     * @param args Arguments passed into {@link IgniteCache#loadCache(IgniteBiPredicate,
Object...)} method.
      * @return Cache entry to be saved in cache or {@code null} if no entry could be produced
from this record.
      */
     @Nullable protected abstract IgniteBiTuple<K, V> parse(I rec, @Nullable Object...
args);
@@ -275,7 +275,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> implements
CacheStore<K
         /**
          * @param c Closure for loaded entries.
          * @param buf Set of input records to process.
-         * @param args Arguments passed into {@link org.apache.ignite.internal.processors.cache.GridCache#loadCache(IgniteBiPredicate,
long, Object...)} method.
+         * @param args Arguments passed into {@link IgniteCache#loadCache(IgniteBiPredicate,
Object...)} method.
          */
         Worker(IgniteBiInClosure<K, V> c, Collection<I> buf, Object[] args) {
             this.c = c;


Mime
View raw message