Repository: incubator-ignite Updated Branches: refs/heads/ignite-758 755293991 -> 26368493d
#ignite-758: Remove GridCache interface. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e01e2b6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e01e2b6c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e01e2b6c Branch: refs/heads/ignite-758 Commit: e01e2b6c542adbcc27b0f283eccc4199d6d613c7 Parents: 7552939 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 11:51:38 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 11:51:38 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 2 +- .../org/apache/ignite/internal/IgniteEx.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 8 +- .../internal/managers/GridManagerAdapter.java | 2 +- .../processors/cache/CacheProjection.java | 122 ++++++++++++- .../internal/processors/cache/GridCache.java | 176 ------------------- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheProcessor.java | 14 +- .../processors/cache/GridCacheProxyImpl.java | 4 +- .../CacheDataStructuresManager.java | 8 +- .../cache/query/GridCacheQueryManager.java | 8 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../datastructures/DataStructuresProcessor.java | 4 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../processors/task/GridTaskProcessor.java | 6 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../internal/visor/cache/VisorCacheMetrics.java | 2 +- .../visor/cache/VisorCacheRebalanceTask.java | 2 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../ignite/startup/BasicWarmupClosure.java | 20 +-- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 6 +- .../HibernateAccessStrategyAdapter.java | 6 +- .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 4 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 2 +- .../ignite/cache/hibernate/HibernateRegion.java | 4 +- .../cache/hibernate/HibernateRegionFactory.java | 10 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 4 +- .../HibernateTransactionalDataRegion.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../cache/IgniteCacheAbstractBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +- 45 files changed, 215 insertions(+), 275 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 003d27f..72a7b86 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -1203,7 +1203,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { * <p> * Default value is {@code 0} which means that repartitioning and rebalancing will start * immediately upon node leaving topology. If {@code -1} is returned, then rebalancing - * will only be started manually by calling {@link GridCache#forceRepartition()} method or + * will only be started manually by calling {@link CacheProjection#forceRepartition()} method or * from management console. * * @return Rebalancing delay, {@code 0} to start rebalancing immediately, {@code -1} to http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java index 867e26d..822b929 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java @@ -47,17 +47,17 @@ public interface IgniteEx extends Ignite { * @param name Cache name. * @return Cache instance for given name or <tt>null</tt> if one does not exist. */ - @Nullable public <K, V> GridCache<K, V> cachex(@Nullable String name); + @Nullable public <K, V> CacheProjection<K, V> cachex(@Nullable String name); /** * Gets default cache instance if one is configured or <tt>null</tt> otherwise returning even non-public caches. - * The {@link org.apache.ignite.internal.processors.cache.GridCache#name()} method on default instance returns <tt>null</tt>. + * The {@link CacheProjection#name()} method on default instance returns <tt>null</tt>. * * @param <K> Key type. * @param <V> Value type. * @return Default cache instance. */ - @Nullable public <K, V> GridCache<K, V> cachex(); + @Nullable public <K, V> CacheProjection<K, V> cachex(); /** * Gets configured cache instance that satisfy all provided predicates including non-public caches. If no @@ -66,7 +66,7 @@ public interface IgniteEx extends Ignite { * @param p Predicates. If none provided - all configured caches will be returned. * @return Configured cache instances that satisfy all provided predicates. */ - public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p); + public Collection<CacheProjection<?, ?>> cachesx(@Nullable IgnitePredicate<? super CacheProjection<?, ?>>... p); /** * Checks if the event type is user-recordable. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 05667d8..9e7a3d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -2222,7 +2222,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param name Cache name. * @return Cache. */ - public <K, V> GridCache<K, V> getCache(@Nullable String name) { + public <K, V> CacheProjection<K, V> getCache(@Nullable String name) { guard(); try { @@ -2468,7 +2468,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K, V> GridCache<K, V> cachex(@Nullable String name) { + @Override public <K, V> CacheProjection<K, V> cachex(@Nullable String name) { guard(); try { @@ -2480,7 +2480,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public <K, V> GridCache<K, V> cachex() { + @Override public <K, V> CacheProjection<K, V> cachex() { guard(); try { @@ -2492,7 +2492,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public Collection<GridCache<?, ?>> cachesx(IgnitePredicate<? super GridCache<?, ?>>[] p) { + @Override public Collection<CacheProjection<?, ?>> cachesx(IgnitePredicate<? super CacheProjection<?, ?>>[] p) { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java index 2ea5317..aae66d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java @@ -512,7 +512,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan @Nullable @Override public <V> V readValueFromOffheapAndSwap(@Nullable String spaceName, Object key, @Nullable ClassLoader ldr) { try { - GridCache<Object, V> cache = ctx.cache().cache(spaceName); + CacheProjection<Object, V> cache = ctx.cache().cache(spaceName); GridCacheContext cctx = ((GridCacheProxyImpl)cache).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 99ca0f4..5fb4367 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 @@ -21,9 +21,11 @@ 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.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.transactions.*; +import org.apache.ignite.mxbean.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; @@ -193,7 +195,7 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * @return Base cache for this projection. */ @SuppressWarnings({"ClassReferencesSubclass"}) - public <K1, V1> GridCache<K1, V1> cache(); + public <K1, V1> CacheProjection<K1, V1> cache(); /** * @return Skip store. @@ -1320,7 +1322,7 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { /** * Gets the number of all entries cached on this node. This method will return the count of - * all cache entries and has O(1) complexity on base {@link GridCache} projection. It is essentially the + * all cache entries and has O(1) complexity on base {@link CacheProjection} projection. It is essentially the * size of cache key set and is semantically identical to {{@code Cache.keySet().size()}. * <p> * NOTE: this operation is not distributed and returns only the number of entries cached on this node. @@ -1383,4 +1385,120 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * @throws IgniteCheckedException If promote failed. */ public void promoteAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException; + + /** + * Gets configuration bean for this cache. + * + * @return Configuration bean for this cache. + */ + public CacheConfiguration configuration(); + + /** + * Gets affinity service to provide information about data partitioning + * and distribution. + * + * @return Cache data affinity service. + */ + public Affinity<K> affinity(); + + /** + * Gets metrics (statistics) for this cache. + * + * @return Cache metrics. + */ + public CacheMetrics metrics(); + + /** + * Gets metrics (statistics) for this cache. + * + * @return Cache metrics. + */ + public CacheMetricsMXBean mxBean(); + + /** + * Gets size (in bytes) of all entries swapped to disk. + * + * @return Size (in bytes) of all entries swapped to disk. + * @throws IgniteCheckedException In case of error. + */ + public long overflowSize() throws IgniteCheckedException; + + /** + * Gets number of cache entries stored in off-heap memory. + * + * @return Number of cache entries stored in off-heap memory. + */ + public long offHeapEntriesCount(); + + /** + * Gets memory size allocated in off-heap. + * + * @return Allocated memory size. + */ + public long offHeapAllocatedSize(); + + /** + * Gets size in bytes for swap space. + * + * @return Size in bytes. + * @throws IgniteCheckedException If failed. + */ + public long swapSize() throws IgniteCheckedException; + + /** + * Gets number of swap entries (keys). + * + * @return Number of entries stored in swap. + * @throws IgniteCheckedException If failed. + */ + public long swapKeys() throws IgniteCheckedException; + + /** + * Gets iterator over keys and values belonging to this cache swap space on local node. This + * iterator is thread-safe, which means that cache (and therefore its swap space) + * may be modified concurrently with iteration over swap. + * <p> + * Returned iterator supports {@code remove} operation which delegates to + * <code>removex(Object, org.apache.ignite.lang.IgnitePredicate[])</code> method. + * + * @return Iterator over keys. + * @throws IgniteCheckedException If failed. + */ + public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException; + + /** + * Gets iterator over keys and values belonging to this cache off-heap memory on local node. This + * iterator is thread-safe, which means that cache (and therefore its off-heap memory) + * may be modified concurrently with iteration over off-heap. To achieve better performance + * the keys and values deserialized on demand, whenever accessed. + * <p> + * Returned iterator supports {@code remove} operation which delegates to + * <code>removex(Object, org.apache.ignite.lang.IgnitePredicate[])}</code> method. + * + * @return Iterator over keys. + * @throws IgniteCheckedException If failed. + */ + public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException; + + /** + * Forces this cache node to re-balance its partitions. This method is usually used when + * {@link CacheConfiguration#getRebalanceDelay()} configuration parameter has non-zero value. + * When many nodes are started or stopped almost concurrently, it is more efficient to delay + * rebalancing until the node topology is stable to make sure that no redundant re-partitioning + * happens. + * <p> + * In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should + * usually make sure that new nodes get placed on the same place of consistent hash ring as + * 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.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 + * rebalance re-partition delay. + * <p> + * @return Future that will be completed when rebalancing is finished. + */ + public IgniteInternalFuture<?> forceRepartition(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 deleted file mode 100644 index f17410d..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java +++ /dev/null @@ -1,176 +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.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.*; -import org.apache.ignite.transactions.*; -import org.jetbrains.annotations.*; - -import javax.cache.*; -import java.util.*; - -/** - * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link org.apache.ignite.Ignite#cache(String)} - * method. - * <h1 class="header">Functionality</h1> - * This API extends {@link CacheProjection} API which contains vast majority of cache functionality - * and documentation. In addition to {@link CacheProjection} functionality this API provides: - * <ul> - * <li> - * Various {@code 'loadCache(..)'} methods to load cache either synchronously or asynchronously. - * These methods don't specify any keys to load, and leave it to the underlying storage to load cache - * data based on the optionally passed in arguments. - * </li> - * <li> - * 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> - * Methods like {@code 'tx{Un}Synchronize(..)'} witch allow to get notifications for transaction state changes. - * This feature is very useful when integrating cache transactions with some other in-house transactions. - * </li> - * <li>Method {@link #metrics()} to provide metrics for the whole cache.</li> - * <li>Method {@link #configuration()} to provide cache configuration bean.</li> - * </ul> - * - * @param <K> Cache key type. - * @param <V> Cache value type. - */ -public interface GridCache<K, V> extends CacheProjection<K, V> { - /** - * Gets configuration bean for this cache. - * - * @return Configuration bean for this cache. - */ - public CacheConfiguration configuration(); - - /** - * Gets affinity service to provide information about data partitioning - * and distribution. - * - * @return Cache data affinity service. - */ - public Affinity<K> affinity(); - - /** - * Gets metrics (statistics) for this cache. - * - * @return Cache metrics. - */ - public CacheMetrics metrics(); - - /** - * Gets metrics (statistics) for this cache. - * - * @return Cache metrics. - */ - public CacheMetricsMXBean mxBean(); - - /** - * Gets size (in bytes) of all entries swapped to disk. - * - * @return Size (in bytes) of all entries swapped to disk. - * @throws IgniteCheckedException In case of error. - */ - public long overflowSize() throws IgniteCheckedException; - - /** - * Gets number of cache entries stored in off-heap memory. - * - * @return Number of cache entries stored in off-heap memory. - */ - public long offHeapEntriesCount(); - - /** - * Gets memory size allocated in off-heap. - * - * @return Allocated memory size. - */ - public long offHeapAllocatedSize(); - - /** - * Gets size in bytes for swap space. - * - * @return Size in bytes. - * @throws IgniteCheckedException If failed. - */ - public long swapSize() throws IgniteCheckedException; - - /** - * Gets number of swap entries (keys). - * - * @return Number of entries stored in swap. - * @throws IgniteCheckedException If failed. - */ - public long swapKeys() throws IgniteCheckedException; - - /** - * Gets iterator over keys and values belonging to this cache swap space on local node. This - * iterator is thread-safe, which means that cache (and therefore its swap space) - * may be modified concurrently with iteration over swap. - * <p> - * Returned iterator supports {@code remove} operation which delegates to - * <code>removex(Object, org.apache.ignite.lang.IgnitePredicate[])</code> method. - * - * @return Iterator over keys. - * @throws IgniteCheckedException If failed. - */ - public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException; - - /** - * Gets iterator over keys and values belonging to this cache off-heap memory on local node. This - * iterator is thread-safe, which means that cache (and therefore its off-heap memory) - * may be modified concurrently with iteration over off-heap. To achieve better performance - * the keys and values deserialized on demand, whenever accessed. - * <p> - * Returned iterator supports {@code remove} operation which delegates to - * <code>removex(Object, org.apache.ignite.lang.IgnitePredicate[])}</code> method. - * - * @return Iterator over keys. - * @throws IgniteCheckedException If failed. - */ - public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException; - - /** - * Forces this cache node to re-balance its partitions. This method is usually used when - * {@link CacheConfiguration#getRebalanceDelay()} configuration parameter has non-zero value. - * When many nodes are started or stopped almost concurrently, it is more efficient to delay - * rebalancing until the node topology is stable to make sure that no redundant re-partitioning - * happens. - * <p> - * In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should - * usually make sure that new nodes get placed on the same place of consistent hash ring as - * 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 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 - * rebalance re-partition delay. - * <p> - * @return Future that will be completed when rebalancing is finished. - */ - public IgniteInternalFuture<?> forceRepartition(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 b83c42f..247dfc4 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 @@ -71,7 +71,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.*; * Adapter for different cache implementations. */ @SuppressWarnings("unchecked") -public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, +public abstract class GridCacheAdapter<K, V> implements CacheProjection<K, V>, GridCacheProjectionEx<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -367,8 +367,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) - @Override public <K1, V1> GridCache<K1, V1> cache() { - return (GridCache<K1, V1>)this; + @Override public <K1, V1> CacheProjection<K1, V1> cache() { + return (CacheProjection<K1, V1>)this; } /** {@inheritDoc} */ @@ -3221,7 +3221,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, // Delegate to near if dht. if (e.isDht() && CU.isNearEnabled(ctx)) { - GridCache<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near(); + CacheProjection<K, V> near = ctx.isDht() ? ctx.dht().near() : ctx.near(); return near.isLockedByThread(key) || e.lockedByThread(); } @@ -5056,7 +5056,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public Integer applyx(Object o) throws IgniteCheckedException { - GridCache<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); + CacheProjection<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); assert cache != null : cacheName; @@ -5129,7 +5129,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public Integer apply(Object o) { - GridCache<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); + CacheProjection<Object, Object> cache = ((IgniteEx)ignite).cachex(cacheName); return primaryOnly ? cache.primarySize() : cache.size(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 1353363..8a51a54 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 @@ -2429,7 +2429,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @param <V> type of values. * @return Default cache. */ - public <K, V> GridCache<K, V> cache() { + public <K, V> CacheProjection<K, V> cache() { return cache(null); } @@ -2440,7 +2440,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public <K, V> GridCache<K, V> cache(@Nullable String name) { + public <K, V> CacheProjection<K, V> cache(@Nullable String name) { if (log.isDebugEnabled()) log.debug("Getting cache for name: " + name); @@ -2452,9 +2452,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** * @return All configured cache instances. */ - public Collection<GridCache<?, ?>> caches() { - return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure<IgniteCacheProxy<?, ?>, GridCache<?, ?>>() { - @Override public GridCache<?, ?> apply(IgniteCacheProxy<?, ?> entries) { + public Collection<CacheProjection<?, ?>> caches() { + return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure<IgniteCacheProxy<?, ?>, CacheProjection<?, ?>>() { + @Override public CacheProjection<?, ?> apply(IgniteCacheProxy<?, ?> entries) { return entries.legacyProxy(); } }); @@ -2488,7 +2488,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * * @return Utility cache for atomic data structures. */ - public <K, V> GridCache<K, V> atomicsCache() { + public <K, V> CacheProjection<K, V> atomicsCache() { return cache(CU.ATOMICS_CACHE_NAME); } @@ -2499,7 +2499,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public <K, V> GridCache<K, V> publicCache(@Nullable String name) { + public <K, V> CacheProjection<K, V> publicCache(@Nullable String name) { if (log.isDebugEnabled()) log.debug("Getting public cache for name: " + name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 e6ed346..6c211b6 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 @@ -43,7 +43,7 @@ import java.util.*; /** * Cache proxy. */ -public class GridCacheProxyImpl<K, V> implements GridCache<K, V>, GridCacheProjectionEx<K, V>, Externalizable { +public class GridCacheProxyImpl<K, V> implements CacheProjection<K, V>, GridCacheProjectionEx<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -126,7 +126,7 @@ public class GridCacheProxyImpl<K, V> implements GridCache<K, V>, GridCacheProje } /** {@inheritDoc} */ - @Override public <K1, V1> GridCache<K1, V1> cache() { + @Override public <K1, V1> CacheProjection<K1, V1> cache() { return cache.cache(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 7ebc9a4..05dcb4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -56,7 +56,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { private final ConcurrentMap<IgniteUuid, GridCacheQueueProxy> queuesMap; /** Queue header view. */ - private GridCache<GridCacheQueueHeaderKey, GridCacheQueueHeader> queueHdrView; + private CacheProjection<GridCacheQueueHeaderKey, GridCacheQueueHeader> queueHdrView; /** Query notifying about queue update. */ private UUID queueQryId; @@ -376,7 +376,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { if (set == null) return; - GridCache cache = cctx.cache(); + CacheProjection cache = cctx.cache(); final int BATCH_SIZE = 100; @@ -503,7 +503,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { * @return Previous value. */ @SuppressWarnings("unchecked") - @Nullable private <T> T retryPutIfAbsent(final GridCache cache, final Object key, final T val) + @Nullable private <T> T retryPutIfAbsent(final CacheProjection cache, final Object key, final T val) throws IgniteCheckedException { return DataStructuresProcessor.retry(log, new Callable<T>() { @Nullable @Override public T call() throws Exception { @@ -518,7 +518,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") - private void retryRemoveAll(final GridCache cache, final Collection<GridCacheSetItemKey> keys) + private void retryRemoveAll(final CacheProjection cache, final Collection<GridCacheSetItemKey> keys) throws IgniteCheckedException { DataStructuresProcessor.retry(log, new Callable<Void>() { @Override public Void call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 4991691..3431ae7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -1916,13 +1916,13 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte final GridKernalContext ctx = ((IgniteKernal) ignite).context(); Collection<String> cacheNames = F.viewReadOnly(ctx.cache().caches(), - new C1<GridCache<?, ?>, String>() { - @Override public String apply(GridCache<?, ?> c) { + new C1<CacheProjection<?, ?>, String>() { + @Override public String apply(CacheProjection<?, ?> c) { return c.name(); } }, - new P1<GridCache<?, ?>>() { - @Override public boolean apply(GridCache<?, ?> c) { + new P1<CacheProjection<?, ?>>() { + @Override public boolean apply(CacheProjection<?, ?> c) { return !CU.MARSH_CACHE_NAME.equals(c.name()) && !CU.UTILITY_CACHE_NAME.equals(c.name()) && !CU.ATOMICS_CACHE_NAME.equals(c.name()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index bdab2bc..726ce99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -103,7 +103,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b byte[] data; try { - GridCache<?, ?> cache = ((IgniteEx) ignite).cachex(cacheName); + CacheProjection<?, ?> cache = ((IgniteEx) ignite).cachex(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java index 7f6bb5b..d7d4d91 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java @@ -39,8 +39,8 @@ public class DataStreamerCacheUpdaters { private static final StreamReceiver BATCHED_SORTED = new BatchedSorted(); /** - * Updates cache using independent {@link org.apache.ignite.internal.processors.cache.GridCache#put(Object, Object, CacheEntryPredicate[])} and - * {@link org.apache.ignite.internal.processors.cache.GridCache#remove(Object, CacheEntryPredicate[])} operations. Thus it is safe from deadlocks but performance + * Updates cache using independent {@link CacheProjection#getAndPut(Object, Object)}and + * {@link CacheProjection#getAndRemove(Object)} operations. Thus it is safe from deadlocks but performance * is not the best. * * @return Single updater. @@ -50,8 +50,8 @@ public class DataStreamerCacheUpdaters { } /** - * Updates cache using batched methods {@link org.apache.ignite.internal.processors.cache.GridCache#putAll(Map, CacheEntryPredicate[])} and - * {@link org.apache.ignite.internal.processors.cache.GridCache#removeAll(Collection, CacheEntryPredicate[])}. Can cause deadlocks if the same keys are getting + * Updates cache using batched methods {@link CacheProjection#putAll(java.util.Map)}and + * {@link CacheProjection#removeAll()}. Can cause deadlocks if the same keys are getting * updated concurrently. Performance is generally better than in {@link #individual()}. * * @return Batched updater. @@ -61,8 +61,8 @@ public class DataStreamerCacheUpdaters { } /** - * Updates cache using batched methods {@link org.apache.ignite.internal.processors.cache.GridCache#putAll(Map, CacheEntryPredicate[])} and - * {@link org.apache.ignite.internal.processors.cache.GridCache#removeAll(Collection, CacheEntryPredicate[])}. Keys are sorted in natural order and if all updates + * Updates cache using batched methods {@link CacheProjection#putAll(Map)} and + * {@link CacheProjection#removeAll(Collection)}. Keys are sorted in natural order and if all updates * use the same rule deadlock can not happen. Performance is generally better than in {@link #individual()}. * * @return Batched sorted updater. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 3e06b5e..38d0e3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -123,7 +123,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { assert utilityCache != null; if (atomicCfg != null) { - GridCache atomicsCache = ctx.cache().atomicsCache(); + CacheProjection atomicsCache = ctx.cache().atomicsCache(); assert atomicsCache != null; @@ -1159,7 +1159,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { * @return Removed value. */ @SuppressWarnings("unchecked") - @Nullable private <T> T retryRemove(final GridCache cache, final Object key) throws IgniteCheckedException { + @Nullable private <T> T retryRemove(final CacheProjection cache, final Object key) throws IgniteCheckedException { return retry(log, new Callable<T>() { @Nullable @Override public T call() throws Exception { return (T)cache.getAndRemove(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 7d7b028..9bcc232 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 @@ -47,7 +47,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite private final GridCacheContext ctx; /** Cache. */ - private final GridCache<GridCacheSetItemKey, Boolean> cache; + private final CacheProjection<GridCacheSetItemKey, Boolean> cache; /** Logger. */ private final IgniteLogger log; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 29680b4..006fc4b 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 @@ -68,7 +68,7 @@ public class IgfsDataManager extends IgfsManager { private GridCacheProjectionEx<IgfsBlockKey, byte[]> dataCachePrj; /** Data cache. */ - private GridCache<Object, Object> dataCache; + private CacheProjection<Object, Object> dataCache; /** */ private CountDownLatch dataCacheStartLatch; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java index 2443c6e..82b5fd8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java @@ -55,7 +55,7 @@ public class IgfsMetaManager extends IgfsManager { private FileSystemConfiguration cfg; /** Metadata cache. */ - private GridCache<Object, Object> metaCache; + private CacheProjection<Object, Object> metaCache; /** */ private CountDownLatch metaCacheStartLatch; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index 877f096..ee49eb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -539,7 +539,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * @throws IgniteCheckedException If cache not found. */ private static GridCacheProjectionEx<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException { - GridCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); + CacheProjection<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); if (cache == null) throw new IgniteCheckedException( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index d537e08..97f752d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -83,7 +83,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { private final GridSpinReadWriteLock lock = new GridSpinReadWriteLock(); /** Internal metadata cache. */ - private volatile GridCache<GridTaskNameHashKey, String> tasksMetaCache; + private volatile CacheProjection<GridTaskNameHashKey, String> tasksMetaCache; /** */ private final CountDownLatch startLatch = new CountDownLatch(1); @@ -198,7 +198,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { /** * @return Task metadata cache. */ - private GridCache<GridTaskNameHashKey, String> taskMetaCache() { + private CacheProjection<GridTaskNameHashKey, String> taskMetaCache() { assert ctx.security().enabled(); if (tasksMetaCache == null) @@ -708,7 +708,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { GridTaskNameHashKey key = new GridTaskNameHashKey(nameHash); - GridCache<GridTaskNameHashKey, String> tasksMetaCache = taskMetaCache(); + CacheProjection<GridTaskNameHashKey, String> tasksMetaCache = taskMetaCache(); String existingName = tasksMetaCache.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java index 9d98eae..eb73813 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java @@ -58,7 +58,7 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq /** {@inheritDoc} */ @Override protected GridCacheSqlMetadata run(String cacheName) { try { - GridCache<Object, Object> cache = ignite.cachex(cacheName); + CacheProjection<Object, Object> cache = ignite.cachex(cacheName); if (cache != null) { CacheQueries<Object, Object> queries = cache.queries(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java index b0a1eb2..c73a77c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java @@ -176,7 +176,7 @@ public class VisorCacheMetrics implements Serializable { * @param c Cache. * @return Data transfer object for given cache metrics. */ - public static VisorCacheMetrics from(IgniteEx ignite, GridCache c) { + public static VisorCacheMetrics from(IgniteEx ignite, CacheProjection c) { VisorCacheMetrics cm = new VisorCacheMetrics(); CacheMetrics m = c.metrics(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java index b1ef0c3..32384b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java @@ -59,7 +59,7 @@ public class VisorCacheRebalanceTask extends VisorOneNodeTask<Set<String>, Void> try { Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(); - for (GridCache c : ignite.cachesx()) { + for (CacheProjection c : ignite.cachesx()) { if (cacheNames.contains(c.name())) futs.add(c.forceRepartition()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java index 9371119..c4a46d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheResetMetricsTask.java @@ -52,7 +52,7 @@ public class VisorCacheResetMetricsTask extends VisorOneNodeTask<String, Void> { /** {@inheritDoc} */ @Override protected Void run(String cacheName) { - GridCache cache = ignite.cachex(cacheName); + CacheProjection cache = ignite.cachex(cacheName); if (cache != null) cache.mxBean().clear(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/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 57b85b9..782e2a9 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 @@ -71,7 +71,7 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map Map<String, IgniteBiTuple<Integer, Integer>> total = new HashMap<>(); ClusterNode locNode = g.localNode(); - for (GridCache c : ignite.cachesx()) { + for (CacheProjection c : ignite.cachesx()) { String cacheName = c.name(); Affinity<Object> aff = g.affinity(c.name()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java index 7d85bbd..4c0ed48 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java @@ -248,7 +248,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> if (!cache.context().userCache()) continue; - GridCache<Object, Object> cache0 = cache.context().cache(); + CacheProjection<Object, Object> cache0 = cache.context().cache(); for (String warmupMethod : warmupMethods) { Collection<Future> futs = new ArrayList<>(threadCnt); @@ -410,12 +410,12 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> */ private abstract class BaseWarmupCallable implements Callable<Object> { /** Cache. */ - protected final GridCache<Object, Object> cache; + protected final CacheProjection<Object, Object> cache; /** * @param cache Cache. */ - protected BaseWarmupCallable(GridCache<Object, Object> cache) { + protected BaseWarmupCallable(CacheProjection<Object, Object> cache) { this.cache = cache; } @@ -445,7 +445,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private GetCallable(GridCache<Object, Object> cache) { + private GetCallable(CacheProjection<Object, Object> cache) { super(cache); } @@ -462,7 +462,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private PutCallable(GridCache<Object, Object> cache) { + private PutCallable(CacheProjection<Object, Object> cache) { super(cache); } @@ -479,7 +479,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private PutxCallable(GridCache<Object, Object> cache) { + private PutxCallable(CacheProjection<Object, Object> cache) { super(cache); } @@ -496,7 +496,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private RemoveCallable(GridCache<Object, Object> cache) { + private RemoveCallable(CacheProjection<Object, Object> cache) { super(cache); } @@ -513,7 +513,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private RemovexCallable(GridCache<Object, Object> cache) { + private RemovexCallable(CacheProjection<Object, Object> cache) { super(cache); } @@ -530,7 +530,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private PutIfAbsentCallable(GridCache<Object, Object> cache) { + private PutIfAbsentCallable(CacheProjection<Object, Object> cache) { super(cache); } @@ -547,7 +547,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private ReplaceCallable(GridCache<Object, Object> cache) { + private ReplaceCallable(CacheProjection<Object, Object> cache) { super(cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 79339cd..8a1ae78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -675,7 +675,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { * @param terminalId Terminal ID. */ private void put(Object o, String cacheKey, String terminalId) { -// GridCache<AffinityKey<String>, Object> cache = ((IgniteKernal)ignite).cache(null); +// CacheProjection<AffinityKey<String>, Object> cache = ((IgniteKernal)ignite).cache(null); // // AffinityKey<String> affinityKey = new AffinityKey<>(cacheKey, terminalId); // http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java index 2d391c8..6933d3a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java @@ -161,7 +161,7 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest { * @return Running thread. */ @SuppressWarnings("TypeMayBeWeakened") - private Thread runCacheOperations(final GridCache<Object,Object> cache, final int keys) { + private Thread runCacheOperations(final CacheProjection<Object,Object> cache, final int keys) { Thread t = new Thread() { @Override public void run() { while (run) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java index 0828d0b..ca5ea94 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java @@ -951,18 +951,18 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes } /** {@inheritDoc} */ - @Nullable @Override public <K, V> GridCache<K, V> cachex(@Nullable String name) { + @Nullable @Override public <K, V> CacheProjection<K, V> cachex(@Nullable String name) { return null; } /** {@inheritDoc} */ - @Nullable @Override public <K, V> GridCache<K, V> cachex() { + @Nullable @Override public <K, V> CacheProjection<K, V> cachex() { return null; } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public Collection<GridCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super GridCache<?, ?>>... p) { + @Override public Collection<CacheProjection<?, ?>> cachesx(@Nullable IgnitePredicate<? super CacheProjection<?, ?>>... p) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java index 28af870..39294bc 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateAccessStrategyAdapter.java @@ -83,7 +83,7 @@ import java.io.*; */ public abstract class HibernateAccessStrategyAdapter { /** */ - protected final GridCache<Object, Object> cache; + protected final CacheProjection<Object, Object> cache; /** Grid. */ protected final Ignite ignite; @@ -95,7 +95,7 @@ public abstract class HibernateAccessStrategyAdapter { * @param ignite Grid. * @param cache Cache. */ - protected HibernateAccessStrategyAdapter(Ignite ignite, GridCache<Object, Object> cache) { + protected HibernateAccessStrategyAdapter(Ignite ignite, CacheProjection<Object, Object> cache) { this.cache = cache; this.ignite = ignite; @@ -342,7 +342,7 @@ public abstract class HibernateAccessStrategyAdapter { /** {@inheritDoc} */ @Override public Void call() throws IgniteCheckedException { - GridCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); + CacheProjection<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java index 0a781fa..48266d8 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java @@ -70,7 +70,7 @@ public class HibernateCollectionRegion extends HibernateTransactionalDataRegion * @param dataDesc Region data description. */ public HibernateCollectionRegion(HibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, CacheProjection<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java index 2853370..ff8f4fc 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java @@ -59,7 +59,7 @@ public class HibernateEntityRegion extends HibernateTransactionalDataRegion impl * @param dataDesc Region data description. */ public HibernateEntityRegion(HibernateRegionFactory factory, String name, Ignite ignite, - GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + CacheProjection<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java index 782dc0d..9abea00 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java @@ -35,7 +35,7 @@ public class HibernateGeneralDataRegion extends HibernateRegion implements Gener * @param cache Region cache. */ public HibernateGeneralDataRegion(HibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache) { + Ignite ignite, CacheProjection<Object, Object> cache) { super(factory, name, ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java index 274d330..a385992 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java @@ -49,7 +49,7 @@ public class HibernateNaturalIdRegion extends HibernateTransactionalDataRegion i * @param dataDesc Region data description. */ public HibernateNaturalIdRegion(HibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, CacheProjection<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNonStrictAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNonStrictAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNonStrictAccessStrategy.java index d00f818..b4d0639 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNonStrictAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateNonStrictAccessStrategy.java @@ -64,7 +64,7 @@ public class HibernateNonStrictAccessStrategy extends HibernateAccessStrategyAda * @param cache Cache. * @param writeCtx Thread local instance used to track updates done during one Hibernate transaction. */ - protected HibernateNonStrictAccessStrategy(Ignite ignite, GridCache<Object, Object> cache, ThreadLocal writeCtx) { + protected HibernateNonStrictAccessStrategy(Ignite ignite, CacheProjection<Object, Object> cache, ThreadLocal writeCtx) { super(ignite, cache); this.writeCtx = (ThreadLocal<WriteContext>)writeCtx; @@ -209,7 +209,7 @@ public class HibernateNonStrictAccessStrategy extends HibernateAccessStrategyAda * @param cache Cache. * @throws IgniteCheckedException If failed. */ - void updateCache(GridCache<Object, Object> cache) throws IgniteCheckedException { + void updateCache(CacheProjection<Object, Object> cache) throws IgniteCheckedException { if (!F.isEmpty(rmvs)) cache.removeAll(rmvs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java index e443ee2..aa11704 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java @@ -65,7 +65,7 @@ public class HibernateQueryResultsRegion extends HibernateGeneralDataRegion impl * @param cache Region cache. */ public HibernateQueryResultsRegion(HibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache) { + Ignite ignite, CacheProjection<Object, Object> cache) { super(factory, name, ignite, cache); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadOnlyAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadOnlyAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadOnlyAccessStrategy.java index 10d5f91..d5a75b6 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadOnlyAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadOnlyAccessStrategy.java @@ -58,7 +58,7 @@ public class HibernateReadOnlyAccessStrategy extends HibernateAccessStrategyAdap * @param ignite Grid. * @param cache Cache. */ - public HibernateReadOnlyAccessStrategy(Ignite ignite, GridCache<Object, Object> cache) { + public HibernateReadOnlyAccessStrategy(Ignite ignite, CacheProjection<Object, Object> cache) { super(ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java index dd5ce68..cf45782 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java @@ -66,7 +66,7 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda * @param cache Cache. * @param txCtx Thread local instance used to track updates done during one Hibernate transaction. */ - protected HibernateReadWriteAccessStrategy(Ignite ignite, GridCache<Object, Object> cache, ThreadLocal txCtx) { + protected HibernateReadWriteAccessStrategy(Ignite ignite, CacheProjection<Object, Object> cache, ThreadLocal txCtx) { super(ignite, cache); this.txCtx = (ThreadLocal<TxContext>)txCtx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java index 3bcaaa3..ff6514c 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java @@ -35,7 +35,7 @@ public class HibernateRegion implements Region { private final String name; /** Cache instance. */ - protected final GridCache<Object, Object> cache; + protected final CacheProjection<Object, Object> cache; /** Grid instance. */ protected Ignite ignite; @@ -47,7 +47,7 @@ public class HibernateRegion implements Region { * @param cache Region cache. */ public HibernateRegion(HibernateRegionFactory factory, String name, Ignite ignite, - GridCache<Object, Object> cache) { + CacheProjection<Object, Object> cache) { this.factory = factory; this.name = name; this.ignite = ignite; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java index a58f30a..f3b1a6f 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java @@ -47,8 +47,8 @@ import static org.hibernate.cache.spi.access.AccessType.*; * <pre name="code" class="brush: xml; gutter: false;"> * org.apache.ignite.hibernate.grid_name=<grid name> * </pre> - * Each Hibernate cache region must be associated with some {@link org.apache.ignite.internal.processors.cache.GridCache}, by default it is assumed that - * for each cache region there is a {@link org.apache.ignite.internal.processors.cache.GridCache} with the same name. Also it is possible to define + * Each Hibernate cache region must be associated with some {@link CacheProjection}, by default it is assumed that + * for each cache region there is a {@link CacheProjection} with the same name. Also it is possible to define * region to cache mapping using properties with prefix {@code org.apache.ignite.hibernate.region_cache}. * For example if for region with name "region1" cache with name "cache1" should be used then following * Hibernate property should be specified: @@ -79,7 +79,7 @@ public class HibernateRegionFactory implements RegionFactory { private Ignite ignite; /** Default cache. */ - private GridCache<Object, Object> dfltCache; + private CacheProjection<Object, Object> dfltCache; /** Default region access type. */ private AccessType dfltAccessType; @@ -204,7 +204,7 @@ public class HibernateRegionFactory implements RegionFactory { * @return Cache for given region. * @throws CacheException If cache for given region is not configured. */ - private GridCache<Object, Object> regionCache(String regionName) throws CacheException { + private CacheProjection<Object, Object> regionCache(String regionName) throws CacheException { String cacheName = regionCaches.get(regionName); if (cacheName == null) { @@ -214,7 +214,7 @@ public class HibernateRegionFactory implements RegionFactory { cacheName = regionName; } - GridCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); + CacheProjection<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); if (cache == null) throw new CacheException("Cache '" + cacheName + "' for region '" + regionName + "' is not configured."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java index 0015d4a..8faeb08 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java @@ -34,7 +34,7 @@ public class HibernateTimestampsRegion extends HibernateGeneralDataRegion implem * @param cache Region cache. */ public HibernateTimestampsRegion(HibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache) { + Ignite ignite, CacheProjection<Object, Object> cache) { super(factory, name, ignite, cache); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java index 6f6200b..ef9b303 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.*; * Implementation of {@link AccessType#TRANSACTIONAL} cache access strategy. * <p> * It is supposed that this strategy is used in JTA environment and Hibernate and - * {@link org.apache.ignite.internal.processors.cache.GridCache} corresponding to the L2 cache region are configured to use the same transaction manager. + * {@link CacheProjection} corresponding to the L2 cache region are configured to use the same transaction manager. * <p> * Configuration of L2 cache and per-entity cache access strategy can be set in the * Hibernate configuration file: @@ -59,7 +59,7 @@ public class HibernateTransactionalAccessStrategy extends HibernateAccessStrateg * @param ignite Grid. * @param cache Cache. */ - public HibernateTransactionalAccessStrategy(Ignite ignite, GridCache<Object, Object> cache) { + public HibernateTransactionalAccessStrategy(Ignite ignite, CacheProjection<Object, Object> cache) { super(ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java index 294ba18..578d894 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java @@ -43,7 +43,7 @@ public class HibernateTransactionalDataRegion extends HibernateRegion implements * @param dataDesc Region data description. */ public HibernateTransactionalDataRegion(HibernateRegionFactory factory, String name, - Ignite ignite, GridCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, CacheProjection<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache); this.dataDesc = dataDesc; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 7ec1dbe..6dfa50f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -1927,7 +1927,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public Object readFromSwap(Object key) throws IgniteCheckedException { - GridCache<Object, ?> cache = ctx.cache().cache(schema.spaceName); + CacheProjection<Object, ?> cache = ctx.cache().cache(schema.spaceName); GridCacheContext cctx = ((GridCacheProxyImpl)cache).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java index 7b3d202..3ecf904 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteCacheAbstractBenchmark.java @@ -38,7 +38,7 @@ public abstract class IgniteCacheAbstractBenchmark extends IgniteAbstractBenchma /** * Each benchmark must determine which cache will be used. * - * @return GridCache Cache to use. + * @return IgniteCache Cache to use. */ protected abstract IgniteCache<Integer, Object> cache(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01e2b6c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java index 77a4747..cd1f6aa 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java @@ -36,14 +36,12 @@ public abstract class IgniteJdbcStoreAbstractBenchmark extends IgniteAbstractBen /** * Each benchmark must determine which cache will be used. * - * @return GridCache Cache to use. + * @return IgniteCache Cache to use. */ protected abstract IgniteCache<Object, Object> cache(); /** * Each benchmark must determine key range (from {@code 0} to this number) for fill. - * - * @return GridCache Cache to use. */ protected abstract int fillRange();
