http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 0cbdcf0..4c8a567 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1910,7 +1910,7 @@ public class IgnitionEx { cache.setSwapEnabled(false); cache.setRebalanceMode(SYNC); cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100)); + cache.setAffinity(new RendezvousAffinityFunction(false, 100)); cache.setNodeFilter(CacheConfiguration.ALL_NODES); return cache; @@ -1935,7 +1935,7 @@ public class IgnitionEx { cache.setSwapEnabled(false); cache.setRebalanceMode(SYNC); cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100)); + cache.setAffinity(new RendezvousAffinityFunction(false, 100)); cache.setNodeFilter(CacheConfiguration.ALL_NODES); return cache;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 16d542c..2d98ee0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -43,13 +43,13 @@ public class GridAffinityAssignmentCache { private int backups; /** Affinity function. */ - private final CacheAffinityFunction aff; + private final AffinityFunction aff; /** Partitions count. */ private final int partsCnt; /** Affinity mapper function. */ - private final CacheAffinityKeyMapper affMapper; + private final AffinityKeyMapper affMapper; /** Affinity calculation results cache: topology version => partition => nodes. */ private final ConcurrentLinkedHashMap<AffinityTopologyVersion, GridAffinityAssignment> affCache; @@ -81,8 +81,8 @@ public class GridAffinityAssignmentCache { @SuppressWarnings("unchecked") public GridAffinityAssignmentCache(GridCacheContext ctx, String cacheName, - CacheAffinityFunction aff, - CacheAffinityKeyMapper affMapper, + AffinityFunction aff, + AffinityKeyMapper affMapper, int backups) { assert ctx != null; @@ -178,11 +178,11 @@ public class GridAffinityAssignmentCache { if (!affNode) assignment = prevAssignment; else - assignment = aff.assignPartitions(new GridCacheAffinityFunctionContextImpl(sorted, prevAssignment, + assignment = aff.assignPartitions(new GridAffinityFunctionContextImpl(sorted, prevAssignment, discoEvt, topVer, backups)); } else - assignment = aff.assignPartitions(new GridCacheAffinityFunctionContextImpl(sorted, prevAssignment, discoEvt, + assignment = aff.assignPartitions(new GridAffinityFunctionContextImpl(sorted, prevAssignment, discoEvt, topVer, backups)); assert assignment != null; @@ -416,7 +416,7 @@ public class GridAffinityAssignmentCache { private AffinityTopologyVersion reqTopVer; /** - * + * */ private AffinityReadyFuture(AffinityTopologyVersion reqTopVer) { this.reqTopVer = reqTopVer; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java new file mode 100644 index 0000000..5a790b6 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityFunctionContextImpl.java @@ -0,0 +1,83 @@ +/* + * 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.apache.ignite.internal.processors.affinity; + +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.events.*; +import org.jetbrains.annotations.*; + +import java.util.*; + +/** + * Cache affinity function context implementation. Simple bean that holds all required fields. + */ +public class GridAffinityFunctionContextImpl implements AffinityFunctionContext { + /** Topology snapshot. */ + private final List<ClusterNode> topSnapshot; + + /** Previous affinity assignment. */ + private final List<List<ClusterNode>> prevAssignment; + + /** Discovery event that caused this topology change. */ + private final DiscoveryEvent discoEvt; + + /** Topology version. */ + private final AffinityTopologyVersion topVer; + + /** Number of backups to assign. */ + private final int backups; + + /** + * @param topSnapshot Topology snapshot. + * @param topVer Topology version. + */ + public GridAffinityFunctionContextImpl(List<ClusterNode> topSnapshot, List<List<ClusterNode>> prevAssignment, + DiscoveryEvent discoEvt, @NotNull AffinityTopologyVersion topVer, int backups) { + this.topSnapshot = topSnapshot; + this.prevAssignment = prevAssignment; + this.discoEvt = discoEvt; + this.topVer = topVer; + this.backups = backups; + } + + /** {@inheritDoc} */ + @Nullable @Override public List<ClusterNode> previousAssignment(int part) { + return prevAssignment == null ? null : prevAssignment.get(part); + } + + /** {@inheritDoc} */ + @Override public List<ClusterNode> currentTopologySnapshot() { + return topSnapshot; + } + + /** {@inheritDoc} */ + @Override public AffinityTopologyVersion currentTopologyVersion() { + return topVer; + } + + /** {@inheritDoc} */ + @Nullable @Override public DiscoveryEvent discoveryEvent() { + return discoEvt; + } + + /** {@inheritDoc} */ + @Override public int backups() { + return backups; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java index 631582e..46fc099 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java @@ -381,8 +381,8 @@ public class GridAffinityProcessor extends GridProcessorAdapter { } /** - * Requests {@link CacheAffinityFunction} and - * {@link CacheAffinityKeyMapper} from remote node. + * Requests {@link AffinityFunction} and + * {@link AffinityKeyMapper} from remote node. * * @param cacheName Name of cache on which affinity is requested. * @param topVer Topology version. @@ -395,8 +395,8 @@ public class GridAffinityProcessor extends GridProcessorAdapter { GridTuple3<GridAffinityMessage, GridAffinityMessage, GridAffinityAssignment> t = ctx.closure() .callAsyncNoFailover(BALANCE, affinityJob(cacheName, topVer), F.asList(n), true/*system pool*/).get(); - CacheAffinityFunction f = (CacheAffinityFunction)unmarshall(ctx, n.id(), t.get1()); - CacheAffinityKeyMapper m = (CacheAffinityKeyMapper)unmarshall(ctx, n.id(), t.get2()); + AffinityFunction f = (AffinityFunction)unmarshall(ctx, n.id(), t.get1()); + AffinityKeyMapper m = (AffinityKeyMapper)unmarshall(ctx, n.id(), t.get2()); assert m != null; @@ -492,10 +492,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter { */ private static class AffinityInfo { /** Affinity function. */ - private CacheAffinityFunction affFunc; + private AffinityFunction affFunc; /** Mapper */ - private CacheAffinityKeyMapper mapper; + private AffinityKeyMapper mapper; /** Assignment. */ private GridAffinityAssignment assignment; @@ -509,8 +509,8 @@ public class GridAffinityProcessor extends GridProcessorAdapter { * @param assignment Partition assignment. * @param cacheObjCtx Cache objects context. */ - private AffinityInfo(CacheAffinityFunction affFunc, - CacheAffinityKeyMapper mapper, + private AffinityInfo(AffinityFunction affFunc, + AffinityKeyMapper mapper, GridAffinityAssignment assignment, CacheObjectContext cacheObjCtx) { this.affFunc = affFunc; @@ -522,7 +522,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { /** * @return Cache affinity function. */ - private CacheAffinityFunction affinityFunction() { + private AffinityFunction affinityFunction() { return affFunc; } @@ -533,7 +533,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { return assignment; } - private CacheAffinityKeyMapper keyMapper() { + private AffinityKeyMapper keyMapper() { return mapper; } @@ -593,7 +593,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { /** * Grid cache affinity. */ - private class CacheAffinityProxy<K> implements CacheAffinity<K> { + private class CacheAffinityProxy<K> implements Affinity<K> { /** Cache name. */ private final String cacheName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java index bb7a3b5..91cb567 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.affinity; import org.apache.ignite.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.cache.*; @@ -37,11 +38,11 @@ import java.util.concurrent.*; */ class GridAffinityUtils { /** - * Creates a job that will look up {@link org.apache.ignite.cache.affinity.CacheAffinityKeyMapper} and {@link org.apache.ignite.cache.affinity.CacheAffinityFunction} on a + * Creates a job that will look up {@link AffinityKeyMapper} and {@link AffinityFunction} on a * cache with given name. If they exist, this job will serialize and transfer them together with all deployment * information needed to unmarshal objects on remote node. Result is returned as a {@link GridTuple3}, - * where first object is {@link GridAffinityMessage} for {@link org.apache.ignite.cache.affinity.CacheAffinityFunction}, second object - * is {@link GridAffinityMessage} for {@link org.apache.ignite.cache.affinity.CacheAffinityKeyMapper} and third object is affinity assignment + * where first object is {@link GridAffinityMessage} for {@link AffinityFunction}, second object + * is {@link GridAffinityMessage} for {@link AffinityKeyMapper} and third object is affinity assignment * for given topology version. * * @param cacheName Cache name. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java deleted file mode 100644 index 59f4c22..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java +++ /dev/null @@ -1,83 +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.apache.ignite.internal.processors.affinity; - -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.events.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -/** - * Cache affinity function context implementation. Simple bean that holds all required fields. - */ -public class GridCacheAffinityFunctionContextImpl implements CacheAffinityFunctionContext { - /** Topology snapshot. */ - private final List<ClusterNode> topSnapshot; - - /** Previous affinity assignment. */ - private final List<List<ClusterNode>> prevAssignment; - - /** Discovery event that caused this topology change. */ - private final DiscoveryEvent discoEvt; - - /** Topology version. */ - private final AffinityTopologyVersion topVer; - - /** Number of backups to assign. */ - private final int backups; - - /** - * @param topSnapshot Topology snapshot. - * @param topVer Topology version. - */ - public GridCacheAffinityFunctionContextImpl(List<ClusterNode> topSnapshot, List<List<ClusterNode>> prevAssignment, - DiscoveryEvent discoEvt, @NotNull AffinityTopologyVersion topVer, int backups) { - this.topSnapshot = topSnapshot; - this.prevAssignment = prevAssignment; - this.discoEvt = discoEvt; - this.topVer = topVer; - this.backups = backups; - } - - /** {@inheritDoc} */ - @Nullable @Override public List<ClusterNode> previousAssignment(int part) { - return prevAssignment == null ? null : prevAssignment.get(part); - } - - /** {@inheritDoc} */ - @Override public List<ClusterNode> currentTopologySnapshot() { - return topSnapshot; - } - - /** {@inheritDoc} */ - @Override public AffinityTopologyVersion currentTopologyVersion() { - return topVer; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoveryEvent discoveryEvent() { - return discoEvt; - } - - /** {@inheritDoc} */ - @Override public int backups() { - return backups; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java index f5c6219..6144807 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java @@ -30,7 +30,7 @@ import java.util.*; /** * Entry wrapper that never obscures obsolete entries from user. */ -public class CacheEvictableEntryImpl<K, V> implements CacheEvictableEntry<K, V> { +public class CacheEvictableEntryImpl<K, V> implements EvictableEntry<K, V> { /** */ private static final UUID META_KEY = UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java index 9a05b0a..5c1b5ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java @@ -34,7 +34,7 @@ public class CacheObjectContext { private IgniteCacheObjectProcessor proc; /** */ - private CacheAffinityKeyMapper dfltAffMapper; + private AffinityKeyMapper dfltAffMapper; /** */ private boolean cpyOnGet; @@ -52,7 +52,7 @@ public class CacheObjectContext { * @param unmarshalVals Unmarshal values flag. */ public CacheObjectContext(GridKernalContext kernalCtx, - CacheAffinityKeyMapper dfltAffMapper, + AffinityKeyMapper dfltAffMapper, boolean cpyOnGet, boolean unmarshalVals) { this.kernalCtx = kernalCtx; @@ -88,7 +88,7 @@ public class CacheObjectContext { /** * @return Default affinity mapper. */ - public CacheAffinityKeyMapper defaultAffMapper() { + public AffinityKeyMapper defaultAffMapper() { return dfltAffMapper; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java index 78ca980..6659735 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java @@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.transactions.*; @@ -130,13 +130,13 @@ import java.util.concurrent.*; * <i>affinity-based</i>, and <i>partitioned-based</i>. * <p> * With {@code affinity-based-group-locking} the keys are grouped by <i>affinity-key</i>. This means that - * only keys with identical affinity-key (see {@link org.apache.ignite.cache.affinity.CacheAffinityKeyMapped}) can participate in the + * only keys with identical affinity-key (see {@link AffinityKeyMapped}) can participate in the * transaction, and only one lock on the <i>affinity-key</i> will be acquired for the whole transaction. * {@code Affinity-group-locked} transactions are started via * <code>txStartAffinity(Object, TransactionConcurrency, TransactionIsolation, long, int)</code> method. * <p> * With {@code partition-based-group-locking} the keys are grouped by partition ID. This means that - * only keys belonging to identical partition (see {@link org.apache.ignite.cache.affinity.CacheAffinity#partition(Object)}) can participate in the + * only keys belonging to identical partition (see {@link Affinity#partition(Object)}) can participate in the * transaction, and only one lock on the whole partition will be acquired for the whole transaction. * {@code Partition-group-locked} transactions are started via * <code>txStartPartition(int, TransactionConcurrency, TransactionIsolation, long, int)</code> method. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java index 4cde6ad..e3ef493 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.mxbean.*; @@ -42,7 +43,7 @@ import java.util.*; * data based on the optionally passed in arguments. * </li> * <li> - * Method {@link #affinity()} provides {@link org.apache.ignite.cache.affinity.CacheAffinityFunction} service for information on + * Method {@link #affinity()} provides {@link AffinityFunction} service for information on * data partitioning and mapping keys to grid nodes responsible for caching those keys. * </li> * <li> @@ -96,7 +97,7 @@ public interface GridCache<K, V> extends CacheProjection<K, V> { * * @return Cache data affinity service. */ - public CacheAffinity<K> affinity(); + public Affinity<K> affinity(); /** * Gets metrics (statistics) for this cache. @@ -209,7 +210,7 @@ public interface GridCache<K, V> extends CacheProjection<K, V> { * the left nodes, and that nodes are restarted before * {@link CacheConfiguration#getRebalanceDelay() rebalanceDelay} expires. To place nodes * on the same place in consistent hash ring, use - * {@link org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)} to make sure that + * {@link RendezvousAffinityFunction#setHashIdResolver(AffinityNodeHashResolver)} to make sure that * a node maps to the same hash ID if re-started. * <p> * See {@link org.apache.ignite.configuration.CacheConfiguration#getRebalanceDelay()} for more information on how to configure http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 2b65fed..cfc4138 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -176,7 +176,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, private CacheQueries<K, V> qry; /** Affinity impl. */ - private CacheAffinity<K> aff; + private Affinity<K> aff; /** Whether this cache is IGFS data cache. */ private boolean igfsDataCache; @@ -369,7 +369,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public CacheAffinity<K> affinity() { + @Override public Affinity<K> affinity() { return aff; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java index 20522f3..496817e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java @@ -119,10 +119,10 @@ public class GridCacheAttributes implements Serializable { * @return Affinity include neighbors. */ public boolean affinityIncludeNeighbors() { - CacheAffinityFunction aff = ccfg.getAffinity(); + AffinityFunction aff = ccfg.getAffinity(); - return aff instanceof CacheRendezvousAffinityFunction - && !((CacheRendezvousAffinityFunction)aff).isExcludeNeighbors(); + return aff instanceof RendezvousAffinityFunction + && !((RendezvousAffinityFunction)aff).isExcludeNeighbors(); } /** @@ -143,10 +143,10 @@ public class GridCacheAttributes implements Serializable { * @return Affinity hash ID resolver class name. */ public String affinityHashIdResolverClassName() { - CacheAffinityFunction aff = ccfg.getAffinity(); + AffinityFunction aff = ccfg.getAffinity(); - if (aff instanceof CacheRendezvousAffinityFunction) - return className(((CacheRendezvousAffinityFunction)aff).getHashIdResolver()); + if (aff instanceof RendezvousAffinityFunction) + return className(((RendezvousAffinityFunction)aff).getHashIdResolver()); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 587b7d7..de180ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -364,7 +364,7 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * + * */ public void onStarted() { startLatch.countDown(); @@ -1062,7 +1062,7 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return Default affinity key mapper. */ - public CacheAffinityKeyMapper defaultAffMapper() { + public AffinityKeyMapper defaultAffMapper() { return cacheObjCtx.defaultAffMapper(); } @@ -1074,7 +1074,7 @@ public class GridCacheContext<K, V> implements Externalizable { public void cacheObjectContext(CacheObjectContext cacheObjCtx) { this.cacheObjCtx = cacheObjCtx; } - + /** * @param p Single predicate. * @return Array containing single predicate. @@ -1596,9 +1596,9 @@ public class GridCacheContext<K, V> implements Externalizable { * @throws GridCacheEntryRemovedException If reader for entry is removed. */ public boolean dhtMap( - UUID nearNodeId, - AffinityTopologyVersion topVer, - GridDhtCacheEntry entry, + UUID nearNodeId, + AffinityTopologyVersion topVer, + GridDhtCacheEntry entry, IgniteLogger log, Map<ClusterNode, List<GridDhtCacheEntry>> dhtMap, @Nullable Map<ClusterNode, List<GridDhtCacheEntry>> nearMap http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java index 17842ca..cd868db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java @@ -29,17 +29,17 @@ import java.lang.annotation.*; import java.lang.reflect.*; /** - * Default key affinity mapper. If key class has annotation {@link CacheAffinityKeyMapped}, + * Default key affinity mapper. If key class has annotation {@link AffinityKeyMapped}, * then the value of annotated method or field will be used to get affinity value instead * of the key itself. If there is no annotation, then the key is used as is. * <p> - * Convenience affinity key adapter, {@link CacheAffinityKey} can be used in + * Convenience affinity key adapter, {@link AffinityKey} can be used in * conjunction with this mapper to automatically provide custom affinity keys for cache keys. * <p> * If non-default affinity mapper is used, is should be provided via * {@link CacheConfiguration#getAffinityMapper()} configuration property. */ -public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper { +public class GridCacheDefaultAffinityKeyMapper implements AffinityKeyMapper { /** */ private static final long serialVersionUID = 0L; @@ -52,17 +52,17 @@ public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper new P1<Field>() { @Override public boolean apply(Field f) { // Account for anonymous inner classes. - return f.getAnnotation(CacheAffinityKeyMapped.class) != null; + return f.getAnnotation(AffinityKeyMapped.class) != null; } }, new P1<Method>() { @Override public boolean apply(Method m) { // Account for anonymous inner classes. - Annotation ann = m.getAnnotation(CacheAffinityKeyMapped.class); + Annotation ann = m.getAnnotation(AffinityKeyMapped.class); if (ann != null) { if (!F.isEmpty(m.getParameterTypes())) - throw new IllegalStateException("Method annotated with @CacheAffinityKey annotation " + + throw new IllegalStateException("Method annotated with @AffinityKeyMapped annotation " + "cannot have parameters: " + m); return true; @@ -78,7 +78,7 @@ public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper protected transient IgniteLogger log; /** - * If key class has annotation {@link CacheAffinityKeyMapped}, + * If key class has annotation {@link AffinityKeyMapped}, * then the value of annotated method or field will be used to get affinity value instead * of the key itself. If there is no annotation, then the key is returned as is. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index 4ef91de..f4edb8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -156,7 +156,7 @@ public interface GridCacheEntryEx { /** * @return Entry which is safe to pass into eviction policy. */ - public <K, V> CacheEvictableEntry<K, V> wrapEviction(); + public <K, V> EvictableEntry<K, V> wrapEviction(); /** * @return Entry which holds key and version (no value, since entry http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index f2a8ba1..fd56568 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -64,10 +64,10 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { private static final sun.misc.Unsafe unsafe = GridUnsafe.unsafe(); /** Eviction policy. */ - private CacheEvictionPolicy plc; + private EvictionPolicy plc; /** Eviction filter. */ - private CacheEvictionFilter filter; + private EvictionFilter filter; /** Eviction buffer. */ private final ConcurrentLinkedDeque8<EvictionInfo> bufEvictQ = new ConcurrentLinkedDeque8<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 20158e1..2f5a5b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -3797,7 +3797,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { } /** {@inheritDoc} */ - @Override public <K, V> CacheEvictableEntry<K, V> wrapEviction() { + @Override public <K, V> EvictableEntry<K, V> wrapEviction() { return new CacheEvictableEntryImpl<>(this); } @@ -4349,7 +4349,7 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { if (cls.isAssignableFrom(getClass())) return (T)this; - if (cls.isAssignableFrom(CacheEvictableEntry.class)) + if (cls.isAssignableFrom(EvictableEntry.class)) return (T)wrapEviction(); if (cls.isAssignableFrom(CacheVersionedEntryImpl.class)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java index f253fb8..80d3d6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java @@ -39,7 +39,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V> protected final IgniteLogger log; /** Affinity. */ - protected final CacheAffinityFunction aff; + protected final AffinityFunction aff; /** Start future (always completed by default). */ private final IgniteInternalFuture finFut; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 26091f3..c918ed4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -150,16 +150,16 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cfg.getAffinity() == null) { if (cfg.getCacheMode() == PARTITIONED) { - CacheRendezvousAffinityFunction aff = new CacheRendezvousAffinityFunction(); + RendezvousAffinityFunction aff = new RendezvousAffinityFunction(); - aff.setHashIdResolver(new CacheAffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); cfg.setAffinity(aff); } else if (cfg.getCacheMode() == REPLICATED) { - CacheRendezvousAffinityFunction aff = new CacheRendezvousAffinityFunction(false, 512); + RendezvousAffinityFunction aff = new RendezvousAffinityFunction(false, 512); - aff.setHashIdResolver(new CacheAffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); cfg.setAffinity(aff); @@ -170,11 +170,11 @@ public class GridCacheProcessor extends GridProcessorAdapter { } else { if (cfg.getCacheMode() == PARTITIONED) { - if (cfg.getAffinity() instanceof CacheRendezvousAffinityFunction) { - CacheRendezvousAffinityFunction aff = (CacheRendezvousAffinityFunction)cfg.getAffinity(); + if (cfg.getAffinity() instanceof RendezvousAffinityFunction) { + RendezvousAffinityFunction aff = (RendezvousAffinityFunction)cfg.getAffinity(); if (aff.getHashIdResolver() == null) - aff.setHashIdResolver(new CacheAffinityNodeAddressHashResolver()); + aff.setHashIdResolver(new AffinityNodeAddressHashResolver()); } } } @@ -282,16 +282,16 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheConfiguration cc, @Nullable CacheStore cfgStore) throws IgniteCheckedException { if (cc.getCacheMode() == REPLICATED) { - if (cc.getAffinity() instanceof CachePartitionFairAffinity) - throw new IgniteCheckedException("REPLICATED cache can not be started with CachePartitionFairAffinity" + + if (cc.getAffinity() instanceof FairAffinityFunction) + throw new IgniteCheckedException("REPLICATED cache can not be started with FairAffinityFunction" + " [cacheName=" + cc.getName() + ']'); - if (cc.getAffinity() instanceof CacheRendezvousAffinityFunction) { - CacheRendezvousAffinityFunction aff = (CacheRendezvousAffinityFunction)cc.getAffinity(); + if (cc.getAffinity() instanceof RendezvousAffinityFunction) { + RendezvousAffinityFunction aff = (RendezvousAffinityFunction)cc.getAffinity(); if (aff.isExcludeNeighbors()) throw new IgniteCheckedException("For REPLICATED cache flag 'excludeNeighbors' in " + - "CacheRendezvousAffinityFunction cannot be set [cacheName=" + cc.getName() + ']'); + "RendezvousAffinityFunction cannot be set [cacheName=" + cc.getName() + ']'); } if (cc.getNearConfiguration() != null && @@ -304,7 +304,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } if (cc.getCacheMode() == LOCAL && !cc.getAffinity().getClass().equals(LocalAffinityFunction.class)) - U.warn(log, "CacheAffinityFunction configuration parameter will be ignored for local cache [cacheName=" + + U.warn(log, "AffinityFunction configuration parameter will be ignored for local cache [cacheName=" + cc.getName() + ']'); if (cc.getRebalanceMode() != CacheRebalanceMode.NONE) { @@ -1863,10 +1863,10 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (DynamicCacheDescriptor desc : registeredCaches.values()) { CacheConfiguration cfg = desc.cacheConfiguration(); - if (cfg.getAffinity() instanceof CacheRendezvousAffinityFunction) { - CacheRendezvousAffinityFunction aff = (CacheRendezvousAffinityFunction)cfg.getAffinity(); + if (cfg.getAffinity() instanceof RendezvousAffinityFunction) { + RendezvousAffinityFunction aff = (RendezvousAffinityFunction)cfg.getAffinity(); - CacheAffinityNodeHashResolver hashIdRslvr = aff.getHashIdResolver(); + AffinityNodeHashResolver hashIdRslvr = aff.getHashIdResolver(); assert hashIdRslvr != null; @@ -2582,12 +2582,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** * */ - private static class LocalAffinityFunction implements CacheAffinityFunction { + private static class LocalAffinityFunction implements AffinityFunction { /** */ private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(CacheAffinityFunctionContext affCtx) { + @Override public List<List<ClusterNode>> assignPartitions(AffinityFunctionContext affCtx) { ClusterNode locNode = null; for (ClusterNode n : affCtx.currentTopologySnapshot()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 7d5acc6..772a3b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -71,7 +71,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali private CacheQueries<K, V> qry; /** Affinity. */ - private CacheAffinity<K> aff; + private Affinity<K> aff; /** * Empty constructor required for {@link Externalizable}. @@ -143,7 +143,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public CacheAffinity<K> affinity() { + @Override public Affinity<K> affinity() { return aff; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 8aed80e..a090b12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1767,7 +1767,7 @@ public class GridCacheUtils { * @return Predicate that evaulates to {@code true} if entry is primary for node. */ public static CacheEntryPredicate cachePrimary( - final CacheAffinity aff, + final Affinity aff, final ClusterNode n ) { return new CacheEntryPredicateAdapter() { @@ -1783,7 +1783,7 @@ public class GridCacheUtils { * @return Predicate that evaulates to {@code true} if entry is primary for node. */ public static <K, V> IgnitePredicate<Cache.Entry<K, V>> cachePrimary0( - final CacheAffinity<K> aff, + final Affinity<K> aff, final ClusterNode n ) { return new IgnitePredicate<Cache.Entry<K, V>>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java index f79193c..a539a14 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java @@ -31,7 +31,7 @@ import java.util.*; /** * Affinity interface implementation. */ -public class GridCacheAffinityImpl<K, V> implements CacheAffinity<K> { +public class GridCacheAffinityImpl<K, V> implements Affinity<K> { /** Cache context. */ private GridCacheContext<K, V> cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java index abef4d5..6959a70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityProxy.java @@ -28,7 +28,7 @@ import java.util.*; /** * Affinity interface implementation. */ -public class GridCacheAffinityProxy<K, V> implements CacheAffinity<K>, Externalizable { +public class GridCacheAffinityProxy<K, V> implements Affinity<K>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -36,7 +36,7 @@ public class GridCacheAffinityProxy<K, V> implements CacheAffinity<K>, Externali private GridCacheGateway<K, V> gate; /** Affinity delegate. */ - private CacheAffinity<K> delegate; + private Affinity<K> delegate; /** Context. */ private GridCacheContext<K, V> cctx; @@ -52,7 +52,7 @@ public class GridCacheAffinityProxy<K, V> implements CacheAffinity<K>, Externali * @param cctx Context. * @param delegate Delegate object. */ - public GridCacheAffinityProxy(GridCacheContext<K, V> cctx, CacheAffinity<K> delegate) { + public GridCacheAffinityProxy(GridCacheContext<K, V> cctx, Affinity<K> delegate) { gate = cctx.gate(); this.delegate = delegate; this.cctx = cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 7e7f5a5..73fb265 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -343,10 +343,10 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT * @return {@code True} if local node can calculate affinity on it's own for this partition map exchange. */ private boolean canCalculateAffinity(GridCacheContext cacheCtx) { - CacheAffinityFunction affFunc = cacheCtx.config().getAffinity(); + AffinityFunction affFunc = cacheCtx.config().getAffinity(); // Do not request affinity from remote nodes if affinity function is not centralized. - if (!U.hasAnnotation(affFunc, CacheCentralizedAffinityFunction.class)) + if (!U.hasAnnotation(affFunc, CentralizedAffinityFunction.class)) return true; // If local node did not initiate exchange or local node is the only cache node in grid. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java index 998951e..79772e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache.query; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cluster.*; @@ -83,7 +84,7 @@ import org.jetbrains.annotations.*; * Joins will work correctly only if joined objects are stored in * collocated mode or at least one side of the join is stored in * {@link org.apache.ignite.cache.CacheMode#REPLICATED} cache. Refer to - * {@link org.apache.ignite.cache.affinity.CacheAffinityKey} javadoc for more information about colocation. + * {@link AffinityKey} javadoc for more information about colocation. * </li> * </ul> * <h1 class="header">Query usage</h1> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java index 2d3ba03..fdf6464 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheInternalKeyImpl.java @@ -52,7 +52,7 @@ public class GridCacheInternalKeyImpl implements GridCacheInternalKey, Externali } /** {@inheritDoc} */ - @CacheAffinityKeyMapped + @AffinityKeyMapped @Override public String name() { return name; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java index 644b839..08e3f65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java @@ -666,7 +666,7 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T> imp /** * @return Item affinity key. */ - @CacheAffinityKeyMapped + @AffinityKeyMapped public Object affinityKey() { return queueName(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java index 1ebd5d0..550fa0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java @@ -571,7 +571,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite /** * @return Item affinity key. */ - @CacheAffinityKeyMapped + @AffinityKeyMapped public Object affinityKey() { return setName; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index 6f1a9ab..27a69f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -209,7 +209,7 @@ public class IgfsDataManager extends IgfsManager { assert dataCachePrj != null; - CacheAffinityKeyMapper mapper = igfsCtx.kernalContext().cache() + AffinityKeyMapper mapper = igfsCtx.kernalContext().cache() .internalCache(igfsCtx.configuration().getDataCacheName()).configuration().getAffinityMapper(); grpSize = mapper instanceof IgfsGroupDataBlocksKeyMapper ? http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java index 8bca65f..1607e4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java @@ -28,22 +28,22 @@ import org.apache.ignite.configuration.*; public class IgfsHelperImpl implements IgfsHelper { /** {@inheritDoc} */ @Override public void preProcessCacheConfiguration(CacheConfiguration cfg) { - CacheEvictionPolicy evictPlc = cfg.getEvictionPolicy(); + EvictionPolicy evictPlc = cfg.getEvictionPolicy(); - if (evictPlc instanceof CacheIgfsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null) - cfg.setEvictionFilter(new CacheIgfsEvictionFilter()); + if (evictPlc instanceof IgfsPerBlockLruEvictionPolicy && cfg.getEvictionFilter() == null) + cfg.setEvictionFilter(new IgfsEvictionFilter()); } /** {@inheritDoc} */ @Override public void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException { - CacheEvictionPolicy evictPlc = cfg.getEvictionPolicy(); + EvictionPolicy evictPlc = cfg.getEvictionPolicy(); - if (evictPlc != null && evictPlc instanceof CacheIgfsPerBlockLruEvictionPolicy) { - CacheEvictionFilter evictFilter = cfg.getEvictionFilter(); + if (evictPlc != null && evictPlc instanceof IgfsPerBlockLruEvictionPolicy) { + EvictionFilter evictFilter = cfg.getEvictionFilter(); - if (evictFilter != null && !(evictFilter instanceof CacheIgfsEvictionFilter)) + if (evictFilter != null && !(evictFilter instanceof IgfsEvictionFilter)) throw new IgniteCheckedException("Eviction filter cannot be set explicitly when using " + - "CacheIgfsPerBlockLruEvictionPolicy:" + cfg.getName()); + "IgfsPerBlockLruEvictionPolicy:" + cfg.getName()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 19a27d2..824f178 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -118,7 +118,7 @@ public final class IgfsImpl implements IgfsEx { private Object topic; /** Eviction policy (if set). */ - private CacheIgfsPerBlockLruEvictionPolicy evictPlc; + private IgfsPerBlockLruEvictionPolicy evictPlc; /** * Creates IGFS instance with given context. @@ -201,10 +201,10 @@ public final class IgfsImpl implements IgfsEx { for (CacheConfiguration cacheCfg : igfsCtx.kernalContext().config().getCacheConfiguration()) { if (F.eq(dataCacheName, cacheCfg.getName())) { - CacheEvictionPolicy evictPlc = cacheCfg.getEvictionPolicy(); + EvictionPolicy evictPlc = cacheCfg.getEvictionPolicy(); - if (evictPlc != null & evictPlc instanceof CacheIgfsPerBlockLruEvictionPolicy) - this.evictPlc = (CacheIgfsPerBlockLruEvictionPolicy)evictPlc; + if (evictPlc != null & evictPlc instanceof IgfsPerBlockLruEvictionPolicy) + this.evictPlc = (IgfsPerBlockLruEvictionPolicy)evictPlc; break; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index 44beb30..b17626c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -98,7 +98,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { if (log.isDebugEnabled()) log.debug("IGFS processor started."); - + IgniteConfiguration gridCfg = ctx.config(); // Node doesn't have IGFS if it: @@ -127,7 +127,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { if (cacheCfg == null) continue; // No cache for the given IGFS configuration. - CacheAffinityKeyMapper affMapper = cacheCfg.getAffinityMapper(); + AffinityKeyMapper affMapper = cacheCfg.getAffinityMapper(); if (!(affMapper instanceof IgfsGroupDataBlocksKeyMapper)) // Do not create IGFS attributes for such a node nor throw error about invalid configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java index 613b034..0256c93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java @@ -54,12 +54,12 @@ public class VisorCacheAffinityConfiguration implements Serializable { * @return Data transfer object for affinity configuration properties. */ public static VisorCacheAffinityConfiguration from(CacheConfiguration ccfg) { - CacheAffinityFunction aff = ccfg.getAffinity(); + AffinityFunction aff = ccfg.getAffinity(); Boolean excludeNeighbors = null; - if (aff instanceof CacheRendezvousAffinityFunction) { - CacheRendezvousAffinityFunction hashAffFunc = (CacheRendezvousAffinityFunction)aff; + if (aff instanceof RendezvousAffinityFunction) { + RendezvousAffinityFunction hashAffFunc = (RendezvousAffinityFunction)aff; excludeNeighbors = hashAffFunc.isExcludeNeighbors(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java index a2f49c5..8129c20 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java @@ -64,7 +64,7 @@ public class VisorCacheEvictionConfiguration implements Serializable { public static VisorCacheEvictionConfiguration from(CacheConfiguration ccfg) { VisorCacheEvictionConfiguration cfg = new VisorCacheEvictionConfiguration(); - final CacheEvictionPolicy plc = ccfg.getEvictionPolicy(); + final EvictionPolicy plc = ccfg.getEvictionPolicy(); cfg.plc = compactClass(plc); cfg.plcMaxSize = evictionPolicyMaxSize(plc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java index bb5e549..57b85b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheSwapBackupsTask.java @@ -73,7 +73,7 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map for (GridCache c : ignite.cachesx()) { String cacheName = c.name(); - CacheAffinity<Object> aff = g.affinity(c.name()); + Affinity<Object> aff = g.affinity(c.name()); if (names.contains(cacheName)) { Set<Cache.Entry> entries = c.entrySet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 51e3c6e..1209a40 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -613,15 +613,15 @@ public class VisorTaskUtils { * @param plc Eviction policy. * @return Extracted max size. */ - public static Integer evictionPolicyMaxSize(@Nullable CacheEvictionPolicy plc) { - if (plc instanceof CacheLruEvictionPolicyMBean) - return ((CacheLruEvictionPolicyMBean)plc).getMaxSize(); + public static Integer evictionPolicyMaxSize(@Nullable EvictionPolicy plc) { + if (plc instanceof LruEvictionPolicyMBean) + return ((LruEvictionPolicyMBean)plc).getMaxSize(); - if (plc instanceof CacheRandomEvictionPolicyMBean) - return ((CacheRandomEvictionPolicyMBean)plc).getMaxSize(); + if (plc instanceof RandomEvictionPolicyMBean) + return ((RandomEvictionPolicyMBean)plc).getMaxSize(); - if (plc instanceof CacheFifoEvictionPolicyMBean) - return ((CacheFifoEvictionPolicyMBean)plc).getMaxSize(); + if (plc instanceof FifoEvictionPolicyMBean) + return ((FifoEvictionPolicyMBean)plc).getMaxSize(); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 797efff..ccc6aae 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -35,22 +35,22 @@ org.apache.ignite.cache.CachePartialUpdateException org.apache.ignite.cache.CachePeekMode org.apache.ignite.cache.CacheRebalanceMode org.apache.ignite.cache.CacheWriteSynchronizationMode -org.apache.ignite.cache.affinity.CacheAffinityFunction -org.apache.ignite.cache.affinity.CacheAffinityKey -org.apache.ignite.cache.affinity.CacheAffinityKeyMapper -org.apache.ignite.cache.affinity.CacheAffinityNodeAddressHashResolver -org.apache.ignite.cache.affinity.CacheAffinityNodeHashResolver -org.apache.ignite.cache.affinity.CacheAffinityNodeIdHashResolver -org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity -org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity$PartitionSetComparator -org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction -org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction$HashComparator -org.apache.ignite.cache.eviction.CacheEvictionFilter -org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy -org.apache.ignite.cache.eviction.igfs.CacheIgfsEvictionFilter -org.apache.ignite.cache.eviction.igfs.CacheIgfsPerBlockLruEvictionPolicy -org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy -org.apache.ignite.cache.eviction.random.CacheRandomEvictionPolicy +org.apache.ignite.cache.affinity.AffinityFunction +org.apache.ignite.cache.affinity.AffinityKey +org.apache.ignite.cache.affinity.AffinityKeyMapper +org.apache.ignite.cache.affinity.AffinityNodeAddressHashResolver +org.apache.ignite.cache.affinity.AffinityNodeHashResolver +org.apache.ignite.cache.affinity.AffinityNodeIdHashResolver +org.apache.ignite.cache.affinity.fair.FairAffinityFunction +org.apache.ignite.cache.affinity.fair.FairAffinityFunction$PartitionSetComparator +org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction +org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction$HashComparator +org.apache.ignite.cache.eviction.EvictionFilter +org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy +org.apache.ignite.cache.eviction.igfs.IgfsEvictionFilter +org.apache.ignite.cache.eviction.igfs.IgfsPerBlockLruEvictionPolicy +org.apache.ignite.cache.eviction.lru.LruEvictionPolicy +org.apache.ignite.cache.eviction.random.RandomEvictionPolicy org.apache.ignite.cache.query.ContinuousQuery org.apache.ignite.cache.query.Query org.apache.ignite.cache.query.ScanQuery http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/config/discovery-stress.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml index 81361c1..3c5c214 100644 --- a/modules/core/src/test/config/discovery-stress.xml +++ b/modules/core/src/test/config/discovery-stress.xml @@ -33,7 +33,7 @@ <property name="writeSynchronizationMode" value="FULL_ASYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy"> <property name="maxSize" value="20000000"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/config/load/dsi-49-server-production.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml index 52319a8..5887c63 100644 --- a/modules/core/src/test/config/load/dsi-49-server-production.xml +++ b/modules/core/src/test/config/load/dsi-49-server-production.xml @@ -46,14 +46,14 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="evictionPolicy"> <bean - class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="500000"/> </bean> </property> <!-- 1 backup --> <property name="backups" value="1"/> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction"> <property name="excludeNeighbors" value="true"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/config/load/dsi-load-server.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-server.xml b/modules/core/src/test/config/load/dsi-load-server.xml index 61a9253..7f746e6 100644 --- a/modules/core/src/test/config/load/dsi-load-server.xml +++ b/modules/core/src/test/config/load/dsi-load-server.xml @@ -59,7 +59,7 @@ <property name="evictSynchronized" value="false"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy"> <property name="maxSize" value="5000"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/config/spring-cache-swap.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml index 986c51b..2e1dd36 100644 --- a/modules/core/src/test/config/spring-cache-swap.xml +++ b/modules/core/src/test/config/spring-cache-swap.xml @@ -35,7 +35,7 @@ <property name="swapEnabled" value="true"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy"> <property name="maxSize" value="10000"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/config/spring-cache-teststore.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml index 5e59aff..a17270b 100644 --- a/modules/core/src/test/config/spring-cache-teststore.xml +++ b/modules/core/src/test/config/spring-cache-teststore.xml @@ -35,7 +35,7 @@ <property name="swapEnabled" value="false"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.fifo.CacheFifoEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy"> <property name="maxSize" value="10000"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index 7c84eee..6c6ecf4 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -73,7 +73,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -95,7 +95,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -117,7 +117,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -139,7 +139,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -162,7 +162,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -184,7 +184,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -206,7 +206,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> @@ -228,7 +228,7 @@ <property name="rebalanceMode" value="SYNC"/> <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy"> + <bean class="org.apache.ignite.cache.eviction.lru.LruEvictionPolicy"> <property name="maxSize" value="100"/> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java index 7d7cef8..2a4655f 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java @@ -35,7 +35,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { private int backups; /** Affinity function. */ - private CacheAffinityFunction func; + private AffinityFunction func; /** */ private int nodesCnt = 5; @@ -60,7 +60,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { */ public void testRendezvousBackups() throws Exception { for (int i = 0; i < nodesCnt; i++) - checkBackups(i, new CacheRendezvousAffinityFunction()); + checkBackups(i, new RendezvousAffinityFunction()); } /** @@ -68,7 +68,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { */ public void testFairBackups() throws Exception { for (int i = 0; i < nodesCnt; i++) - checkBackups(i, new CachePartitionFairAffinity()); + checkBackups(i, new FairAffinityFunction()); } /** @@ -76,7 +76,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { * @param func Affinity function. * @throws Exception If failed. */ - private void checkBackups(int backups, CacheAffinityFunction func) throws Exception { + private void checkBackups(int backups, AffinityFunction func) throws Exception { this.backups = backups; this.func = func; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java index c374b7e..0c8dcc2 100644 --- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java @@ -57,11 +57,11 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { CacheConfiguration cache1 = cacheConfiguration(null); cache1.setName(CACHE1); - cache1.setAffinity(new CachePartitionFairAffinity()); + cache1.setAffinity(new FairAffinityFunction()); CacheConfiguration cache2 = cacheConfiguration(null); cache2.setName(CACHE2); - cache2.setAffinity(new CacheRendezvousAffinityFunction()); + cache2.setAffinity(new RendezvousAffinityFunction()); if (gridName.contains("0")) cfg.setCacheConfiguration(cache0); @@ -116,7 +116,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { * @param testAff Cache affinity to test. * @param aff Cache affinity. */ - private void checkAffinity(CacheAffinity testAff, CacheAffinity aff) { + private void checkAffinity(Affinity testAff, Affinity aff) { checkAffinityKey(testAff, aff); checkPartitions(testAff, aff); checkIsBackupOrPrimary(testAff, aff); @@ -129,7 +129,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check affinityKey method. */ - private void checkAffinityKey(CacheAffinity testAff,CacheAffinity aff) { + private void checkAffinityKey(Affinity testAff,Affinity aff) { for (int i = 0; i < 10000; i++) assertEquals(testAff.affinityKey(i), aff.affinityKey(i)); } @@ -137,7 +137,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check allPartitions, backupPartitions and primaryPartitions methods. */ - private void checkPartitions(CacheAffinity testAff, CacheAffinity aff) { + private void checkPartitions(Affinity testAff, Affinity aff) { for (ClusterNode n : nodes()) { checkEqualIntArray(testAff.allPartitions(n), aff.allPartitions(n)); @@ -150,7 +150,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check isBackup, isPrimary and isPrimaryOrBackup methods. */ - private void checkIsBackupOrPrimary(CacheAffinity testAff, CacheAffinity aff) { + private void checkIsBackupOrPrimary(Affinity testAff, Affinity aff) { for (int i = 0; i < 10000; i++) for (ClusterNode n : nodes()) { assertEquals(testAff.isBackup(n, i), aff.isBackup(n, i)); @@ -164,7 +164,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check mapKeyToNode, mapKeyToPrimaryAndBackups methods. */ - private void checkMapKeyToNode(CacheAffinity testAff, CacheAffinity aff) { + private void checkMapKeyToNode(Affinity testAff, Affinity aff) { for (int i = 0; i < 10000; i++) { assertEquals(testAff.mapKeyToNode(i).id(), aff.mapKeyToNode(i).id()); @@ -175,7 +175,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check mapPartitionToPrimaryAndBackups and mapPartitionToNode methods. */ - private void checkMapPartitionToNode(CacheAffinity testAff, CacheAffinity aff) { + private void checkMapPartitionToNode(Affinity testAff, Affinity aff) { assertEquals(aff.partitions(), testAff.partitions()); for (int part = 0; part < aff.partitions(); ++part) { @@ -189,7 +189,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check mapKeysToNodes methods. */ - private void checkMapKeysToNodes(CacheAffinity testAff, CacheAffinity aff) { + private void checkMapKeysToNodes(Affinity testAff, Affinity aff) { List<Integer> keys = new ArrayList<>(10000); for (int i = 0; i < 10000; ++i) @@ -201,7 +201,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { /** * Check mapPartitionsToNodes methods. */ - private void checkMapPartitionsToNodes(CacheAffinity testAff, CacheAffinity aff) { + private void checkMapPartitionsToNodes(Affinity testAff, Affinity aff) { List<Integer> parts = new ArrayList<>(aff.partitions()); for (int i = 0; i < aff.partitions(); ++i)
