GG-9655 - Fixing tests after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/886299da Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/886299da Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/886299da Branch: refs/heads/sprint-1 Commit: 886299da986e0c76299283837cf19801da1958fd Parents: bc89139 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Feb 3 11:52:00 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Feb 3 11:52:00 2015 -0800 ---------------------------------------------------------------------- .../distributed/near/GridNearTxPrepareFuture.java | 7 +++++-- .../processors/cache/GridCacheTestStore.java | 16 ++++++++-------- ...CacheReplicatedGetAndTransformStoreSelfTest.java | 8 +------- 3 files changed, 14 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/886299da/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 fb422a4..deb991a 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 @@ -132,7 +132,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut if (log.isDebugEnabled()) log.debug("Transaction future received owner changed callback: " + entry); - if (entry.context().isNear() && owner != null && tx.hasWriteKey(entry.txKey())) { + if ((entry.context().isNear() || entry.context().isLocal()) && owner != null && tx.hasWriteKey(entry.txKey())) { lockKeys.remove(entry.txKey()); // This will check for locks. @@ -773,9 +773,12 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut entry.cached(cacheCtx.nearTx().entryExx(entry.key(), topVer), entry.keyBytes()); else if (!cacheCtx.isLocal()) entry.cached(cacheCtx.colocated().entryExx(entry.key(), topVer, true), entry.keyBytes()); - else + else { entry.cached(cacheCtx.local().entryEx(entry.key(), topVer), entry.keyBytes()); + lockKeys.add(entry.txKey()); + } + if (cur == null || !cur.node().id().equals(primary.id()) || cur.near() != cacheCtx.isNear()) { cur = new GridDistributedTxMapping<>(primary); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/886299da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java index ff600e7..1a28bbf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java @@ -188,7 +188,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** {@inheritDoc} */ @Override public String load(Integer key) { - checkTx(session()); + checkTx(session(), true); lastMtd = "load"; @@ -218,7 +218,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** {@inheritDoc} */ @Override public Map<Integer, String> loadAll(Iterable<? extends Integer> keys) { - checkTx(session()); + checkTx(session(), true); lastMtd = "loadAll"; @@ -239,7 +239,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** {@inheritDoc} */ @Override public void write(Cache.Entry<? extends Integer, ? extends String> e) throws CacheWriterException { - checkTx(session()); + checkTx(session(), false); lastMtd = "put"; @@ -253,7 +253,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** {@inheritDoc} */ @Override public void writeAll(Collection<Cache.Entry<? extends Integer, ? extends String>> entries) throws CacheWriterException { - checkTx(session()); + checkTx(session(), false); lastMtd = "putAll"; @@ -267,7 +267,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** {@inheritDoc} */ @Override public void delete(Object key) throws CacheWriterException { - checkTx(session()); + checkTx(session(), false); lastMtd = "remove"; @@ -279,7 +279,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** {@inheritDoc} */ @Override public void deleteAll(Collection<?> keys) throws CacheWriterException { - checkTx(session()); + checkTx(session(), false); lastMtd = "removeAll"; @@ -315,7 +315,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** * @param ses Session. */ - private void checkTx(@Nullable CacheStoreSession ses) { + private void checkTx(@Nullable CacheStoreSession ses, boolean load) { IgniteTx tx = ses != null ? ses.transaction() : null; if (tx == null) @@ -328,7 +328,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { if (!tx0.local()) throw new IgniteException("Tx is not local: " + tx); - if (tx0.dht()) + if (tx0.dht() && !load) throw new IgniteException("Tx is DHT: " + tx); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/886299da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedGetAndTransformStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedGetAndTransformStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedGetAndTransformStoreSelfTest.java index 189544e..5b47c8d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedGetAndTransformStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedGetAndTransformStoreSelfTest.java @@ -25,15 +25,9 @@ import static org.apache.ignite.cache.CacheMode.*; /** * Test get and transform for store with replicated cache. */ -public class GridCacheReplicatedGetAndTransformStoreSelfTest - extends GridCacheGetAndTransformStoreAbstractTest { +public class GridCacheReplicatedGetAndTransformStoreSelfTest extends GridCacheGetAndTransformStoreAbstractTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { return REPLICATED; } - - // todo: remove it when GG-8864 is fixed. - @Override public void testGetAndTransform() throws Exception { - // No-op. - } }
