Repository: incubator-ignite Updated Branches: refs/heads/ignite-446 0e86840b8 -> 315e84411
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 9ef408c..fa8d192 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 InternalCache<GridCacheQueueHeaderKey, GridCacheQueueHeader> queueHdrView; + private IgniteInternalCache<GridCacheQueueHeaderKey, GridCacheQueueHeader> queueHdrView; /** Query notifying about queue update. */ private UUID queueQryId; @@ -376,7 +376,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { if (set == null) return; - InternalCache cache = cctx.cache(); + IgniteInternalCache 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 InternalCache cache, final Object key, final T val) + @Nullable private <T> T retryPutIfAbsent(final IgniteInternalCache 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 InternalCache cache, final Collection<GridCacheSetItemKey> keys) + private void retryRemoveAll(final IgniteInternalCache 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/228736f5/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 3e1ce92..9e42eef 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 @@ -759,12 +759,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte @SuppressWarnings({"unchecked"}) private GridCloseableIterator<IgniteBiTuple<K, V>> scanIterator(final GridCacheQueryAdapter<?> qry) throws IgniteCheckedException { - InternalCache<K, V> prj0 = cctx.cache(); + IgniteInternalCache<K, V> prj0 = cctx.cache(); if (qry.keepPortable()) prj0 = prj0.keepPortable(); - final InternalCache<K, V> prj = prj0; + final IgniteInternalCache<K, V> prj = prj0; final IgniteBiPredicate<K, V> keyValFilter = qry.scanFilter(); @@ -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<InternalCache<?, ?>, String>() { - @Override public String apply(InternalCache<?, ?> c) { + new C1<IgniteInternalCache<?, ?>, String>() { + @Override public String apply(IgniteInternalCache<?, ?> c) { return c.name(); } }, - new P1<InternalCache<?, ?>>() { - @Override public boolean apply(InternalCache<?, ?> c) { + new P1<IgniteInternalCache<?, ?>>() { + @Override public boolean apply(IgniteInternalCache<?, ?> 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/228736f5/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 e15dfc4..e0bda1d 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 { - InternalCache<?, ?> cache = ((IgniteEx) ignite).cachex(cacheName); + IgniteInternalCache<?, ?> cache = ((IgniteEx) ignite).cachex(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 f5cfa24..72911af 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 @@ -67,25 +67,25 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { private static final long RETRY_DELAY = 1; /** Cache contains only {@code GridCacheInternal,GridCacheInternal}. */ - private InternalCache<GridCacheInternal, GridCacheInternal> dsView; + private IgniteInternalCache<GridCacheInternal, GridCacheInternal> dsView; /** Internal storage of all dataStructures items (sequence, atomic long etc.). */ private final ConcurrentMap<GridCacheInternal, GridCacheRemovable> dsMap; /** Cache contains only {@code GridCacheAtomicValue}. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicLongValue> atomicLongView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicLongValue> atomicLongView; /** Cache contains only {@code GridCacheCountDownLatchValue}. */ - private InternalCache<GridCacheInternalKey, GridCacheCountDownLatchValue> cntDownLatchView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheCountDownLatchValue> cntDownLatchView; /** Cache contains only {@code GridCacheAtomicReferenceValue}. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicReferenceValue> atomicRefView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicReferenceValue> atomicRefView; /** Cache contains only {@code GridCacheAtomicStampedValue}. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicStampedValue> atomicStampedView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicStampedValue> atomicStampedView; /** Cache contains only entry {@code GridCacheSequenceValue}. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView; /** Cache context for atomic data structures. */ private GridCacheContext dsCacheCtx; @@ -94,10 +94,10 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { private final AtomicConfiguration atomicCfg; /** */ - private InternalCache<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache; + private IgniteInternalCache<CacheDataStructuresConfigurationKey, Map<String, DataStructureInfo>> utilityCache; /** */ - private InternalCache<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache; + private IgniteInternalCache<CacheDataStructuresCacheKey, List<CacheCollectionInfo>> utilityDataCache; /** * @param ctx Context. @@ -116,14 +116,14 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { if (ctx.config().isDaemon()) return; - utilityCache = (InternalCache)ctx.cache().utilityCache(); + utilityCache = (IgniteInternalCache)ctx.cache().utilityCache(); - utilityDataCache = (InternalCache)ctx.cache().utilityCache(); + utilityDataCache = (IgniteInternalCache)ctx.cache().utilityCache(); assert utilityCache != null; if (atomicCfg != null) { - InternalCache atomicsCache = ctx.cache().atomicsCache(); + IgniteInternalCache 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 InternalCache cache, final Object key) throws IgniteCheckedException { + @Nullable private <T> T retryRemove(final IgniteInternalCache 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/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java index 9a9ba90..b18d35a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java @@ -60,7 +60,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext private GridCacheInternalKey key; /** Atomic long projection. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView; /** Cache context. */ private GridCacheContext ctx; @@ -201,7 +201,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext * @param ctx CacheContext. */ public GridCacheAtomicLongImpl(String name, GridCacheInternalKey key, - InternalCache<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView, GridCacheContext ctx) { + IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicLongValue> atomicView, GridCacheContext ctx) { assert key != null; assert atomicView != null; assert ctx != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java index 0b025e31..0c4e5e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java @@ -60,7 +60,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef private GridCacheInternalKey key; /** Atomic reference projection. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView; /** Cache context. */ private GridCacheContext ctx; @@ -94,7 +94,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef */ public GridCacheAtomicReferenceImpl(String name, GridCacheInternalKey key, - InternalCache<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView, + IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicReferenceValue<T>> atomicView, GridCacheContext ctx) { assert key != null; assert atomicView != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java index 8b6c6b5..e66c11e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java @@ -64,7 +64,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc private GridCacheInternalKey key; /** Sequence projection. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView; /** Cache context. */ private volatile GridCacheContext ctx; @@ -113,7 +113,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc */ public GridCacheAtomicSequenceImpl(String name, GridCacheInternalKey key, - InternalCache<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView, + IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicSequenceValue> seqView, GridCacheContext ctx, int batchSize, long locVal, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java index 702ff68..a3c4041 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java @@ -62,7 +62,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt private GridCacheInternalKey key; /** Atomic stamped projection. */ - private InternalCache<GridCacheInternalKey, GridCacheAtomicStampedValue<T, S>> atomicView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheAtomicStampedValue<T, S>> atomicView; /** Cache context. */ private GridCacheContext ctx; @@ -118,8 +118,8 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt * @param atomicView Atomic projection. * @param ctx Cache context. */ - public GridCacheAtomicStampedImpl(String name, GridCacheInternalKey key, InternalCache<GridCacheInternalKey, - GridCacheAtomicStampedValue<T, S>> atomicView, GridCacheContext ctx) { + public GridCacheAtomicStampedImpl(String name, GridCacheInternalKey key, IgniteInternalCache<GridCacheInternalKey, + GridCacheAtomicStampedValue<T, S>> atomicView, GridCacheContext ctx) { assert key != null; assert atomicView != null; assert ctx != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java index f93c07f..33547d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java @@ -61,7 +61,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc private GridCacheInternalKey key; /** Latch projection. */ - private InternalCache<GridCacheInternalKey, GridCacheCountDownLatchValue> latchView; + private IgniteInternalCache<GridCacheInternalKey, GridCacheCountDownLatchValue> latchView; /** Cache context. */ private GridCacheContext ctx; @@ -107,7 +107,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc int initCnt, boolean autoDel, GridCacheInternalKey key, - InternalCache<GridCacheInternalKey, GridCacheCountDownLatchValue> latchView, + IgniteInternalCache<GridCacheInternalKey, GridCacheCountDownLatchValue> latchView, GridCacheContext ctx) { assert name != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 5f64c26..f516968 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 InternalCache<GridCacheSetItemKey, Boolean> cache; + private final IgniteInternalCache<GridCacheSetItemKey, Boolean> cache; /** Logger. */ private final IgniteLogger log; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 38fcc5f..2cf25e7 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 @@ -65,10 +65,10 @@ public class IgfsDataManager extends IgfsManager { private IgfsEx igfs; /** Data cache projection. */ - private InternalCache<IgfsBlockKey, byte[]> dataCachePrj; + private IgniteInternalCache<IgfsBlockKey, byte[]> dataCachePrj; /** Data cache. */ - private InternalCache<Object, Object> dataCache; + private IgniteInternalCache<Object, Object> dataCache; /** */ private CountDownLatch dataCacheStartLatch; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 1e2f116..35ca8bb 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,13 +55,13 @@ public class IgfsMetaManager extends IgfsManager { private FileSystemConfiguration cfg; /** Metadata cache. */ - private InternalCache<Object, Object> metaCache; + private IgniteInternalCache<Object, Object> metaCache; /** */ private CountDownLatch metaCacheStartLatch; /** File ID to file info projection. */ - private InternalCache<IgniteUuid, IgfsFileInfo> id2InfoPrj; + private IgniteInternalCache<IgniteUuid, IgfsFileInfo> id2InfoPrj; /** Predefined key for sampling mode value. */ private GridCacheInternal sampling; @@ -119,7 +119,7 @@ public class IgfsMetaManager extends IgfsManager { } }); - id2InfoPrj = (InternalCache<IgniteUuid, IgfsFileInfo>)metaCache.<IgniteUuid, IgfsFileInfo>cache(); + id2InfoPrj = (IgniteInternalCache<IgniteUuid, IgfsFileInfo>)metaCache.<IgniteUuid, IgfsFileInfo>cache(); locNode = igfsCtx.kernalContext().discovery().localNode(); @@ -2564,7 +2564,7 @@ public class IgfsMetaManager extends IgfsManager { * @return {@code True} if value was stored in cache, {@code false} otherwise. * @throws IgniteCheckedException If operation failed. */ - private <K, V> boolean putx(InternalCache<K, V> cache, K key, IgniteClosure<V, V> c) throws IgniteCheckedException { + private <K, V> boolean putx(IgniteInternalCache<K, V> cache, K key, IgniteClosure<V, V> c) throws IgniteCheckedException { assert validTxState(true); V oldVal = cache.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 6b82b24..c28c876 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 @@ -322,10 +322,10 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { destId == null || destId.equals(ctx.localNodeId()) || replicatedCacheAvailable(cacheName); if (locExec) { - InternalCache<?,?> prj = localCache(cacheName).forSubjectId(clientId).setSkipStore(skipStore); + IgniteInternalCache<?,?> prj = localCache(cacheName).forSubjectId(clientId).setSkipStore(skipStore); - return op.apply((InternalCache<Object, Object>)prj, ctx). - chain(resultWrapper((InternalCache<Object, Object>)prj, key)); + return op.apply((IgniteInternalCache<Object, Object>)prj, ctx). + chain(resultWrapper((IgniteInternalCache<Object, Object>)prj, key)); } else { ClusterGroup prj = ctx.grid().cluster().forPredicate(F.nodeForNodeId(destId)); @@ -361,7 +361,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { ctx.cache().cache(cacheName) != null; if (locExec) { - final InternalCache<Object, Object> cache = localCache(cacheName).forSubjectId(clientId); + final IgniteInternalCache<Object, Object> cache = localCache(cacheName).forSubjectId(clientId); return op.apply(cache, ctx).chain(resultWrapper(cache, key)); } @@ -389,7 +389,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { */ private static IgniteInternalFuture<?> appendOrPrepend( final GridKernalContext ctx, - final InternalCache<Object, Object> cache, + final IgniteInternalCache<Object, Object> cache, final Object key, GridRestCacheRequest req, final boolean prepend) throws IgniteCheckedException { assert cache != null; assert key != null; @@ -492,7 +492,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * @return Rest response. */ private static IgniteClosure<IgniteInternalFuture<?>, GridRestResponse> resultWrapper( - final InternalCache<Object, Object> c, @Nullable final Object key) { + final IgniteInternalCache<Object, Object> c, @Nullable final Object key) { return new CX1<IgniteInternalFuture<?>, GridRestResponse>() { @Override public GridRestResponse applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException { GridCacheRestResponse resp = new GridCacheRestResponse(); @@ -522,8 +522,8 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * @return Instance on the named cache. * @throws IgniteCheckedException If cache not found. */ - protected InternalCache<Object, Object> localCache(String cacheName) throws IgniteCheckedException { - InternalCache<Object, Object> cache = (InternalCache<Object, Object>)ctx.cache().cache(cacheName); + protected IgniteInternalCache<Object, Object> localCache(String cacheName) throws IgniteCheckedException { + IgniteInternalCache<Object, Object> cache = (IgniteInternalCache<Object, Object>)ctx.cache().cache(cacheName); if (cache == null) throw new IgniteCheckedException( @@ -538,14 +538,14 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * @return Instance on the named cache. * @throws IgniteCheckedException If cache not found. */ - private static InternalCache<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException { - InternalCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); + private static IgniteInternalCache<Object, Object> cache(Ignite ignite, String cacheName) throws IgniteCheckedException { + IgniteInternalCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); if (cache == null) throw new IgniteCheckedException( "Failed to find cache for given cache name (null for default cache): " + cacheName); - return (InternalCache<Object, Object>)cache; + return (IgniteInternalCache<Object, Object>)cache; } /** @@ -577,7 +577,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * Type alias. */ private abstract static class CacheCommand - extends IgniteClosure2X<InternalCache<Object, Object>, GridKernalContext, IgniteInternalFuture<?>> { + extends IgniteClosure2X<IgniteInternalCache<Object, Object>, GridKernalContext, IgniteInternalFuture<?>> { /** */ private static final long serialVersionUID = 0L; @@ -588,7 +588,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { * Type alias. */ private abstract static class CacheProjectionCommand - extends IgniteClosure2X<InternalCache<Object, Object>, GridKernalContext, IgniteInternalFuture<?>> { + extends IgniteClosure2X<IgniteInternalCache<Object, Object>, GridKernalContext, IgniteInternalFuture<?>> { /** */ private static final long serialVersionUID = 0L; @@ -643,13 +643,13 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { /** {@inheritDoc} */ @Override public GridRestResponse call() throws Exception { - InternalCache<?, ?> prj = cache(g, cacheName).forSubjectId(clientId).setSkipStore(skipStore); + IgniteInternalCache<?, ?> prj = cache(g, cacheName).forSubjectId(clientId).setSkipStore(skipStore); // Need to apply both operation and response transformation remotely // as cache could be inaccessible on local node and // exception processing should be consistent with local execution. - return op.apply((InternalCache<Object, Object>)prj, ((IgniteKernal)g).context()). - chain(resultWrapper((InternalCache<Object, Object>)prj, key)).get(); + return op.apply((IgniteInternalCache<Object, Object>)prj, ((IgniteKernal)g).context()). + chain(resultWrapper((IgniteInternalCache<Object, Object>)prj, key)).get(); } } @@ -692,7 +692,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { /** {@inheritDoc} */ @Override public GridRestResponse call() throws Exception { - final InternalCache<Object, Object> cache = cache(g, cacheName).forSubjectId(clientId); + final IgniteInternalCache<Object, Object> cache = cache(g, cacheName).forSubjectId(clientId); // Need to apply both operation and response transformation remotely // as cache could be inaccessible on local node and @@ -717,7 +717,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { return c.getAsync(key); } } @@ -738,7 +738,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { return c.getAllAsync(keys); } } @@ -759,7 +759,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { return c.putAllAsync(map).chain(new FixedResult(true)); } } @@ -780,7 +780,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { return c.removeAsync(key); } } @@ -801,7 +801,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { return (F.isEmpty(keys) ? c.removeAllAsync() : c.removeAllAsync(keys)) .chain(new FixedResult(true)); } @@ -833,7 +833,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { return exp == null && val == null ? c.removeAsync(key) : exp == null ? c.putIfAbsentAsync(key, val) : val == null ? c.removeAsync(key, exp) : @@ -867,11 +867,11 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { if (ttl != null && ttl > 0) { Duration duration = new Duration(MILLISECONDS, ttl); - c = ((InternalCache<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration)); + c = ((IgniteInternalCache<Object, Object>)c).withExpiryPolicy(new ModifiedExpiryPolicy(duration)); } return c.putAsync(key, val); @@ -904,7 +904,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { if (ttl != null && ttl > 0) { Duration duration = new Duration(MILLISECONDS, ttl); @@ -941,7 +941,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { if (ttl != null && ttl > 0) { Duration duration = new Duration(MILLISECONDS, ttl); @@ -973,7 +973,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) throws IgniteCheckedException { return appendOrPrepend(ctx, c, key, req, false); } @@ -1000,7 +1000,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) throws IgniteCheckedException { return appendOrPrepend(ctx, c, key, req, true); } @@ -1012,7 +1012,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> applyx(InternalCache<Object, Object> c, GridKernalContext ctx) { + @Override public IgniteInternalFuture<?> applyx(IgniteInternalCache<Object, Object> c, GridKernalContext ctx) { CacheMetrics metrics = c.cache().metrics(); assert metrics != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 08f86cc..f57a627 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -81,7 +81,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { private ThreadLocal<String> svcName = new ThreadLocal<>(); /** Service cache. */ - private InternalCache<Object, Object> cache; + private IgniteInternalCache<Object, Object> cache; /** Topology listener. */ private GridLocalEventListener topLsnr = new TopologyListener(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 5f99f7d..88713a1 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 InternalCache<GridTaskNameHashKey, String> tasksMetaCache; + private volatile IgniteInternalCache<GridTaskNameHashKey, String> tasksMetaCache; /** */ private final CountDownLatch startLatch = new CountDownLatch(1); @@ -198,7 +198,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { /** * @return Task metadata cache. */ - private InternalCache<GridTaskNameHashKey, String> taskMetaCache() { + private IgniteInternalCache<GridTaskNameHashKey, String> taskMetaCache() { assert ctx.security().enabled(); if (tasksMetaCache == null) @@ -708,7 +708,7 @@ public class GridTaskProcessor extends GridProcessorAdapter { GridTaskNameHashKey key = new GridTaskNameHashKey(nameHash); - InternalCache<GridTaskNameHashKey, String> tasksMetaCache = taskMetaCache(); + IgniteInternalCache<GridTaskNameHashKey, String> tasksMetaCache = taskMetaCache(); String existingName = tasksMetaCache.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 8d266e8..c58a0d5 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 { - InternalCache<Object, Object> cache = ignite.cachex(cacheName); + IgniteInternalCache<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/228736f5/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 c29004c..c7b92dc 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, InternalCache c) { + public static VisorCacheMetrics from(IgniteEx ignite, IgniteInternalCache c) { VisorCacheMetrics cm = new VisorCacheMetrics(); CacheMetrics m = c.metrics(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 6949666..61b37fc 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 (InternalCache c : ignite.cachesx()) { + for (IgniteInternalCache c : ignite.cachesx()) { if (cacheNames.contains(c.name())) futs.add(c.forceRepartition()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 0036d1e..aca7b41 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) { - InternalCache cache = ignite.cachex(cacheName); + IgniteInternalCache cache = ignite.cachex(cacheName); if (cache != null) cache.mxBean().clear(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 86c329e..e05accc 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 (InternalCache c : ignite.cachesx()) { + for (IgniteInternalCache 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/228736f5/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 4a52721..2418c71 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; - InternalCache<Object, Object> cache0 = cache.context().cache(); + IgniteInternalCache<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 InternalCache<Object, Object> cache; + protected final IgniteInternalCache<Object, Object> cache; /** * @param cache Cache. */ - protected BaseWarmupCallable(InternalCache<Object, Object> cache) { + protected BaseWarmupCallable(IgniteInternalCache<Object, Object> cache) { this.cache = cache; } @@ -445,7 +445,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private GetCallable(InternalCache<Object, Object> cache) { + private GetCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } @@ -462,7 +462,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private PutCallable(InternalCache<Object, Object> cache) { + private PutCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } @@ -479,7 +479,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private PutxCallable(InternalCache<Object, Object> cache) { + private PutxCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } @@ -496,7 +496,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private RemoveCallable(InternalCache<Object, Object> cache) { + private RemoveCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } @@ -513,7 +513,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private RemovexCallable(InternalCache<Object, Object> cache) { + private RemovexCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } @@ -530,7 +530,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private PutIfAbsentCallable(InternalCache<Object, Object> cache) { + private PutIfAbsentCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } @@ -547,7 +547,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> /** * @param cache Cache. */ - private ReplaceCallable(InternalCache<Object, Object> cache) { + private ReplaceCallable(IgniteInternalCache<Object, Object> cache) { super(cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/test/java/org/apache/ignite/internal/GridInternalCacheRemoveTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridInternalCacheRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridInternalCacheRemoveTest.java deleted file mode 100644 index 496d00e..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridInternalCacheRemoveTest.java +++ /dev/null @@ -1,41 +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; - -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.cache.*; - -/** - * - */ -public class GridInternalCacheRemoveTest extends GridCacheAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 1; - } - - /** - * @throws IgniteCheckedException If failed. - */ - public void testRemove() throws IgniteCheckedException { - jcache().put("key", 1); - - assert jcache().remove("key", 1); - assert !jcache().remove("key", 1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java new file mode 100644 index 0000000..415e7ec --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java @@ -0,0 +1,41 @@ +/* + * 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; + +import org.apache.ignite.*; +import org.apache.ignite.internal.processors.cache.*; + +/** + * + */ +public class IgniteInternalCacheRemoveTest extends GridCacheAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 1; + } + + /** + * @throws IgniteCheckedException If failed. + */ + public void testRemove() throws IgniteCheckedException { + jcache().put("key", 1); + + assert jcache().remove("key", 1); + assert !jcache().remove("key", 1); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 614ac61..5983c1b 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 InternalCache<Object,Object> cache, final int keys) { + private Thread runCacheOperations(final IgniteInternalCache<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/228736f5/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index f9af01e..1f86474 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -309,7 +309,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { IgniteEx g = grid(i); - InternalCache cache = (InternalCache)g.cachex(DATA_CACHE_NAME).cache(); + IgniteInternalCache cache = (IgniteInternalCache)g.cachex(DATA_CACHE_NAME).cache(); assert cache.isIgfsDataCache(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index cc91fdc..e6219dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -204,11 +204,11 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { * * @return Instance of a Cache proxy. */ - @Override protected InternalCache<Object, Object> localCache(String cacheName) throws IgniteCheckedException { - final InternalCache<Object, Object> cache = super.localCache(cacheName); + @Override protected IgniteInternalCache<Object, Object> localCache(String cacheName) throws IgniteCheckedException { + final IgniteInternalCache<Object, Object> cache = super.localCache(cacheName); - return (InternalCache<Object, Object>)Proxy.newProxyInstance(getClass().getClassLoader(), - new Class[] {InternalCache.class}, + return (IgniteInternalCache<Object, Object>)Proxy.newProxyInstance(getClass().getClassLoader(), + new Class[] {IgniteInternalCache.class}, new InvocationHandler() { @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable { if (failMtd.equals(mtd.getName())) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java index d83bd3d..8276f3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java @@ -152,7 +152,7 @@ public class GridServiceReassignmentSelfTest extends GridServiceProcessorAbstrac private boolean checkServices(int total, int maxPerNode, int gridIdx, boolean lastTry) throws Exception { IgniteEx grid = grid(gridIdx); - InternalCache<GridServiceAssignmentsKey, GridServiceAssignments> cache = grid.utilityCache(); + IgniteInternalCache<GridServiceAssignmentsKey, GridServiceAssignments> cache = grid.utilityCache(); GridServiceAssignments assignments = cache.get(new GridServiceAssignmentsKey("testService")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java index e508851..3757060 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java @@ -57,10 +57,10 @@ public class HadoopJobTracker extends HadoopComponent { private final GridMutex mux = new GridMutex(); /** */ - private volatile InternalCache<HadoopJobId, HadoopJobMetadata> jobMetaPrj; + private volatile IgniteInternalCache<HadoopJobId, HadoopJobMetadata> jobMetaPrj; /** Projection with expiry policy for finished job updates. */ - private volatile InternalCache<HadoopJobId, HadoopJobMetadata> finishedJobMetaPrj; + private volatile IgniteInternalCache<HadoopJobId, HadoopJobMetadata> finishedJobMetaPrj; /** Map-reduce execution planner. */ @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") @@ -107,8 +107,8 @@ public class HadoopJobTracker extends HadoopComponent { * @return Job meta projection. */ @SuppressWarnings("NonPrivateFieldAccessedInSynchronizedContext") - private InternalCache<HadoopJobId, HadoopJobMetadata> jobMetaCache() { - InternalCache<HadoopJobId, HadoopJobMetadata> prj = jobMetaPrj; + private IgniteInternalCache<HadoopJobId, HadoopJobMetadata> jobMetaCache() { + IgniteInternalCache<HadoopJobId, HadoopJobMetadata> prj = jobMetaPrj; if (prj == null) { synchronized (mux) { @@ -149,8 +149,8 @@ public class HadoopJobTracker extends HadoopComponent { /** * @return Projection with expiry policy for finished job updates. */ - private InternalCache<HadoopJobId, HadoopJobMetadata> finishedJobMetaCache() { - InternalCache<HadoopJobId, HadoopJobMetadata> prj = finishedJobMetaPrj; + private IgniteInternalCache<HadoopJobId, HadoopJobMetadata> finishedJobMetaCache() { + IgniteInternalCache<HadoopJobId, HadoopJobMetadata> prj = finishedJobMetaPrj; if (prj == null) { jobMetaCache(); @@ -470,7 +470,7 @@ public class HadoopJobTracker extends HadoopComponent { case COMMIT: case ABORT: { - InternalCache<HadoopJobId, HadoopJobMetadata> cache = finishedJobMetaCache(); + IgniteInternalCache<HadoopJobId, HadoopJobMetadata> cache = finishedJobMetaCache(); cache.invokeAsync(info.jobId(), new UpdatePhaseProcessor(incrCntrs, PHASE_COMPLETE)). listen(failsLog); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 fbdabd2..f3c74fc 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 @@ -946,23 +946,23 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes } /** {@inheritDoc} */ - @Override public <K extends GridCacheUtilityKey, V> InternalCache<K, V> utilityCache() { + @Override public <K extends GridCacheUtilityKey, V> IgniteInternalCache<K, V> utilityCache() { return null; } /** {@inheritDoc} */ - @Nullable @Override public <K, V> InternalCache<K, V> cachex(@Nullable String name) { + @Nullable @Override public <K, V> IgniteInternalCache<K, V> cachex(@Nullable String name) { return null; } /** {@inheritDoc} */ - @Nullable @Override public <K, V> InternalCache<K, V> cachex() { + @Nullable @Override public <K, V> IgniteInternalCache<K, V> cachex() { return null; } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public Collection<InternalCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super InternalCache<?, ?>>... p) { + @Override public Collection<IgniteInternalCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super IgniteInternalCache<?, ?>>... p) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 3130c70..5756d51 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 InternalCache<Object, Object> cache; + protected final IgniteInternalCache<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, InternalCache<Object, Object> cache) { + protected HibernateAccessStrategyAdapter(Ignite ignite, IgniteInternalCache<Object, Object> cache) { this.cache = cache; this.ignite = ignite; @@ -283,7 +283,7 @@ public abstract class HibernateAccessStrategyAdapter { * @param key Key. * @throws CacheException If failed. */ - static void evict(Ignite ignite, InternalCache<Object,Object> cache, Object key) throws CacheException { + static void evict(Ignite ignite, IgniteInternalCache<Object,Object> cache, Object key) throws CacheException { try { ignite.compute(ignite.cluster()).call(new ClearKeyCallable(key, cache.name())); } @@ -298,7 +298,7 @@ public abstract class HibernateAccessStrategyAdapter { * @param cache Cache. * @throws CacheException If failed. */ - static void evictAll(InternalCache<Object,Object> cache) throws CacheException { + static void evictAll(IgniteInternalCache<Object,Object> cache) throws CacheException { try { cache.clear(); } @@ -342,7 +342,7 @@ public abstract class HibernateAccessStrategyAdapter { /** {@inheritDoc} */ @Override public Void call() throws IgniteCheckedException { - InternalCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); + IgniteInternalCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 441ea12..88a3e7a 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, InternalCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, IgniteInternalCache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 6eeb8b8..1157b3a 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, - InternalCache<Object, Object> cache, CacheDataDescription dataDesc) { + IgniteInternalCache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 b0f75fe..fa8a5a2 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, InternalCache<Object, Object> cache) { + Ignite ignite, IgniteInternalCache<Object, Object> cache) { super(factory, name, ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 de35940..2100018 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, InternalCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, IgniteInternalCache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache, dataDesc); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 7dcfe51..b7670ba 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, InternalCache<Object, Object> cache, ThreadLocal writeCtx) { + protected HibernateNonStrictAccessStrategy(Ignite ignite, IgniteInternalCache<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(InternalCache<Object, Object> cache) throws IgniteCheckedException { + void updateCache(IgniteInternalCache<Object, Object> cache) throws IgniteCheckedException { if (!F.isEmpty(rmvs)) cache.removeAll(rmvs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 b1653f5..7e6eccd 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, InternalCache<Object, Object> cache) { + Ignite ignite, IgniteInternalCache<Object, Object> cache) { super(factory, name, ignite, cache); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 355a2d8..140913e 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, InternalCache<Object, Object> cache) { + public HibernateReadOnlyAccessStrategy(Ignite ignite, IgniteInternalCache<Object, Object> cache) { super(ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 3d6342a..e717135 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, InternalCache<Object, Object> cache, ThreadLocal txCtx) { + protected HibernateReadWriteAccessStrategy(Ignite ignite, IgniteInternalCache<Object, Object> cache, ThreadLocal txCtx) { super(ignite, cache); this.txCtx = (ThreadLocal<TxContext>)txCtx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 6088c09..7a8b9fe 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 InternalCache<Object, Object> cache; + protected final IgniteInternalCache<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, - InternalCache<Object, Object> cache) { + IgniteInternalCache<Object, Object> cache) { this.factory = factory; this.name = name; this.ignite = ignite; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 c32e982..8bdb509 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.InternalCache}, by default it is assumed that - * for each cache region there is a {@link org.apache.ignite.internal.processors.cache.InternalCache} with the same name. Also it is possible to define + * Each Hibernate cache region must be associated with some {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache}, by default it is assumed that + * for each cache region there is a {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache} 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 InternalCache<Object, Object> dfltCache; + private IgniteInternalCache<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 InternalCache<Object, Object> regionCache(String regionName) throws CacheException { + private IgniteInternalCache<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; } - InternalCache<Object, Object> cache = ((IgniteKernal)ignite).getCache(cacheName); + IgniteInternalCache<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/228736f5/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 0e60b47..9e1d496 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, InternalCache<Object, Object> cache) { + Ignite ignite, IgniteInternalCache<Object, Object> cache) { super(factory, name, ignite, cache); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 c91964e..eee9832 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.InternalCache} corresponding to the L2 cache region are configured to use the same transaction manager. + * {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache} 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, InternalCache<Object, Object> cache) { + public HibernateTransactionalAccessStrategy(Ignite ignite, IgniteInternalCache<Object, Object> cache) { super(ignite, cache); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 acbd736..6a1fd2b 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, InternalCache<Object, Object> cache, CacheDataDescription dataDesc) { + Ignite ignite, IgniteInternalCache<Object, Object> cache, CacheDataDescription dataDesc) { super(factory, name, ignite, cache); this.dataDesc = dataDesc; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 e9cef3e..b85a393 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 { - InternalCache<Object, ?> cache = ctx.cache().cache(schema.spaceName); + IgniteInternalCache<Object, ?> cache = ctx.cache().cache(schema.spaceName); GridCacheContext cctx = cache.context();
