Ignite-9655-merge - Fixed 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/df55ba92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df55ba92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df55ba92 Branch: refs/heads/sprint-1 Commit: df55ba925969ff0345dbbc3e686a522ef1cefe39 Parents: c131bf0 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Feb 12 13:43:02 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Feb 12 13:43:02 2015 -0800 ---------------------------------------------------------------------- .../communication/GridIoMessageFactory.java | 10 ---- .../GridCachePartitionExchangeManager.java | 7 --- .../distributed/GridDistributedLockRequest.java | 30 ---------- .../GridDistributedTxFinishRequest.java | 30 ---------- .../GridDistributedTxPrepareRequest.java | 14 ----- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 60 -------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 12 ++-- .../distributed/near/GridNearLockRequest.java | 6 -- .../near/GridNearTxPrepareFuture.java | 7 +-- .../cache/transactions/IgniteTxAdapter.java | 5 -- .../transactions/IgniteTxLocalAdapter.java | 8 +-- .../cache/transactions/IgniteTxProxyImpl.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 15 ++--- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- 15 files changed, 19 insertions(+), 191 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index e8481f1..2c5be43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -173,16 +173,6 @@ public class GridIoMessageFactory implements MessageFactory { break; - case 18: - msg = new GridCachePessimisticCheckCommittedTxRequest(); - - break; - - case 19: - msg = new GridCachePessimisticCheckCommittedTxResponse(); - - break; - case 20: msg = new GridCacheTtlUpdateRequest(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 1d064e2..d7b1914 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -281,13 +281,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana } /** {@inheritDoc} */ - @Override protected void stop0(boolean cancel) { - super.stop0(cancel); - - exchFuts = null; - } - - /** {@inheritDoc} */ @SuppressWarnings("LockAcquiredButNotSafelyReleased") @Override protected void stop0(boolean cancel) { super.stop0(cancel); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index f1ad543..b2ed1d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -397,12 +397,6 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage } switch (state) { - case 8: - if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, GridCacheVersion.class)) - return false; - - state++; - case 9: if (!writer.writeIgniteUuid("futId", futId)) return false; @@ -486,13 +480,6 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; state++; - - case 23: - if (!writer.writeByteArray("writeEntriesBytes", writeEntriesBytes)) - return false; - - state++; - } return true; @@ -507,14 +494,6 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; switch (state) { - case 8: - drVersByIdx = reader.readObjectArray("drVersByIdx", GridCacheVersion.class); - - if (!reader.isLastRead()) - return false; - - state++; - case 9: futId = reader.readIgniteUuid("futId"); @@ -626,15 +605,6 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; state++; - - case 23: - writeEntriesBytes = reader.readByteArray("writeEntriesBytes"); - - if (!reader.isLastRead()) - return false; - - state++; - } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 9b12d1f..78fc317 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -328,12 +328,6 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 14: - if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, byte[].class)) - return false; - - state++; - case 15: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; @@ -363,13 +357,6 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes return false; state++; - - case 20: - if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, byte[].class)) - return false; - - state++; - } return true; @@ -432,14 +419,6 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 14: - recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", byte[].class); - - if (!reader.isLastRead()) - return false; - - state++; - case 15: syncCommit = reader.readBoolean("syncCommit"); @@ -481,15 +460,6 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes return false; state++; - - case 20: - writeEntriesBytes = reader.readCollection("writeEntriesBytes", byte[].class); - - if (!reader.isLastRead()) - return false; - - state++; - } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 7478b88..4140a21 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -469,12 +469,6 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe } switch (state) { - case 8: - if (!writer.writeMessage("commitVer", commitVer)) - return false; - - state++; - case 9: if (!writer.writeEnum("concurrency", concurrency)) return false; @@ -567,14 +561,6 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; switch (state) { - case 8: - commitVer = reader.readMessage("commitVer"); - - if (!reader.isLastRead()) - return false; - - state++; - case 9: concurrency = reader.readEnum("concurrency", IgniteTxConcurrency.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index f1ea7c2..9ff2ca5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -1045,7 +1045,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo // Fail the whole compound future. onError(res.error()); else { - Set<Integer> invalidParts = res.invalidPartitions(); + Collection<Integer> invalidParts = res.invalidPartitions(); // Removing mappings for invalid partitions. if (!F.isEmpty(invalidParts)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 8e39b11..bc0520d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -23,7 +23,6 @@ import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.extensions.communication.*; @@ -246,13 +245,10 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest _clone.sysInvalidate = sysInvalidate; _clone.topVer = topVer; _clone.pendingVers = pendingVers; - _clone.onePhaseCommit = onePhaseCommit; _clone.writeVer = writeVer != null ? (GridCacheVersion)writeVer.clone() : null; _clone.writeVer = writeVer; _clone.subjId = subjId; _clone.taskNameHash = taskNameHash; - _clone.ttls = ttls != null ? (GridLongList)ttls.clone() : null; - _clone.nearTtls = nearTtls != null ? (GridLongList)nearTtls.clone() : null; } /** {@inheritDoc} */ @@ -289,24 +285,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 24: - if (!writer.writeMessage("nearTtls", nearTtls)) - return false; - - state++; - - case 25: - if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, byte[].class)) - return false; - - state++; - - case 26: - if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) - return false; - - state++; - case 27: if (!writer.writeCollection("pendingVers", pendingVers, GridCacheVersion.class)) return false; @@ -337,12 +315,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 32: - if (!writer.writeMessage("ttls", ttls)) - return false; - - state++; - case 33: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -387,30 +359,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 24: - nearTtls = reader.readMessage("nearTtls"); - - if (!reader.isLastRead()) - return false; - - state++; - - case 25: - nearWritesBytes = reader.readCollection("nearWritesBytes", byte[].class); - - if (!reader.isLastRead()) - return false; - - state++; - - case 26: - onePhaseCommit = reader.readBoolean("onePhaseCommit"); - - if (!reader.isLastRead()) - return false; - - state++; - case 27: pendingVers = reader.readCollection("pendingVers", GridCacheVersion.class); @@ -451,14 +399,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 32: - ttls = reader.readMessage("ttls"); - - if (!reader.isLastRead()) - return false; - - state++; - case 33: writeVer = reader.readMessage("writeVer"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 7d75f92..e4e886e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.processors.dr.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.transactions.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -46,7 +45,6 @@ import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.transactions.IgniteTxState.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; -import static org.apache.ignite.transactions.IgniteTxState.*; /** * @@ -326,7 +324,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu for (T2<EntryProcessor<K, V, ?>, Object[]> t : txEntry.entryProcessors()) { try { - CacheInvokeEntry<K, V> invokeEntry = new CacheInvokeEntry<>(key, val); + CacheInvokeEntry<K, V> invokeEntry = new CacheInvokeEntry<>(txEntry.context(), key, val); EntryProcessor<K, V, ?> processor = t.get1(); @@ -530,11 +528,11 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu onComplete(); if (!tx.near()) { - if (tx.markFinalizing(IgniteTxEx.FinalizationStatus.USER_FINISH)) { - IgniteInternalFuture<IgniteTx> fut = this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync(); + if (tx.markFinalizing(IgniteInternalTx.FinalizationStatus.USER_FINISH)) { + IgniteInternalFuture<IgniteInternalTx> fut = this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync(); - fut.listenAsync(new CIX1<IgniteInternalFuture<IgniteTx>>() { - @Override public void applyx(IgniteInternalFuture<IgniteTx> gridCacheTxGridFuture) { + fut.listenAsync(new CIX1<IgniteInternalFuture<IgniteInternalTx>>() { + @Override public void applyx(IgniteInternalFuture<IgniteInternalTx> gridCacheTxGridFuture) { try { if (replied.compareAndSet(false, true)) sendPrepareResponse(res); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index 0938525..79b7dfb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -404,12 +404,6 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 29: - if (!commState.putBoolean(syncCommit)) - return false; - - commState.idx++; - case 30: if (!writer.writeIgniteUuid("miniId", miniId)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index cd4ea34..4dd77bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -26,19 +26,17 @@ import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*; import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.apache.ignite.internal.managers.discovery.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.transactions.*; -import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; @@ -47,7 +45,6 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.transactions.IgniteTxState.*; @@ -626,7 +623,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut } else { try { - cctx.io().send(node, req); + cctx.io().send(node, req, tx.ioPolicy()); } catch (IgniteCheckedException e) { // Fail the whole thing. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index 75838da..5e130ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -1833,11 +1833,6 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public Collection<IgniteTxEntry> recoveryWrites() { - return null; - } - - /** {@inheritDoc} */ @Override public Collection<IgniteTxEntry> optimisticLockEntries() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index ad3b890..5c8d1ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -2705,8 +2705,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> return new GridFinishedFutureEx<>(new GridCacheReturn<V>(), e); } - return commitAsync().chain(new CX1<IgniteInternalFuture<IgniteTx>, GridCacheReturn<V>>() { - @Override public GridCacheReturn<V> applyx(IgniteInternalFuture<IgniteTx> txFut) throws IgniteCheckedException { + return commitAsync().chain(new CX1<IgniteInternalFuture<IgniteInternalTx>, GridCacheReturn<V>>() { + @Override public GridCacheReturn<V> applyx(IgniteInternalFuture<IgniteInternalTx> txFut) throws IgniteCheckedException { txFut.get(); return implicitRes; @@ -2922,8 +2922,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> // with prepare response, if required. assert loadFut.isDone(); - return commitAsync().chain(new CX1<IgniteInternalFuture<IgniteTx>, GridCacheReturn<V>>() { - @Override public GridCacheReturn<V> applyx(IgniteInternalFuture<IgniteTx> txFut) throws IgniteCheckedException { + return commitAsync().chain(new CX1<IgniteInternalFuture<IgniteInternalTx>, GridCacheReturn<V>>() { + @Override public GridCacheReturn<V> applyx(IgniteInternalFuture<IgniteInternalTx> txFut) throws IgniteCheckedException { txFut.get(); return implicitRes; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/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 81d5573..480ccb4 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 @@ -75,7 +75,7 @@ public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable { /** * @return Transaction. */ - public IgniteTxEx<K, V> tx() { + public IgniteInternalTx<K, V> tx() { return tx; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index a518074..6b21114 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -406,11 +406,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract // Now do the same checks but within transaction. if (txEnabled()) { - tx = transactions().txStart(); + try (IgniteTx tx0 = transactions().txStart()) { + assert cache.getAll(Collections.<String>emptySet()).isEmpty(); - assert cache.getAll(Collections.<String>emptySet()).isEmpty(); - - map1 = cache.getAll(ImmutableSet.of("key1", "key2", "key9999")); + map1 = cache.getAll(ImmutableSet.of("key1", "key2", "key9999")); info("Retrieved map1: " + map1); @@ -420,7 +419,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(2, (int)map1.get("key2")); assertNull(map1.get("key9999")); - map2 = cache.getAll(ImmutableSet.of("key1", "key2", "key9999")); + map2 = cache.getAll(ImmutableSet.of("key1", "key2", "key9999")); info("Retrieved map2: " + map2); @@ -430,11 +429,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(2, (int)map2.get("key2")); assertNull(map2.get("key9999")); - tx.commit(); - } - finally { - if (tx != null) - tx.close(); + tx0.commit(); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df55ba92/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index df2c32e..cf18e96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -330,7 +330,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest IgniteTxProxyImpl txProxy = (IgniteTxProxyImpl)tx; - IgniteTxEx txEx = txProxy.tx(); + IgniteInternalTx txEx = txProxy.tx(); if (commmit) { txEx.prepare();
