ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/28] incubator-ignite git commit: # ignite-432
Date Wed, 18 Mar 2015 14:16:27 GMT
# ignite-432


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

Branch: refs/heads/ignite-424
Commit: 9d985c8c5cf4f74df6dd9ce0f2067d1b63d9a6b0
Parents: 4dc826c
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Mar 17 19:02:20 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Mar 17 19:02:20 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java    | 4 ++--
 .../org/apache/ignite/internal/cluster/IgniteClusterImpl.java   | 4 ++--
 .../org/apache/ignite/internal/processors/cache/CacheFlag.java  | 2 --
 .../ignite/internal/processors/cache/CacheProjection.java       | 3 ---
 .../org/apache/ignite/internal/processors/cache/GridCache.java  | 5 ++---
 .../processors/cache/distributed/dht/GridDhtCacheAdapter.java   | 2 +-
 6 files changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d985c8c/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 2fb70a6..1987e47 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
@@ -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.internal.processors.cache.GridCache#loadCache(IgniteBiPredicate,
long, Object...)} method.
+     * @param args Arguments passes into {@link org.apache.ignite.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.internal.processors.cache.GridCache#loadCache(IgniteBiPredicate,
long, Object...)} method.
+     * @param args Arguments passed into {@link org.apache.ignite.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);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d985c8c/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index e5ea36c..92170ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -302,7 +302,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
      * @param timeout Connection timeout.
      * @param maxConn Number of parallel SSH connections to one host.
      * @return Future with results.
-     * @see {@link IgniteCluster#startNodes(java.io.File, boolean, int, int)}.
+     * @see IgniteCluster#startNodes(java.io.File, boolean, int, int)
      */
     IgniteInternalFuture<Collection<GridTuple3<String, Boolean, String>>>
startNodesAsync(File file,
       boolean restart,
@@ -330,7 +330,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
      * @param timeout Connection timeout in milliseconds.
      * @param maxConn Number of parallel SSH connections to one host.
      * @return Future with results.
-     * @see {@link IgniteCluster#startNodes(java.util.Collection, java.util.Map, boolean,
int, int)}.
+     * @see IgniteCluster#startNodes(java.util.Collection, java.util.Map, boolean, int, int)
      */
     IgniteInternalFuture<Collection<GridTuple3<String, Boolean, String>>>
startNodesAsync(
         Collection<Map<String, Object>> hosts,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d985c8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index 50fb4d3..9712ae1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -59,8 +59,6 @@ public enum CacheFlag {
      * update values that are returned from cache, this flag will provide
      * automatic cloning of values prior to returning so they can be directly
      * updated.
-     *
-     * @see org.apache.ignite.configuration.CacheConfiguration#getCloner()
      */
     CLONE,
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d985c8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 514a0ed..05f5f86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -1270,9 +1270,6 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K,
V>> {
      * {@link CacheFlag#READ}.
      *
      * @param keys Keys to clearLocally.
-     * @return {@code True} if entry was successfully cleared from cache, {@code false}
-     *      if entry was in use at the time of this method invocation and could not be
-     *      cleared.
      */
     public void clearLocallyAll(Set<K> keys);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d985c8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
index 66e235e..b3eb660 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.mxbean.*;
 import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
@@ -157,7 +156,7 @@ public interface GridCache<K, V> extends CacheProjection<K, V>
{
      * may be modified concurrently with iteration over swap.
      * <p>
      * Returned iterator supports {@code remove} operation which delegates to
-     * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method.
+     * <code>removex(Object, org.apache.ignite.lang.IgnitePredicate[])</code>
method.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
      * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP}.
@@ -175,7 +174,7 @@ public interface GridCache<K, V> extends CacheProjection<K, V>
{
      * the keys and values deserialized on demand, whenever accessed.
      * <p>
      * Returned iterator supports {@code remove} operation which delegates to
-     * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method.
+     * <code>removex(Object, org.apache.ignite.lang.IgnitePredicate[])}</code>
method.
      *
      * @return Iterator over keys.
      * @throws IgniteCheckedException If failed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d985c8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 40a4987..e3a112c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -495,7 +495,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
 
     /**
      * This method is used internally. Use
-     * {@link #getDhtAsync(UUID, long, LinkedHashMap, boolean, boolean, long, UUID, int,
boolean, IgniteCacheExpiryPolicy, boolean)}
+     * {@link #getDhtAsync(UUID, long, LinkedHashMap, boolean, boolean, long, UUID, int,
IgniteCacheExpiryPolicy, boolean)}
      * method instead to retrieve DHT value.
      *
      * @param keys {@inheritDoc}


Mime
View raw message