ignite-96 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b049b064 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b049b064 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b049b064 Branch: refs/heads/ignite-96 Commit: b049b06405f255e005b9eac4d469fdf93979578f Parents: 7cc8b8e Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sun Feb 8 02:16:50 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sun Feb 8 02:16:50 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 15 ++++++++++++++- .../cache/GridCacheAbstractFullApiSelfTest.java | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b049b064/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 88cd3f1..b64dc36 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -3695,7 +3695,20 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> /** {@inheritDoc} */ @Override public Cache.Entry<K, V> wrap() { try { - CacheEntryImpl<K, V> entry = new CacheEntryImpl<>(key, rawGetOrUnmarshal(false)); + IgniteInternalTx tx = cctx.tm().userTx(); + + V val; + + if (tx != null) { + val = (V)tx.writeMap().get(txKey()); + + if (val == null) + val = (V)tx.readMap().get(txKey()); + } + else + val = rawGetOrUnmarshal(false); + + CacheEntryImpl<K, V> entry = new CacheEntryImpl<>(key, val); entry.version(ver); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b049b064/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 b040291..fce9696 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 @@ -2676,7 +2676,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPeekMode() throws Exception { - assert false; + assert false : "ignite-96"; // String key = "testPeekMode"; // // GridCache<String, Integer> cache = primaryIgnite(key).cache(null); @@ -2939,7 +2939,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ private void checkTtl(boolean inTx, boolean oldEntry) throws Exception { - assert false; + assert false : "ignite-96"; // int ttl = 1000; // // final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); @@ -3170,7 +3170,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testUnswap() throws Exception { - assert false; + assert false : "ignite-96"; // GridCache<String, Integer> cache = cache(); // // List<String> keys = primaryKeysForCache(cache, 3);
