ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [15/26] incubator-ignite git commit: # sprint-2 - javadoc fixes.
Date Thu, 26 Mar 2015 07:46:51 GMT
# sprint-2 - javadoc fixes.


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

Branch: refs/heads/sprint-3
Commit: 0132995ee16dc41223d4de8a922aba597cb01ff1
Parents: 924295d
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Wed Mar 25 22:33:32 2015 -0700
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Wed Mar 25 22:33:32 2015 -0700

----------------------------------------------------------------------
 .../apache/ignite/cache/CacheInterceptor.java   |  3 +-
 .../apache/ignite/cache/affinity/Affinity.java  | 46 +++++---------------
 .../cluster/ClusterTopologyException.java       |  2 +-
 3 files changed, 12 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0132995e/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
index 864cc43..817821a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java
@@ -19,7 +19,6 @@ package org.apache.ignite.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -51,7 +50,7 @@ public interface CacheInterceptor<K, V> extends Serializable {
      * @param key Key.
      * @param val Value mapped to {@code key} at the moment of {@code get()} operation.
      * @return The new value to be returned as result of {@code get()} operation.
-     * @see CacheProjection#get(Object)
+     * @see Cache#get(Object)
      */
     @Nullable public V onGet(K key, @Nullable V val);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0132995e/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
index 835e142..727face 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/Affinity.java
@@ -91,18 +91,10 @@ public interface Affinity<K> {
     public boolean isPrimaryOrBackup(ClusterNode n, K key);
 
     /**
-     * Gets partition ids for which nodes of the given projection has primary
-     * ownership.
-     * <p>
-     * Note that since {@link org.apache.ignite.cluster.ClusterNode} implements {@link org.apache.ignite.cluster.ClusterGroup},
-     * to find out primary partitions for a single node just pass
-     * a single node into this method.
-     * <p>
-     * This method may return an empty array if none of nodes in the projection
-     * have nearOnly disabled.
+     * Gets partition ids for which the given cluster node has primary ownership.
      *
-     * @param n Grid node.
-     * @return Partition ids for which given projection has primary ownership.
+     * @param n Cluster node.
+     * @return Partition ids for which given cluster node has primary ownership.
      * @see AffinityFunction
      * @see org.apache.ignite.configuration.CacheConfiguration#getAffinity()
      * @see org.apache.ignite.configuration.CacheConfiguration#setAffinity(AffinityFunction)
@@ -110,21 +102,10 @@ public interface Affinity<K> {
     public int[] primaryPartitions(ClusterNode n);
 
     /**
-     * Gets partition ids for which nodes of the given projection has backup
-     * ownership. Note that you can find a back up at a certain level, e.g.
-     * {@code first} backup or {@code third} backup by specifying the
-     * {@code 'levels} parameter. If no {@code 'level'} is specified then
-     * all backup partitions are returned.
-     * <p>
-     * Note that since {@link org.apache.ignite.cluster.ClusterNode} implements {@link org.apache.ignite.cluster.ClusterGroup},
-     * to find out backup partitions for a single node, just pass that single
-     * node into this method.
-     * <p>
-     * This method may return an empty array if none of nodes in the projection
-     * have nearOnly disabled.
+     * Gets partition ids for which given cluster node has backup ownership.
      *
-     * @param n Grid node.
-     * @return Partition ids for which given projection has backup ownership.
+     * @param n Cluster node.
+     * @return Partition ids for which given cluster node has backup ownership.
      * @see AffinityFunction
      * @see org.apache.ignite.configuration.CacheConfiguration#getAffinity()
      * @see org.apache.ignite.configuration.CacheConfiguration#setAffinity(AffinityFunction)
@@ -132,18 +113,11 @@ public interface Affinity<K> {
     public int[] backupPartitions(ClusterNode n);
 
     /**
-     * Gets partition ids for which nodes of the given projection has ownership
+     * Gets partition ids for which given cluster node has any ownership
      * (either primary or backup).
-     * <p>
-     * Note that since {@link org.apache.ignite.cluster.ClusterNode} implements {@link org.apache.ignite.cluster.ClusterGroup},
-     * to find out all partitions for a single node, just pass that single
-     * node into this method.
-     * <p>
-     * This method may return an empty array if none of nodes in the projection
-     * have nearOnly disabled.
      *
-     * @param n Grid node.
-     * @return Partition ids for which given projection has ownership.
+     * @param n Cluster node.
+     * @return Partition ids for which given cluster node has any ownership, primary or backup.
      * @see AffinityFunction
      * @see org.apache.ignite.configuration.CacheConfiguration#getAffinity()
      * @see org.apache.ignite.configuration.CacheConfiguration#setAffinity(AffinityFunction)
@@ -180,7 +154,7 @@ public interface Affinity<K> {
      * @param keys Keys to map to nodes.
      * @return Map of nodes to keys or empty map if there are no alive nodes for this cache.
      */
-    public Map<ClusterNode, Collection<K>> mapKeysToNodes(@Nullable Collection<?
extends K> keys);
+    public Map<ClusterNode, Collection<K>> mapKeysToNodes(Collection<? extends
K> keys);
 
     /**
      * This method provides ability to detect to which primary node the given key

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0132995e/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
index e85cdc3..d28c409 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
@@ -21,7 +21,7 @@ import org.apache.ignite.*;
 import org.jetbrains.annotations.*;
 
 /**
- * This exception is used to indicate error with grid topology (e.g., crashed node, etc.).
+ * This exception is used to indicate error with the cluster topology (e.g., crashed node,
etc.).
  */
 public class ClusterTopologyException extends IgniteException {
     /** */


Mime
View raw message