IGNITE-52 - Fixing compilation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03f38008 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03f38008 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03f38008 Branch: refs/heads/ignite-sql-old Commit: 03f3800863164d1976bbd5067afab320ce1e9eb5 Parents: df56d89 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Feb 5 13:29:27 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Feb 5 13:29:27 2015 -0800 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 62 ++++++++++---------- .../cache/GridCacheProjectionImpl.java | 14 ++--- .../cache/distributed/dht/GridDhtGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 6 +- .../near/GridNearTransactionalCache.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 8 +-- .../cache/transactions/IgniteTxProxyImpl.java | 2 +- .../IgniteCacheContainsKeyAbstractSelfTest.java | 2 +- 10 files changed, 50 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/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 f0b46d8..f5e67b1 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 @@ -647,7 +647,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> containsKeyAsync(final K key) { + @Override public IgniteInternalFuture<Boolean> containsKeyAsync(final K key) { return getAllAsync( Collections.singletonList(key), /*force primary*/false, @@ -657,8 +657,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /*task name*/null, /*deserialize portable*/false, /*skip values*/true - ).chain(new CX1<IgniteFuture<Map<K, V>>, Boolean>() { - @Override public Boolean applyx(IgniteFuture<Map<K, V>> fut) throws IgniteCheckedException { + ).chain(new CX1<IgniteInternalFuture<Map<K, V>>, Boolean>() { + @Override public Boolean applyx(IgniteInternalFuture<Map<K, V>> fut) throws IgniteCheckedException { return fut.get().get(key) != null; } }); @@ -1626,8 +1626,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, String taskName = ctx.kernalContext().job().currentTaskName(); return getAllAsync(Collections.singletonList(key), /*force primary*/true, /*skip tx*/false, null, null, - taskName, true, false).chain(new CX1<IgniteFuture<Map<K, V>>, V>() { - @Override public V applyx(IgniteFuture<Map<K, V>> e) throws IgniteCheckedException { + taskName, true, false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() { + @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException { return e.get().get(key); } }); @@ -1717,7 +1717,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param ret Return flag. * @return Future. */ - public IgniteFuture<Map<K, V>> reloadAllAsync(@Nullable Collection<? extends K> keys, boolean ret, boolean skipVals, + public IgniteInternalFuture<Map<K, V>> reloadAllAsync(@Nullable Collection<? extends K> keys, boolean ret, boolean skipVals, @Nullable UUID subjId, String taskName) { ctx.denyOnFlag(READ); @@ -1773,7 +1773,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final Collection<K> loadedKeys = new GridConcurrentHashSet<>(); - IgniteFuture<Object> readFut = + IgniteInternalFuture<Object> readFut = readThroughAllAsync(absentKeys, true, skipVals, null, subjId, taskName, new CI2<K, V>() { /** Version for all loaded entries. */ private GridCacheVersion nextVer = ctx.versions().next(); @@ -1842,8 +1842,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } }); - return readFut.chain(new CX1<IgniteFuture<Object>, Map<K, V>>() { - @Override public Map<K, V> applyx(IgniteFuture<Object> e) throws IgniteCheckedException { + return readFut.chain(new CX1<IgniteInternalFuture<Object>, Map<K, V>>() { + @Override public Map<K, V> applyx(IgniteInternalFuture<Object> e) throws IgniteCheckedException { // Touch all not loaded keys. for (K key : absentKeys) { if (!loadedKeys.contains(key)) { @@ -1908,16 +1908,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync(final K key) { + @Override public IgniteInternalFuture<V> getAsync(final K key) { A.notNull(key, "key"); - IgniteFuture<V> fut = getAsync(key, true); - final boolean statsEnabled = ctx.config().isStatisticsEnabled(); final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteInternalFuture<V> fut = getAsync(key, true, null); + IgniteInternalFuture<V> fut = getAsync(key, true); if (ctx.config().getInterceptor() != null) fut = fut.chain(new CX1<IgniteInternalFuture<V>, V>() { @@ -1952,14 +1950,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys) { + @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys) { A.notNull(keys, "keys"); final boolean statsEnabled = ctx.config().isStatisticsEnabled(); final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteFuture<Map<K, V>> fut = getAllAsync(keys, true); + IgniteInternalFuture<Map<K, V>> fut = getAllAsync(keys, true); if (ctx.config().getInterceptor() != null) return fut.chain(new CX1<IgniteInternalFuture<Map<K, V>>, Map<K, V>>() { @@ -2302,7 +2300,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final GridCacheEntryEx<K, V> cached0 = cached; return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) { - @Override public IgniteFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) { + @Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) { return ctx.wrapCloneMap(tx.getAllAsync(ctx, keys, cached0, deserializePortable, skipVals)); } }); @@ -2582,8 +2580,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 = (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut; - return fut0.chain(new CX1<IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, EntryProcessorResult<T>>() { - @Override public EntryProcessorResult<T> applyx(IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut) + return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, EntryProcessorResult<T>>() { + @Override public EntryProcessorResult<T> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut) throws IgniteCheckedException { GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get(); @@ -2631,8 +2629,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 = (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut; - return fut0.chain(new CX1<IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() { - @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut) + return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() { + @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut) throws IgniteCheckedException { GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get(); @@ -2667,8 +2665,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 = (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut; - return fut0.chain(new CX1<IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() { - @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut) + return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() { + @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut) throws IgniteCheckedException { GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get(); @@ -3157,7 +3155,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) { // TODO should we invoke interceptor here? return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true, filter) - .chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>) RET2VAL); + .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>) RET2VAL); } @Override public String toString() { @@ -4082,16 +4080,16 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } @Override protected void remove(Cache.Entry<K, V> item) { - GridCacheProjectionImpl<K, V> prev = ctx.gate().enter(prj); + ctx.gate().enter(); try { - GridCacheAdapter.this.removex(item.getKey()); + removex(item.getKey()); } catch (IgniteCheckedException e) { throw new CacheException(e); } finally { - ctx.gate().leave(prev); + ctx.gate().leave(); } } }); @@ -4855,7 +4853,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param key Key. * @return Read operation future. */ - public final IgniteFuture<V> getAsync(final K key, boolean deserializePortable) { + public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePortable) { ctx.denyOnFlag(LOCAL); try { @@ -4866,9 +4864,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } return getAllAsync(Collections.singletonList(key), deserializePortable).chain( - new CX1<IgniteFuture<Map<K, V>>, V>() { + new CX1<IgniteInternalFuture<Map<K, V>>, V>() { @Override - public V applyx(IgniteFuture<Map<K, V>> e) throws IgniteCheckedException { + public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException { return e.get().get(key); } }); @@ -4924,7 +4922,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param keys Keys. * @return Reload future. */ - @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { UUID subjId = ctx.subjectIdPerCall(null); String taskName = ctx.kernalContext().job().currentTaskName(); @@ -4936,7 +4934,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param key Key. * @return Reload future. */ - @Override public IgniteFuture<V> reloadAsync(final K key) { + @Override public IgniteInternalFuture<V> reloadAsync(final K key) { ctx.denyOnFlags(F.asList(LOCAL, READ)); return ctx.closures().callLocalSafe(ctx.projectSafe(new Callable<V>() { @@ -4951,7 +4949,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param deserializePortable Deserialize portable flag. * @return Read future. */ - public IgniteFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys, + public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys, boolean deserializePortable) { String taskName = ctx.kernalContext().job().currentTaskName(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 545ddc9..2b5256d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -616,7 +616,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> containsKeyAsync(K key) { + @Override public IgniteInternalFuture<Boolean> containsKeyAsync(K key) { return cache.containsKeyAsync(key); } @@ -646,8 +646,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> reloadAsync(K key) { - return cache.reloadAsync(key, entryFilter(false)); + @Override public IgniteInternalFuture<V> reloadAsync(K key) { + return cache.reloadAsync(key); } /** {@inheritDoc} */ @@ -656,7 +656,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> reloadAllAsync() { + @Override public IgniteInternalFuture<?> reloadAllAsync() { return cache.reloadAllAsync(); } @@ -666,7 +666,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { return cache.reloadAllAsync(keys); } @@ -682,7 +682,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync(K key) { + @Override public IgniteInternalFuture<V> getAsync(K key) { return cache.getAsync(key, deserializePortables()); } @@ -737,7 +737,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { return cache.getAllAsync(keys, deserializePortables()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index bd00538..d8d8761 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*; @@ -323,7 +322,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col // TODO: To fix, check that reader is contained in the list of readers once // TODO: again after the returned future completes - if not, try again. // TODO: Also, why is info read before transactions are complete, and not after? - IgniteFuture<Boolean> f = (!e.deleted() && k.getValue() && skipVals) ? + IgniteInternalFuture<Boolean> f = (!e.deleted() && k.getValue() && skipVals) ? e.addReader(reader, msgId, topVer) : null; if (f != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 0c4032d..5ae1753 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -704,7 +704,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( + @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) { A.notNull(map, "map"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 8880ed1..363df2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -173,7 +173,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte if (tx != null && !tx.implicit() && !skipTx) { return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) { - @Override public IgniteFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) { + @Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) { return ctx.wrapCloneMap(tx.getAllAsync(ctx, keys, entry, deserializePortable, skipVals)); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index e195784..b9286d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -173,7 +173,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) - @Override public IgniteFuture<Object> readThroughAllAsync( + @Override public IgniteInternalFuture<Object> readThroughAllAsync( Collection<? extends K> keys, boolean reload, boolean skipVals, @@ -182,7 +182,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda String taskName, IgniteBiInClosure<K, V> vis ) { - return (IgniteFuture)loadAsync(tx, + return (IgniteInternalFuture)loadAsync(tx, keys, reload, false, @@ -202,7 +202,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { GridCompoundFuture fut = new GridCompoundFuture(ctx.kernalContext()); fut.add(super.reloadAllAsync(keys)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 04f1572..899cd50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -115,7 +115,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> if (tx != null && !tx.implicit() && !skipTx) { return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) { - @Override public IgniteFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) { + @Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) { return ctx.wrapCloneMap(tx.getAllAsync(ctx, keys, entry, deserializePortable, skipVals)); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index 9f06158..617aa3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -294,8 +294,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { readThrough, deserializePortable, accessPolicy(cacheCtx, keys), - skipVals).chain(new C1<IgniteFuture<Map<K, V>>, Boolean>() { - @Override public Boolean apply(IgniteFuture<Map<K, V>> f) { + skipVals).chain(new C1<IgniteInternalFuture<Map<K, V>>, Boolean>() { + @Override public Boolean apply(IgniteInternalFuture<Map<K, V>> f) { try { Map<K, V> map = f.get(); @@ -324,8 +324,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { resolveTaskName(), deserializePortable, accessPolicy(cacheCtx, keys), - skipVals).chain(new C1<IgniteFuture<Map<K, V>>, Boolean>() { - @Override public Boolean apply(IgniteFuture<Map<K, V>> f) { + skipVals).chain(new C1<IgniteInternalFuture<Map<K, V>>, Boolean>() { + @Override public Boolean apply(IgniteInternalFuture<Map<K, V>> f) { try { Map<K, V> map = f.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java index b9a99b4..654a384 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java @@ -107,7 +107,7 @@ public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable { /** * @return Proxied transaction. */ - public IgniteTxEx<K, V> tx() { + public IgniteInternalTx<K, V> tx() { return tx; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f38008/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java index a1ec0d7..987551f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java @@ -119,7 +119,7 @@ public abstract class IgniteCacheContainsKeyAbstractSelfTest extends GridCacheAb private boolean txContainsKey(IgniteTx tx, String key) { IgniteTxProxyImpl<String, Integer> proxy = (IgniteTxProxyImpl<String, Integer>)tx; - IgniteTxEx<String, Integer> txEx = proxy.tx(); + IgniteInternalTx<String, Integer> txEx = proxy.tx(); IgniteTxEntry entry = txEx.entry(context(0).txKey(key));
