http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java index 799e0ea..00b7a95 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.java @@ -17,16 +17,16 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.rendezvous.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.rendezvous.*; /** * Tests exclude neighbors flag for rendezvous affinity function. */ public class GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest extends - GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest { + IgniteCacheAffinityFunctionExcludeNeighborsAbstractSelfTest { /** {@inheritDoc} */ - @Override protected GridCacheAffinityFunction affinityFunction() { - return new GridCacheRendezvousAffinityFunction(true); + @Override protected CacheAffinityFunction affinityFunction() { + return new CacheRendezvousAffinityFunction(true); } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java new file mode 100644 index 0000000..98dd71c --- /dev/null +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java @@ -0,0 +1,184 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.gridgain.grid.kernal.processors.cache.distributed.near; + +import org.apache.ignite.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.product.*; +import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.gridgain.grid.kernal.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.internal.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.testframework.junits.common.*; + +import java.util.*; + +import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.gridgain.grid.cache.GridCachePreloadMode.*; + +/** + * Partitioned affinity test. + */ +@SuppressWarnings({"PointlessArithmeticExpression", "FieldCanBeLocal"}) +public abstract class IgniteCacheAffinityFunctionExcludeNeighborsAbstractSelfTest extends GridCommonAbstractTest { + /** Number of backups. */ + private int backups = 2; + + /** */ + private int gridInstanceNum; + + /** */ + private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(final String gridName) throws Exception { + IgniteConfiguration c = super.getConfiguration(gridName); + + TcpDiscoverySpi spi = new TcpDiscoverySpi() { + @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) { + super.setNodeAttributes(attrs, ver); + + // Set unique mac addresses for every group of three nodes. + String macAddrs = "MOCK_MACS_" + (gridInstanceNum / 3); + + attrs.put(GridNodeAttributes.ATTR_MACS, macAddrs); + + gridInstanceNum++; + } + }; + + spi.setIpFinder(ipFinder); + + c.setDiscoverySpi(spi); + + GridCacheConfiguration cc = defaultCacheConfiguration(); + + cc.setCacheMode(PARTITIONED); + + cc.setBackups(backups); + + cc.setAffinity(affinityFunction()); + + cc.setPreloadMode(NONE); + + c.setCacheConfiguration(cc); + + return c; + } + + /** + * @return Affinity function for test. + */ + protected abstract CacheAffinityFunction affinityFunction(); + + /** + * @param ignite Grid. + * @return Affinity. + */ + static IgniteCacheAffinity<Object> affinity(Ignite ignite) { + return ignite.affinity(ignite.cache(null).name()); + } + + /** + * @param aff Affinity. + * @param key Key. + * @return Nodes. + */ + private static Collection<? extends ClusterNode> nodes(IgniteCacheAffinity<Object> aff, Object key) { + return aff.mapKeyToPrimaryAndBackups(key); + } + + /** + * @throws Exception If failed. + */ + public void testAffinityMultiNode() throws Exception { + int grids = 9; + + startGrids(grids); + + try { + Object key = 12345; + + int copies = backups + 1; + + for (int i = 0; i < grids; i++) { + final Ignite g = grid(i); + + IgniteCacheAffinity<Object> aff = affinity(g); + + List<TcpDiscoveryNode> top = new ArrayList<>(); + + for (ClusterNode node : g.cluster().nodes()) + top.add((TcpDiscoveryNode) node); + + Collections.sort(top); + + assertEquals(grids, top.size()); + + int idx = 1; + + for (ClusterNode n : top) { + assertEquals(idx, n.order()); + + idx++; + } + + Collection<? extends ClusterNode> affNodes = nodes(aff, key); + + info("Affinity picture for grid [i=" + i + ", aff=" + U.toShortString(affNodes)); + + assertEquals(copies, affNodes.size()); + + Set<String> macs = new HashSet<>(); + + for (ClusterNode node : affNodes) + macs.add((String)node.attribute(GridNodeAttributes.ATTR_MACS)); + + assertEquals(copies, macs.size()); + } + } + finally { + stopAllGrids(); + } + } + + /** + * @throws Exception If failed. + */ + public void testAffinitySingleNode() throws Exception { + Ignite g = startGrid(); + + try { + Object key = 12345; + + Collection<? extends ClusterNode> affNodes = nodes(affinity(g), key); + + info("Affinity picture for grid: " + U.toShortString(affNodes)); + + assertEquals(1, affNodes.size()); + } + finally { + stopAllGrids(); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java index b1c7ef5..d291abe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java @@ -46,7 +46,7 @@ public class IgniteTxReentryNearSelfTest extends IgniteTxReentryAbstractSelfTest GridCache<Object, Object> cache = grid(0).cache(null); while (true) { - Collection<ClusterNode> nodes = cache.affinity().mapKeyToPrimaryAndBackups(key); + Collection<ClusterNode> nodes = grid(0).affinity(null).mapKeyToPrimaryAndBackups(key); if (nodes.contains(grid(0).localNode())) key++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java index 9d0e80e..1b861d0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.java @@ -18,17 +18,17 @@ package org.gridgain.grid.kernal.processors.cache.distributed.replicated; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.rendezvous.*; +import org.apache.ignite.cache.affinity.rendezvous.*; /** - * Multi-node tests for replicated cache with {@link GridCacheRendezvousAffinityFunction}. + * Multi-node tests for replicated cache with {@link org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction}. */ public class GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest { /** {@inheritDoc} */ @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws Exception { GridCacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setAffinity(new GridCacheRendezvousAffinityFunction()); + cfg.setAffinity(new CacheRendezvousAffinityFunction()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index c8129fb..a825524 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -107,7 +107,7 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac for (int i = 0; i < 1000; i++) { String k = "key-" + i; - if (cache1.affinity().isPrimary(g1.cluster().localNode(), k)) { + if (g1.affinity(cache1.name()).isPrimary(g1.cluster().localNode(), k)) { key = k; break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 5a2408d..9621d3d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -525,7 +525,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { * Test affinity. */ @SuppressWarnings({"PublicInnerClass"}) - private static class TestAffinityFunction implements GridCacheAffinityFunction { + private static class TestAffinityFunction implements CacheAffinityFunction { /** {@inheritDoc} */ @Override public int partitions() { return 2; @@ -540,7 +540,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext affCtx) { + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) { List<List<ClusterNode>> res = new ArrayList<>(partitions()); for (int part = 0; part < partitions(); part++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 17ce8fb..08b82ba 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -91,7 +91,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes cc.setEvictNearSynchronized(evictNearSync); cc.setEvictSynchronizedKeyBufferSize(1); - cc.setAffinity(new GridCacheModuloAffinityFunction(gridCnt, 1)); + cc.setAffinity(new CacheModuloAffinityFunction(gridCnt, 1)); c.setCacheConfiguration(cc); @@ -101,7 +101,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes c.setDiscoverySpi(disco); - c.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, idxGen.getAndIncrement())); + c.setUserAttributes(F.asMap(CacheModuloAffinityFunction.IDX_ATTR, idxGen.getAndIncrement())); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 3188326..9b8194f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.cache.eviction.*; import org.gridgain.grid.cache.eviction.fifo.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -219,13 +219,13 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { Integer affKey = 1; - GridCache<GridCacheAffinityKey<Object>, Integer> cache = g.cache(null); + GridCache<CacheAffinityKey<Object>, Integer> cache = g.cache(null); IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 5); try { for (int i = 0; i < 5; i++) - cache.put(new GridCacheAffinityKey<Object>(i, affKey), i); + cache.put(new CacheAffinityKey<Object>(i, affKey), i); tx.commit(); } @@ -239,7 +239,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { try { for (int i = 0; i < 5; i++) - cache.remove(new GridCacheAffinityKey<Object>(i, affKey)); + cache.remove(new CacheAffinityKey<Object>(i, affKey)); tx.commit(); } @@ -267,12 +267,12 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { GridCache<Object, Integer> cache = g.cache(null); - IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ, + IgniteTx tx = cache.txStartPartition(g.affinity(cache.name()).partition(affKey), PESSIMISTIC, REPEATABLE_READ, 0, 5); try { for (int i = 0; i < 5; i++) - cache.put(new GridCacheAffinityKey<Object>(i, affKey), i); + cache.put(new CacheAffinityKey<Object>(i, affKey), i); tx.commit(); } @@ -282,11 +282,11 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { assertEquals(5, ((GridCacheFifoEvictionPolicy)plc).queue().size()); - tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ, 0, 5); + tx = cache.txStartPartition(g.affinity(cache.name()).partition(affKey), PESSIMISTIC, REPEATABLE_READ, 0, 5); try { for (int i = 0; i < 5; i++) - cache.remove(new GridCacheAffinityKey<Object>(i, affKey)); + cache.remove(new CacheAffinityKey<Object>(i, affKey)); tx.commit(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index 29ae5ca..caff2e6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -21,8 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; @@ -63,7 +62,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst ccfg.setBackups(2); - ccfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 500)); + ccfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 500)); return ccfg; } @@ -86,9 +85,9 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst try { Map<String, Integer> data = new HashMap<>(); - addKeysForNode(cache.affinity(), grid(0).localNode(), data); - addKeysForNode(cache.affinity(), grid(1).localNode(), data); - addKeysForNode(cache.affinity(), grid(2).localNode(), data); + addKeysForNode(affinity(0), grid(0).localNode(), data); + addKeysForNode(affinity(0), grid(1).localNode(), data); + addKeysForNode(affinity(0), grid(2).localNode(), data); fut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { @@ -139,7 +138,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst * @param node Primary node for keys. * @param data Map where keys/values should be put to. */ - private void addKeysForNode(GridCacheAffinity<String> aff, ClusterNode node, Map<String, Integer> data) { + private void addKeysForNode(IgniteCacheAffinity<String> aff, ClusterNode node, Map<String, Integer> data) { int cntr = 0; for (int i = 0; i < 100_000; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java index 2db5b44..aa68ce9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFullApiSelfTest.java @@ -63,7 +63,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT cache().put("key1", 1); cache().put("key2", 2); - Map<ClusterNode, Collection<String>> map = cache().affinity().mapKeysToNodes(F.asList("key1", "key2")); + Map<ClusterNode, Collection<String>> map = affinity(0).mapKeysToNodes(F.asList("key1", "key2")); assert map.size() == 1; @@ -75,7 +75,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT for (String key : keys) assert "key1".equals(key) || "key2".equals(key); - map = cache().affinity().mapKeysToNodes(F.asList("key1", "key2")); + map = affinity(0).mapKeysToNodes(F.asList("key1", "key2")); assert map.size() == 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 0ce7619..ecb4257 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.cache.query.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -120,13 +120,13 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom assert orgCache.putx("o1", new Organization(1, "A")); assert orgCache.putx("o2", new Organization(2, "B")); - GridCache<GridCacheAffinityKey<String>, Person> personCache = grid(0).cache(null); + GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null); assert personCache != null; - assert personCache.putx(new GridCacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); - assert personCache.putx(new GridCacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); - assert personCache.putx(new GridCacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); + assert personCache.putx(new CacheAffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); + assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); + assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); } /** {@inheritDoc} */ @@ -219,14 +219,14 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom * @throws Exception If failed. */ public void testOnProjection() throws Exception { - P2<GridCacheAffinityKey<String>, Person> p = new P2<GridCacheAffinityKey<String>, Person>() { - @Override public boolean apply(GridCacheAffinityKey<String> key, Person val) { + P2<CacheAffinityKey<String>, Person> p = new P2<CacheAffinityKey<String>, Person>() { + @Override public boolean apply(CacheAffinityKey<String> key, Person val) { return val.orgId == 1; } }; - GridCacheProjection<GridCacheAffinityKey<String>, Person> cachePrj = - grid(0).<GridCacheAffinityKey<String>, Person>cache(null).projection(p); + GridCacheProjection<CacheAffinityKey<String>, Person> cachePrj = + grid(0).<CacheAffinityKey<String>, Person>cache(null).projection(p); GridCacheQuery<List<?>> qry = cachePrj.queries().createSqlFieldsQuery("select age from Person"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index 2eb429b..5cd1091 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; +import org.apache.ignite.IgniteCacheAffinity; import org.gridgain.grid.kernal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -768,6 +769,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes public void _testFormat() throws Exception { GridKernal grid = (GridKernal)G.ignite("grid"); GridCache cache = grid.internalCache("dataCache"); + IgniteCacheAffinity aff = grid.affinity(cache.name()); if (dual) create(ggfsSecondary, paths(DIR, SUBDIR, DIR_NEW, SUBDIR_NEW), paths(FILE, FILE_NEW)); @@ -791,7 +793,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes int primaryPartSize = 0; - for (int p : cache.affinity().primaryPartitions(grid.localNode())) { + for (int p : aff.primaryPartitions(grid.localNode())) { Set set = cache.entrySet(p); if (set != null) @@ -821,7 +823,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes int primaryPartSizeNew = 0; - for (int p : cache.affinity().primaryPartitions(grid.localNode())) { + for (int p : aff.primaryPartitions(grid.localNode())) { Set set = cache.entrySet(p); if (set != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index 9d8116a..916dcf1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -456,7 +456,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { do { GridGgfsBlockKey key = new GridGgfsBlockKey(info.id(), null, false, block); - ClusterNode affNode = grid(0).cachex(DATA_CACHE_NAME).affinity().mapKeyToNode(key); + ClusterNode affNode = grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(key); assertTrue("Failed to find node in affinity [dataMgr=" + loc.nodeIds() + ", nodeId=" + affNode.id() + ", block=" + block + ']', loc.nodeIds().contains(affNode.id())); @@ -530,7 +530,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { GridGgfsBlockKey key = new GridGgfsBlockKey(info.id(), info.fileMap().affinityKey(block * blockSize, false), false, block); - ClusterNode affNode = dataCache.affinity().mapKeyToNode(key); + ClusterNode affNode = grid(0).affinity(dataCache.name()).mapKeyToNode(key); assertTrue("Failed to find node in affinity [dataMgr=" + loc.nodeIds() + ", nodeId=" + affNode.id() + ", block=" + block + ']', loc.nodeIds().contains(affNode.id())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java index 394d00b..c528056 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java @@ -162,7 +162,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class)); for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration()) - cc.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper()); + cc.setAffinityMapper(new CacheDefaultAffinityKeyMapper()); checkGridStartFails(g1Cfg, "Invalid GGFS data cache configuration (key affinity mapper class should be", true); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java index 31210f6..dcbed99 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java @@ -691,7 +691,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { GridEx grid = grid(0); for (ClusterNode node : grid.nodes()) { - if (grid.cachex(DATA_CACHE_NAME).affinity().isPrimary(node, key)) + if (grid.affinity(DATA_CACHE_NAME).isPrimary(node, key)) return node.id(); } @@ -710,7 +710,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { Collection<UUID> ids = new HashSet<>(); for (ClusterNode node : grid.nodes()) { - if (grid.cachex(DATA_CACHE_NAME).affinity().isPrimaryOrBackup(node, key)) + if (grid.affinity(DATA_CACHE_NAME).isPrimaryOrBackup(node, key)) ids.add(node.id()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java index cd2259b..d80ff2f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -550,7 +550,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs @Override public void init(ManagedServiceContext ctx) throws Exception { X.println("Initializing affinity service for key: " + affKey); - ClusterNode n = g.cache(CACHE_NAME).affinity().mapKeyToNode(affKey); + ClusterNode n = g.affinity(CACHE_NAME).mapKeyToNode(affKey); assertNotNull(n); assertTrue(n.isLocal()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java index 4ccce38..ff04dbf 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java @@ -28,9 +28,7 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.product.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.window.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.executor.*; @@ -837,7 +835,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest public void testAffinity() throws Exception { GridCache<String, String> cache = grid().cache(CACHE_NAME); - GridCacheAffinity<String> affinity = cache.affinity(); + IgniteCacheAffinity<String> affinity = grid().affinity(CACHE_NAME); cache.putx("tst", "test"); @@ -850,8 +848,8 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean.getObjectField() != null; assert outBean.getObjectField() != null; - assert inBean.getObjectField().getClass().equals(GridCacheAffinityProxy.class); - assert outBean.getObjectField().getClass().equals(GridCacheAffinityProxy.class); + assert inBean.getObjectField().getClass().equals(CacheAffinityProxy.class); + assert outBean.getObjectField().getClass().equals(CacheAffinityProxy.class); assert inBean != outBean; assert inBean.equals(outBean); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index 43c38fa..f6307cf 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -19,8 +19,8 @@ package org.gridgain.grid.util.offheap; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; @@ -244,7 +244,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm public void testPutRandomKeys() throws Exception { map = newMap(); - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(parts, null); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(parts, null); getTestResources().inject(aff); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index d969dda..4e04207 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.util.offheap; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; @@ -76,7 +76,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G keys = new T3[LOAD_CNT]; wrappers = new GridByteArrayWrapper[LOAD_CNT]; - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 6d4990b..2661164 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.util.offheap.unsafe; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.offheap.*; /** @@ -26,7 +26,7 @@ import org.gridgain.grid.util.offheap.*; public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest { /** {@inheritDoc} */ @Override protected GridOffHeapPartitionedMap newMap() { - return GridOffHeapMapFactory.unsafePartitionedMap(GridCacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, + return GridOffHeapMapFactory.unsafePartitionedMap(CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java index e3f4603..a9e027d 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -154,7 +154,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { * @return Cache. */ private static GridCache<Object, Integer> cache(long key) { - UUID id = Ignition.ignite("grid-0").cache(null).affinity().mapKeyToNode(key).id(); + UUID id = Ignition.ignite("grid-0").affinity(null).mapKeyToNode(key).id(); return Ignition.ignite(id).cache(null); } @@ -200,7 +200,7 @@ public class GridCacheAffinityTransactionsOffHeapTest { */ private static class UserKey implements Externalizable { /** */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private long affKey; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java index ae76fa1..391043b 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java @@ -20,7 +20,7 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; @@ -83,7 +83,7 @@ public class GridCacheGroupLockComparisonTest { X.println(">>> Testing putAll"); X.println(">>>"); - final GridCache<GridCacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); + final GridCache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); assert cache != null; @@ -96,7 +96,7 @@ public class GridCacheGroupLockComparisonTest { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (true) { - Map<GridCacheAffinityKey<Long>, Long> vals = + Map<CacheAffinityKey<Long>, Long> vals = new HashMap<>(BATCH_SIZE); long start = cntr.getAndAdd(BATCH_SIZE); @@ -105,7 +105,7 @@ public class GridCacheGroupLockComparisonTest { break; for (long i = start; i < start + BATCH_SIZE; i++) - vals.put(new GridCacheAffinityKey<>(i % 100000, start), i); + vals.put(new CacheAffinityKey<>(i % 100000, start), i); cache.putAll(vals); @@ -138,7 +138,7 @@ public class GridCacheGroupLockComparisonTest { X.println(">>> Testing group lock"); X.println(">>>"); - final GridCache<GridCacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); + final GridCache<CacheAffinityKey<Long>, Long> cache = ignite.cache(CACHE); assert cache != null; @@ -174,7 +174,7 @@ public class GridCacheGroupLockComparisonTest { try (IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, BATCH_SIZE)) { for (long i = 0; i < BATCH_SIZE; i++) { - cache.put(new GridCacheAffinityKey<>((key % rangeCnt) + base, affKey), i); + cache.put(new CacheAffinityKey<>((key % rangeCnt) + base, affKey), i); key++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml index 7ca639b..ed3b897 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml @@ -77,7 +77,7 @@ sets the number of backups to 0 to ensure maximum capacity.. --> <property name="affinity"> - <bean class="org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> <property name="keyBackups" value="0"/> <!-- No backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java index 53a8127..ab4009f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java @@ -83,7 +83,7 @@ public class GridTestCacheStore extends GridCacheStoreAdapter<GridTestKey, Long> end += mod; for (long i = start; i < end; i++) { - if (prj.cache().affinity().mapKeyToNode(GridTestKey.affinityKey(i)).isLocal()) { // Only add if key is local. + if (ignite.affinity(prj.cache().name()).mapKeyToNode(GridTestKey.affinityKey(i)).isLocal()) { // Only add if key is local. clo.apply(new GridTestKey(i), i); adder.increment(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java index 9f56fbd..7a62156 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.colocation; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*; @@ -42,7 +42,7 @@ public class GridTestKey implements Externalizable { return id; } - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped public int affinityKey() { return affinityKey(id); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml index 2e80553..e92fc88 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml @@ -127,7 +127,7 @@ sets the number of backups to 1 (which is default). --> <property name="affinity"> - <bean class="org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> <property name="keyBackups" value="0"/> <!-- Disable backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index 3a64ce5..26570ec 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.cache.eviction.lru.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -64,7 +64,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe cc.setWriteSynchronizationMode(FULL_SYNC); cc.setEvictionPolicy(new GridCacheLruEvictionPolicy<>(1000)); cc.setBackups(1); - cc.setAffinity(new GridCacheConsistentHashAffinityFunction(true)); + cc.setAffinity(new CacheConsistentHashAffinityFunction(true)); cc.setAtomicSequenceReserveSize(10); cc.setEvictSynchronized(true); cc.setEvictNearSynchronized(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java index eedd3db..e91c1b0 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java @@ -23,7 +23,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; @@ -79,7 +79,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { /** * @return Terminal ID. */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped @Nullable public String terminalId() { GridDsiMessage msg = message(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java index 92bc7bb..2fcee1c 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.dsi; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*; @@ -68,7 +68,7 @@ public class GridDsiRequest implements Serializable { /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java index 297414a..7f2ead6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.dsi; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*; @@ -62,7 +62,7 @@ public class GridDsiResponse implements Serializable { /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java index 7eea973..3de2c25 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.dsi; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*; @@ -59,7 +59,7 @@ public class GridDsiSession implements Serializable{ /** */ @SuppressWarnings("UnusedDeclaration") - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 07bed1c..194cc37 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -18,8 +18,8 @@ package org.gridgain.loadtests.offheap; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.offheap.*; @@ -77,7 +77,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G keys = new T3[LOAD_CNT]; wrappers = new GridByteArrayWrapper[LOAD_CNT]; - GridCacheAffinityFunction aff = new GridCacheConsistentHashAffinityFunction(); + CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 3335db1..24d3025 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.offheap.unsafe; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.offheap.*; /** @@ -26,7 +26,7 @@ import org.gridgain.grid.util.offheap.*; public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest { /** {@inheritDoc} */ @Override protected GridOffHeapPartitionedMap newMap() { - return GridOffHeapMapFactory.unsafePartitionedMap(GridCacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, + return GridOffHeapMapFactory.unsafePartitionedMap(CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java index fc73054..e87cbc7 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java @@ -24,7 +24,7 @@ import org.apache.ignite.lang.*; import org.gridgain.client.ssl.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; @@ -867,8 +867,8 @@ public final class GridTestUtils { * @param cache Cache. * @return Affinity. */ - static <K, V> GridCacheConsistentHashAffinityFunction affinity(GridCacheProjection<K, V> cache) { - return (GridCacheConsistentHashAffinityFunction)cache.cache().configuration().getAffinity(); + static <K, V> CacheConsistentHashAffinityFunction affinity(GridCacheProjection<K, V> cache) { + return (CacheConsistentHashAffinityFunction)cache.cache().configuration().getAffinity(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java index 0950e25..bc5a03f 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*; @@ -61,6 +61,14 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** * @param idx Grid index. + * @return Affinity. + */ + protected <K> IgniteCacheAffinity<K> affinity(int idx) { + return grid(idx).affinity(cache(idx).name()); + } + + /** + * @param idx Grid index. * @return Cache. */ protected <K, V> GridCache<K, V> cache(int idx) { @@ -251,7 +259,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { GridCacheConfiguration cfg = c.configuration(); if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) { - GridCacheAffinityFunction aff = cfg.getAffinity(); + CacheAffinityFunction aff = cfg.getAffinity(); GridDhtCacheAdapter<?, ?> dht = dht(c); @@ -262,7 +270,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { for (int i = 0; ; i++) { // Must map on updated version of topology. - Collection<ClusterNode> affNodes = c.affinity().mapPartitionToPrimaryAndBackups(p); + Collection<ClusterNode> affNodes = g.affinity(c.name()).mapPartitionToPrimaryAndBackups(p); int exp = affNodes.size(); @@ -330,9 +338,11 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { List<Integer> found = new ArrayList<>(cnt); - ClusterNode locNode = cache.gridProjection().ignite().cluster().localNode(); + Ignite ignite = cache.gridProjection().ignite(); + + ClusterNode locNode = ignite.cluster().localNode(); - GridCacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); + IgniteCacheAffinity<Integer> aff = ignite.affinity(cache.name()); for (int i = startFrom; i < startFrom + 100_000; i++) { Integer key = i; @@ -382,9 +392,11 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { List<Integer> found = new ArrayList<>(cnt); - ClusterNode locNode = cache.gridProjection().ignite().cluster().localNode(); + Ignite ignite = cache.gridProjection().ignite(); - GridCacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); + ClusterNode locNode = ignite.cluster().localNode(); + + IgniteCacheAffinity<Integer> aff = ignite.affinity(cache.name()); for (int i = startFrom; i < startFrom + 100_000; i++) { Integer key = i; @@ -434,9 +446,11 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { List<Integer> found = new ArrayList<>(cnt); - ClusterNode locNode = cache.gridProjection().ignite().cluster().localNode(); + Ignite ignite = cache.gridProjection().ignite(); + + ClusterNode locNode = ignite.cluster().localNode(); - GridCacheAffinity<Integer> aff = cache.<Integer, Object>cache().affinity(); + IgniteCacheAffinity<Integer> aff = ignite.affinity(cache.name()); for (int i = startFrom; i < startFrom + 100_000; i++) { Integer key = i; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java index 3b2ed6c..a55ba44 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java @@ -21,7 +21,7 @@ import junit.framework.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.expiry.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.affinity.fair.*; +import org.apache.ignite.cache.affinity.fair.*; import org.gridgain.grid.cache.store.*; import org.gridgain.grid.cache.store.jdbc.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -59,16 +59,16 @@ public class GridDataGridTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheTxLocalInvokeTest.class); // Affinity tests. - suite.addTestSuite(GridCachePartitionFairAffinityNodesSelfTest.class); - suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); + suite.addTestSuite(CachePartitionFairAffinityNodesSelfTest.class); + suite.addTestSuite(IgniteCacheAffinityBackupsSelfTest.class); // Swap tests. suite.addTestSuite(GridCacheSwapPreloadSelfTest.class); suite.addTestSuite(GridCacheSwapReloadSelfTest.class); // Common tests. - suite.addTestSuite(GridCacheAffinityMapperSelfTest.class); - suite.addTestSuite(GridCacheAffinityRoutingSelfTest.class); + suite.addTestSuite(IgniteCacheAffinityMapperSelfTest.class); + suite.addTestSuite(IgniteCacheAffinityRoutingSelfTest.class); suite.addTestSuite(GridCacheMvccSelfTest.class); suite.addTestSuite(GridCacheMvccPartitionedSelfTest.class); suite.addTestSuite(GridCacheMvccManagerSelfTest.class); @@ -78,7 +78,7 @@ public class GridDataGridTestSuite extends TestSuite { suite.addTestSuite(GridCacheJdbcBlobStoreSelfTest.class); suite.addTestSuite(GridCacheJdbcBlobStoreMultithreadedSelfTest.class); suite.addTestSuite(GridCacheBalancingStoreSelfTest.class); - suite.addTestSuite(GridCacheAffinityApiSelfTest.class); + suite.addTestSuite(IgniteCacheAffinityApiSelfTest.class); suite.addTestSuite(GridCacheStoreValueBytesSelfTest.class); suite.addTestSuite(GridDataLoaderProcessorSelfTest.class); suite.addTestSuite(GridDataLoaderImplSelfTest.class); @@ -146,7 +146,7 @@ public class GridDataGridTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class)); suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class)); - suite.addTest(new TestSuite(GridCacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.class)); + suite.addTest(new TestSuite(CacheConsistentHashAffinityFunctionExcludeNeighborsSelfTest.class)); suite.addTest(new TestSuite(GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.class)); suite.addTest(new TestSuite(GridCacheRendezvousAffinityClientSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedProjectionAffinitySelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityFunction.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityFunction.java new file mode 100644 index 0000000..93c4d5f --- /dev/null +++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityFunction.java @@ -0,0 +1,161 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.gridgain.grid.tests.p2p; + +import org.apache.ignite.cluster.*; +import org.apache.ignite.cache.affinity.*; +import org.gridgain.grid.util.typedef.*; +import org.gridgain.grid.util.typedef.internal.*; + +import java.util.*; + +/** + * Mock affinity implementation that ensures constant key-to-node mapping based on {@code GridCacheModuloAffinity} The + * partition selection is as follows: 0 maps to partition 1 and any other value maps to partition 1. + */ +public class ExternalAffinityFunction implements CacheAffinityFunction { + /** Node attribute for index. */ + public static final String IDX_ATTR = "nodeIndex"; + + /** Number of backups. */ + private int backups; + + /** Number of partitions. */ + private int parts; + + /** Empty constructor. Equivalent for {@code new GridCacheModuloAffinity(2, 0)}. */ + public ExternalAffinityFunction() { + this(2, 0); + } + + /** + * @param parts Number of partitions. + * @param backups Number of backups. + */ + public ExternalAffinityFunction(int parts, int backups) { + assert parts > 0; + assert backups >= 0; + + this.parts = parts; + this.backups = backups; + } + + /** {@inheritDoc} */ + @SuppressWarnings("unchecked") + @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext ctx) { + List<List<ClusterNode>> res = new ArrayList<>(partitions()); + + List<ClusterNode> topSnapshot = ctx.currentTopologySnapshot(); + + for (int part = 0; part < parts; part++) { + res.add(F.isEmpty(topSnapshot) ? + Collections.<ClusterNode>emptyList() : + // Wrap affinity nodes with unmodifiable list since unmodifiable generic collection + // doesn't provide equals and hashCode implementations. + U.sealList(nodes(part, topSnapshot))); + } + + return res; + } + + /** {@inheritDoc} */ + public Collection<ClusterNode> nodes(int part, Collection<ClusterNode> nodes) { + List<ClusterNode> sorted = new ArrayList<>(nodes); + + Collections.sort(sorted, new Comparator<ClusterNode>() { + @Override public int compare(ClusterNode n1, ClusterNode n2) { + int idx1 = n1.<Integer>attribute(IDX_ATTR); + int idx2 = n2.<Integer>attribute(IDX_ATTR); + + return idx1 < idx2 ? -1 : idx1 == idx2 ? 0 : 1; + } + }); + + int max = 1 + backups; + + if (max > nodes.size()) + max = nodes.size(); + + Collection<ClusterNode> ret = new ArrayList<>(max); + + Iterator<ClusterNode> it = sorted.iterator(); + + for (int i = 0; i < max; i++) { + ClusterNode n = null; + + if (i == 0) { + while (it.hasNext()) { + n = it.next(); + + int nodeIdx = n.<Integer>attribute(IDX_ATTR); + + if (part <= nodeIdx) + break; + else + n = null; + } + } + else { + if (it.hasNext()) + n = it.next(); + else { + it = sorted.iterator(); + + assert it.hasNext(); + + n = it.next(); + } + } + + assert n != null || nodes.size() < parts; + + if (n == null) + n = (it = sorted.iterator()).next(); + + ret.add(n); + } + + return ret; + } + + /** {@inheritDoc} */ + @Override public void reset() { + // No-op. + } + + /** {@inheritDoc} */ + @Override public int partitions() { + return parts; + } + + /** {@inheritDoc} */ + @Override public int partition(Object key) { + return key instanceof Integer ? 0 == key ? 0 : 1 : 1; + } + + /** {@inheritDoc} + * @param nodeId*/ + @Override public void removeNode(UUID nodeId) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(ExternalAffinityFunction.class, this); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityKeyMapper.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityKeyMapper.java new file mode 100644 index 0000000..9e389b5 --- /dev/null +++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/ExternalAffinityKeyMapper.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.gridgain.grid.tests.p2p; + +import org.apache.ignite.cache.affinity.*; + +/** + * Test mapper for P2P class loading tests. + */ +public class ExternalAffinityKeyMapper implements CacheAffinityKeyMapper { + /** {@inheritDoc} */ + @Override public Object affinityKey(Object key) { + if (key instanceof Integer) + return 1 == (Integer)key ? key : 0; + + return key; + } + + /** {@inheritDoc} */ + @Override public void reset() { + // This mapper is stateless and needs no initialization logic. + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java deleted file mode 100644 index e46732d..0000000 --- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.tests.p2p; - -import org.apache.ignite.cluster.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.grid.util.typedef.internal.*; - -import java.util.*; - -/** - * Mock affinity implementation that ensures constant key-to-node mapping based on {@code GridCacheModuloAffinity} The - * partition selection is as follows: 0 maps to partition 1 and any other value maps to partition 1. - */ -public class GridExternalAffinityFunction implements GridCacheAffinityFunction { - /** Node attribute for index. */ - public static final String IDX_ATTR = "nodeIndex"; - - /** Number of backups. */ - private int backups; - - /** Number of partitions. */ - private int parts; - - /** Empty constructor. Equivalent for {@code new GridCacheModuloAffinity(2, 0)}. */ - public GridExternalAffinityFunction() { - this(2, 0); - } - - /** - * @param parts Number of partitions. - * @param backups Number of backups. - */ - public GridExternalAffinityFunction(int parts, int backups) { - assert parts > 0; - assert backups >= 0; - - this.parts = parts; - this.backups = backups; - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public List<List<ClusterNode>> assignPartitions(GridCacheAffinityFunctionContext ctx) { - List<List<ClusterNode>> res = new ArrayList<>(partitions()); - - List<ClusterNode> topSnapshot = ctx.currentTopologySnapshot(); - - for (int part = 0; part < parts; part++) { - res.add(F.isEmpty(topSnapshot) ? - Collections.<ClusterNode>emptyList() : - // Wrap affinity nodes with unmodifiable list since unmodifiable generic collection - // doesn't provide equals and hashCode implementations. - U.sealList(nodes(part, topSnapshot))); - } - - return res; - } - - /** {@inheritDoc} */ - public Collection<ClusterNode> nodes(int part, Collection<ClusterNode> nodes) { - List<ClusterNode> sorted = new ArrayList<>(nodes); - - Collections.sort(sorted, new Comparator<ClusterNode>() { - @Override public int compare(ClusterNode n1, ClusterNode n2) { - int idx1 = n1.<Integer>attribute(IDX_ATTR); - int idx2 = n2.<Integer>attribute(IDX_ATTR); - - return idx1 < idx2 ? -1 : idx1 == idx2 ? 0 : 1; - } - }); - - int max = 1 + backups; - - if (max > nodes.size()) - max = nodes.size(); - - Collection<ClusterNode> ret = new ArrayList<>(max); - - Iterator<ClusterNode> it = sorted.iterator(); - - for (int i = 0; i < max; i++) { - ClusterNode n = null; - - if (i == 0) { - while (it.hasNext()) { - n = it.next(); - - int nodeIdx = n.<Integer>attribute(IDX_ATTR); - - if (part <= nodeIdx) - break; - else - n = null; - } - } - else { - if (it.hasNext()) - n = it.next(); - else { - it = sorted.iterator(); - - assert it.hasNext(); - - n = it.next(); - } - } - - assert n != null || nodes.size() < parts; - - if (n == null) - n = (it = sorted.iterator()).next(); - - ret.add(n); - } - - return ret; - } - - /** {@inheritDoc} */ - @Override public void reset() { - // No-op. - } - - /** {@inheritDoc} */ - @Override public int partitions() { - return parts; - } - - /** {@inheritDoc} */ - @Override public int partition(Object key) { - return key instanceof Integer ? 0 == key ? 0 : 1 : 1; - } - - /** {@inheritDoc} - * @param nodeId*/ - @Override public void removeNode(UUID nodeId) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridExternalAffinityFunction.class, this); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java deleted file mode 100644 index c48827c..0000000 --- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.tests.p2p; - -import org.gridgain.grid.cache.affinity.*; - -/** - * Test mapper for P2P class loading tests. - */ -public class GridExternalAffinityKeyMapper implements GridCacheAffinityKeyMapper { - /** {@inheritDoc} */ - @Override public Object affinityKey(Object key) { - if (key instanceof Integer) - return 1 == (Integer)key ? key : 0; - - return key; - } - - /** {@inheritDoc} */ - @Override public void reset() { - // This mapper is stateless and needs no initialization logic. - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index f96b6c5..732742e 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -945,6 +945,11 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ + @Override public <K> IgniteCacheAffinity<K> affinity(String cacheName) { + return null; + } + + /** {@inheritDoc} */ @Override public <K extends GridCacheUtilityKey, V> GridCacheProjectionEx<K, V> utilityCache(Class<K> keyCls, Class<V> valCls) { return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25609651/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java index 862db45..570ae9f 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.configuration.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -422,7 +422,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest { cfg.setBackups(1); - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10)); + cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10)); return cfg; } @@ -444,7 +444,7 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest { cfg.setBackups(1); - cfg.setAffinity(new GridCacheConsistentHashAffinityFunction(false, 10)); + cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10)); return cfg; }
