You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/02/02 07:54:12 UTC
[08/16] ignite git commit: ignite-4557 Fixed wrong affinity manager
call.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index 6c577c6..fac24cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -1009,9 +1009,9 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
//And then find out whether they are primary or backup ones.
int primaryCnt = 0;
int backupCnt = 0;
- if (affinity.primary(ctx.localNode(), part, topVer))
+ if (affinity.primaryByPartition(ctx.localNode(), part, topVer))
primaryCnt = cnt;
- else if (affinity.backup(ctx.localNode(), part, topVer))
+ else if (affinity.primaryByPartition(ctx.localNode(), part, topVer))
backupCnt = cnt;
return new T2<>(primaryCnt, backupCnt);
}
@@ -1081,9 +1081,9 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
//And then find out whether they are primary or backup ones.
int primaryCnt = 0;
int backupCnt = 0;
- if (affinity.primary(ctx.localNode(), part, topVer))
+ if (affinity.primaryByPartition(ctx.localNode(), part, topVer))
primaryCnt = cnt;
- else if (affinity.backup(ctx.localNode(), part, topVer))
+ else if (affinity.backupByPartition(ctx.localNode(), part, topVer))
backupCnt = cnt;
return new T2<>(primaryCnt, backupCnt);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
index 45b4b9f..aeca2fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
@@ -365,7 +365,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte
for (int i = 0; i < gridCount(); i++) {
for (GridCacheEntryEx e : ((IgniteKernal)grid(i)).context().cache().internalCache(cctx.name()).allEntries()) {
- if (aff.primary(grid(i).localNode(), e.key(), AffinityTopologyVersion.NONE)
+ if (aff.primaryByKey(grid(i).localNode(), e.key(), AffinityTopologyVersion.NONE)
&& e.key().value(cctx.cacheObjectContext(), false) instanceof GridCacheQueueHeaderKey)
return i;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index b4ef11a..8709d05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -853,13 +853,13 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
GridCacheAffinityManager aff = ignite0.context().cache().internalCache(null).context().affinity();
- List<ClusterNode> nodes1 = aff.nodes(key1, topVer1);
- List<ClusterNode> nodes2 = aff.nodes(key1, topVer2);
+ List<ClusterNode> nodes1 = aff.nodesByKey(key1, topVer1);
+ List<ClusterNode> nodes2 = aff.nodesByKey(key1, topVer2);
assertEquals(nodes1, nodes2);
- nodes1 = aff.nodes(key2, topVer1);
- nodes2 = aff.nodes(key2, topVer2);
+ nodes1 = aff.nodesByKey(key2, topVer1);
+ nodes2 = aff.nodesByKey(key2, topVer2);
assertFalse(nodes1.get(0).equals(nodes2.get(0)));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
index f6a06c2..66cfc4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
@@ -289,7 +289,7 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest {
key = keys.get(1);
ClusterNode primaryNode =
- ((IgniteCacheProxy)cache).context().affinity().primary(key, NONE);
+ ((IgniteCacheProxy)cache).context().affinity().primaryByKey(key, NONE);
List<Integer> primaryKeys =
primaryKeys(grid(primaryNode).cache(CACHE_NAME), 5, key + (100 * threadNum));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
index 83eb908..ced8b61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
@@ -293,7 +293,7 @@ public class TxPessimisticDeadlockDetectionTest extends GridCommonAbstractTest {
key = keys.get(1);
ClusterNode primaryNode =
- ((IgniteCacheProxy)cache).context().affinity().primary(key, NONE);
+ ((IgniteCacheProxy)cache).context().affinity().primaryByKey(key, NONE);
List<Integer> primaryKeys =
primaryKeys(grid(primaryNode).cache(CACHE_NAME), 5, key + (100 * threadNum));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 9037943..75944cc 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2058,7 +2058,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
return new IgniteBiPredicate<K, V>() {
@Override public boolean apply(K k, V v) {
- return aff.primary(locNode, k, topVer0);
+ return aff.primaryByKey(locNode, k, topVer0);
}
};
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d5adcb7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index c29239f..5dc8547 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -612,7 +612,7 @@ public abstract class GridH2IndexBase extends BaseIndex {
node = cctx.discovery().node(nodeId);
}
else // Get primary node for current topology version.
- node = cctx.affinity().primary(affKeyObj, qctx.topologyVersion());
+ node = cctx.affinity().primaryByKey(affKeyObj, qctx.topologyVersion());
if (node == null) // Node was not found, probably topology changed and we need to retry the whole query.
throw new GridH2RetryException("Failed to find node.");