ignite-4293 Do not need store deserialized value for BinaryMarshaller
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d10946b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d10946b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d10946b8 Branch: refs/heads/ignite-3477 Commit: d10946b8b107dee499a5798a4679ab5d14499764 Parents: abc8b90 Author: Alexandr Kuramshin <akurams...@gridgain.com> Authored: Fri Jan 13 12:26:39 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 13 12:26:39 2017 +0300 ---------------------------------------------------------------------- .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 5 ++--- .../java/org/apache/ignite/cache/store/jdbc/model/Person.java | 2 +- .../processors/cache/CacheEntryProcessorCopySelfTest.java | 6 ++++-- .../processors/cache/GridCacheBasicStoreAbstractTest.java | 2 +- .../distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java | 5 +---- 5 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 208ec62..614c612 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -244,9 +244,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme CacheMemoryMode memMode = ccfg.getMemoryMode(); - boolean storeVal = ctx.config().isPeerClassLoadingEnabled() || - GridQueryProcessor.isEnabled(ccfg) || - !ccfg.isCopyOnRead(); + boolean storeVal = !ccfg.isCopyOnRead() || (!isBinaryEnabled(ccfg) && + (GridQueryProcessor.isEnabled(ccfg) || ctx.config().isPeerClassLoadingEnabled())); CacheObjectContext res = new CacheObjectContext(ctx, ccfg.getName(), http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java index ddf309b..52ddfc8 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java @@ -196,7 +196,7 @@ public class Person implements Serializable { @Override public String toString() { return "Person [id=" + id + ", orgId=" + orgId + - ", birthday=" + birthday.getTime() + + ", birthday=" + (birthday == null ? null : birthday.getTime()) + ", name=" + name + "]"; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java index 21395e6..f44889b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -93,8 +94,9 @@ public class CacheEntryProcessorCopySelfTest extends GridCommonAbstractTest { doTest(true, false, OLD_VAL, 1); // One deserialization due to copyOnRead == true. - // Additional deserialization in case p2p enabled due to storeValue == true on update entry. - doTest(true, true, NEW_VAL, p2pEnabled ? 2 : 1); + // Additional deserialization in case p2p enabled and not BinaryMarshaller due to storeValue == true on update entry. + doTest(true, true, NEW_VAL, p2pEnabled && + !(grid.configuration().getMarshaller() instanceof BinaryMarshaller) ? 2 : 1); // No deserialization. doTest(false, false, NEW_VAL, 0); http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java index 8ddd737..026b618 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java @@ -571,7 +571,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert cached != null; - assert cached == val : "Cached value mismatch [expected=" + val + ", cached=" + cached + ']'; + assert cached.equals(val) : "Cached value mismatch [expected=" + val + ", cached=" + cached + ']'; // Make sure that value is coming from cache, not from store. checkLastMethod(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java index 3f3f84f..e8a6cfb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java @@ -117,10 +117,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes assertNotNull(v1); assertNotNull(v2); - if (affinity(cache).mapKeyToNode(key).isLocal()) - assertSame(v1, v2); - else - assertEquals(v1, v2); + assertEquals(v1, v2); } } } \ No newline at end of file
