Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1157C1763B for ; Mon, 20 Apr 2015 11:48:41 +0000 (UTC) Received: (qmail 69531 invoked by uid 500); 20 Apr 2015 11:48:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 69500 invoked by uid 500); 20 Apr 2015 11:48:41 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 69491 invoked by uid 99); 20 Apr 2015 11:48:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 11:48:40 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 11:48:34 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 713AD43EB0 for ; Mon, 20 Apr 2015 11:48:13 +0000 (UTC) Received: (qmail 67770 invoked by uid 99); 20 Apr 2015 11:48:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 11:48:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7AC3E07EB; Mon, 20 Apr 2015 11:48:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 20 Apr 2015 11:48:19 -0000 Message-Id: In-Reply-To: <5de91c9130ca42bb80d3237233377376@git.apache.org> References: <5de91c9130ca42bb80d3237233377376@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] incubator-ignite git commit: #ignite-758: rename InternalCache to IgniteInternalCache. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-758: rename InternalCache to IgniteInternalCache. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/228736f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/228736f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/228736f5 Branch: refs/heads/ignite-sprint-4 Commit: 228736f53f99737384fb354879a4455989136604 Parents: 9b0a8ac Author: ivasilinets Authored: Thu Apr 16 16:25:16 2015 +0300 Committer: ivasilinets Committed: Thu Apr 16 16:25:16 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../internal/managers/GridManagerAdapter.java | 2 +- .../processors/cache/CacheLockImpl.java | 4 +- .../cache/CacheProjectionContext.java | 8 +- .../processors/cache/GridCacheAdapter.java | 14 +- .../processors/cache/GridCacheProcessor.java | 14 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 10 +- .../processors/cache/IgniteInternalCache.java | 1860 ++++++++++++++++++ .../processors/cache/InternalCache.java | 1860 ------------------ .../CacheDataStructuresManager.java | 8 +- .../cache/query/GridCacheQueryManager.java | 12 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../datastructures/DataStructuresProcessor.java | 24 +- .../datastructures/GridCacheAtomicLongImpl.java | 4 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../GridCacheAtomicStampedImpl.java | 6 +- .../GridCacheCountDownLatchImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../processors/igfs/IgfsMetaManager.java | 8 +- .../handlers/cache/GridCacheCommandHandler.java | 60 +- .../service/GridServiceProcessor.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 +- .../internal/GridInternalCacheRemoveTest.java | 41 - .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 8 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 14 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 8 +- .../HibernateAccessStrategyAdapter.java | 10 +- .../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 +- 56 files changed, 2079 insertions(+), 2079 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 d6ce020..3bb2ec4 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 @@ -36,7 +36,7 @@ public interface IgniteEx extends Ignite { * * @return Utility cache. */ - public InternalCache utilityCache(); + public IgniteInternalCache utilityCache(); /** * Gets the cache instance for the given name if one is configured or @@ -47,17 +47,17 @@ public interface IgniteEx extends Ignite { * @param name Cache name. * @return Cache instance for given name or null if one does not exist. */ - @Nullable public InternalCache cachex(@Nullable String name); + @Nullable public IgniteInternalCache cachex(@Nullable String name); /** * Gets default cache instance if one is configured or null otherwise returning even non-public caches. - * The {@link org.apache.ignite.internal.processors.cache.InternalCache#name()} method on default instance returns null. + * The {@link org.apache.ignite.internal.processors.cache.IgniteInternalCache#name()} method on default instance returns null. * * @param Key type. * @param Value type. * @return Default cache instance. */ - @Nullable public InternalCache cachex(); + @Nullable public IgniteInternalCache 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> cachesx(@Nullable IgnitePredicate>... p); + public Collection> cachesx(@Nullable IgnitePredicate>... p); /** * Checks if the event type is user-recordable. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 0238345..7694835 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 InternalCache getCache(@Nullable String name) { + public IgniteInternalCache getCache(@Nullable String name) { guard(); try { @@ -2456,7 +2456,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public InternalCache utilityCache() { + @Override public IgniteInternalCache utilityCache() { guard(); try { @@ -2468,7 +2468,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public InternalCache cachex(@Nullable String name) { + @Override public IgniteInternalCache cachex(@Nullable String name) { guard(); try { @@ -2480,7 +2480,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public InternalCache cachex() { + @Override public IgniteInternalCache cachex() { guard(); try { @@ -2492,7 +2492,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ - @Override public Collection> cachesx(IgnitePredicate>[] p) { + @Override public Collection> cachesx(IgnitePredicate>[] p) { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 1d36da8..e837c39 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 implements GridMan @Nullable @Override public V readValueFromOffheapAndSwap(@Nullable String spaceName, Object key, @Nullable ClassLoader ldr) { try { - InternalCache cache = ctx.cache().cache(spaceName); + IgniteInternalCache cache = ctx.cache().cache(spaceName); GridCacheContext cctx = ((GridCacheProxyImpl)cache).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java index b06aee5..b22befb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java @@ -35,7 +35,7 @@ class CacheLockImpl implements Lock { private final GridCacheGateway gate; /** */ - private final InternalCache delegate; + private final IgniteInternalCache delegate; /** Projection. */ private final CacheProjectionContext prj; @@ -55,7 +55,7 @@ class CacheLockImpl implements Lock { * @param prj Projection. * @param keys Keys. */ - CacheLockImpl(GridCacheGateway gate, InternalCache delegate, CacheProjectionContext prj, + CacheLockImpl(GridCacheGateway gate, IgniteInternalCache delegate, CacheProjectionContext prj, Collection keys) { this.gate = gate; this.delegate = delegate; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java index 86ab204..7d355a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java @@ -80,7 +80,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#keepPortable()}. + * See {@link IgniteInternalCache#keepPortable()}. * * @return New instance of CacheProjectionContext with keep portable flag. */ @@ -102,7 +102,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#forSubjectId(UUID)}. + * See {@link IgniteInternalCache#forSubjectId(UUID)}. * * @return New instance of CacheProjectionContext with specific subject id. */ @@ -122,7 +122,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#setSkipStore(boolean)}. + * See {@link IgniteInternalCache#setSkipStore(boolean)}. * * @return New instance of CacheProjectionContext with skip store flag. */ @@ -142,7 +142,7 @@ public class CacheProjectionContext implements Serializable { } /** - * See {@link InternalCache#withExpiryPolicy(ExpiryPolicy)}. + * See {@link IgniteInternalCache#withExpiryPolicy(ExpiryPolicy)}. * * @param plc {@link ExpiryPolicy} to associate with this projection. * @return New instance of CacheProjectionContext with skip store flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 e38e83b..6f14351 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 implements InternalCache, Externalizable { +public abstract class GridCacheAdapter implements IgniteInternalCache, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -371,8 +371,8 @@ public abstract class GridCacheAdapter implements InternalCache, Ext /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) - @Override public InternalCache cache() { - return (InternalCache)this; + @Override public IgniteInternalCache cache() { + return (IgniteInternalCache)this; } /** {@inheritDoc} */ @@ -3225,7 +3225,7 @@ public abstract class GridCacheAdapter implements InternalCache, Ext // Delegate to near if dht. if (e.isDht() && CU.isNearEnabled(ctx)) { - InternalCache near = ctx.isDht() ? ctx.dht().near() : ctx.near(); + IgniteInternalCache near = ctx.isDht() ? ctx.dht().near() : ctx.near(); return near.isLockedByThread(key) || e.lockedByThread(); } @@ -5042,7 +5042,7 @@ public abstract class GridCacheAdapter implements InternalCache, Ext /** {@inheritDoc} */ @Override public Integer applyx(Object o) throws IgniteCheckedException { - InternalCache cache = ((IgniteEx)ignite).cachex(cacheName); + IgniteInternalCache cache = ((IgniteEx)ignite).cachex(cacheName); assert cache != null : cacheName; @@ -5079,7 +5079,7 @@ public abstract class GridCacheAdapter implements InternalCache, Ext } /** - * Internal callable which performs {@link InternalCache#size()} or {@link InternalCache#primarySize()} + * Internal callable which performs {@link IgniteInternalCache#size()} or {@link IgniteInternalCache#primarySize()} * operation on a cache with the given name. */ @GridInternal @@ -5115,7 +5115,7 @@ public abstract class GridCacheAdapter implements InternalCache, Ext /** {@inheritDoc} */ @Override public Integer apply(Object o) { - InternalCache cache = ((IgniteEx)ignite).cachex(cacheName); + IgniteInternalCache cache = ((IgniteEx)ignite).cachex(cacheName); return primaryOnly ? cache.primarySize() : cache.size(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/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 d8c9517..9b064ae 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 type of values. * @return Default cache. */ - public InternalCache cache() { + public IgniteInternalCache cache() { return cache(null); } @@ -2440,7 +2440,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @return Cache instance for given name. */ @SuppressWarnings("unchecked") - public InternalCache cache(@Nullable String name) { + public IgniteInternalCache 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> caches() { - return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure, InternalCache>() { - @Override public InternalCache apply(IgniteCacheProxy entries) { + public Collection> caches() { + return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure, IgniteInternalCache>() { + @Override public IgniteInternalCache apply(IgniteCacheProxy entries) { return entries.legacyProxy(); } }); @@ -2488,7 +2488,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * * @return Utility cache for atomic data structures. */ - public InternalCache atomicsCache() { + public IgniteInternalCache 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 InternalCache publicCache(@Nullable String name) { + public IgniteInternalCache 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/228736f5/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 310bf6e..ab237bf 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 implements InternalCache, Externalizable { +public class GridCacheProxyImpl implements IgniteInternalCache, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -59,7 +59,7 @@ public class GridCacheProxyImpl implements InternalCache, Externaliz /** Delegate object. */ @GridToStringExclude - private InternalCache delegate; + private IgniteInternalCache delegate; /** Projection. */ @GridToStringExclude @@ -83,7 +83,7 @@ public class GridCacheProxyImpl implements InternalCache, Externaliz * @param delegate Delegate object. * @param prj Optional projection which will be passed to gateway. */ - public GridCacheProxyImpl(GridCacheContext ctx, InternalCache delegate, + public GridCacheProxyImpl(GridCacheContext ctx, IgniteInternalCache delegate, @Nullable CacheProjectionContext prj) { assert ctx != null; assert delegate != null; @@ -109,7 +109,7 @@ public class GridCacheProxyImpl implements InternalCache, Externaliz /** * @return Proxy delegate. */ - public InternalCache delegate() { + public IgniteInternalCache delegate() { return delegate; } @@ -126,7 +126,7 @@ public class GridCacheProxyImpl implements InternalCache, Externaliz } /** {@inheritDoc} */ - @Override public InternalCache cache() { + @Override public IgniteInternalCache cache() { return cache.cache(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index fb06eee..9bc7574 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1159,7 +1159,7 @@ public class GridCacheUtils { * @param isolation Isolation. * @return New transaction. */ - public static IgniteInternalTx txStartInternal(GridCacheContext ctx, InternalCache prj, + public static IgniteInternalTx txStartInternal(GridCacheContext ctx, IgniteInternalCache prj, TransactionConcurrency concurrency, TransactionIsolation isolation) { assert ctx != null; assert prj != null; @@ -1595,8 +1595,8 @@ public class GridCacheUtils { * @param clo Closure. * @throws IgniteCheckedException If failed. */ - public static void inTx(InternalCache cache, TransactionConcurrency concurrency, - TransactionIsolation isolation, IgniteInClosureX> clo) throws IgniteCheckedException { + public static void inTx(IgniteInternalCache cache, TransactionConcurrency concurrency, + TransactionIsolation isolation, IgniteInClosureX> clo) throws IgniteCheckedException { try (IgniteInternalTx tx = cache.txStartEx(concurrency, isolation);) { clo.applyx(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/228736f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index eb027c0..7fa0a51 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -69,7 +69,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter delegate; + private IgniteInternalCache delegate; /** Projection. */ private CacheProjectionContext prjCtx; @@ -97,7 +97,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter ctx, - InternalCache delegate, + IgniteInternalCache delegate, CacheProjectionContext prjCtx, boolean async ) { @@ -1326,7 +1326,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter extends AsyncSupportAdapter

For example, if you use {@link Integer} as a key and {@code Value} class as a value (which will be * stored in portable format), you should acquire following projection to avoid deserialization: * 

-     * InternalCache prj = cache.keepPortable();
+     * IgniteInternalCache prj = cache.keepPortable();
      *
      * // Value is not deserialized and returned in portable format.
      * GridPortableObject po = prj.get(1);
@@ -1498,7 +1498,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter)in.readObject();
 
-        delegate = (InternalCache)in.readObject();
+        delegate = (IgniteInternalCache)in.readObject();
 
         prjCtx = (CacheProjectionContext)in.readObject();