You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2019/01/05 16:37:36 UTC
[GitHub] asfgit closed pull request #5405: IGNITE-10290 Fix missed
prepareForCache in localGet operation
asfgit closed pull request #5405: IGNITE-10290 Fix missed prepareForCache in localGet operation
URL: https://github.com/apache/ignite/pull/5405
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 0629754bf985..55fae441d4cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -482,9 +482,11 @@ private boolean localGet(AffinityTopologyVersion topVer, KeyCacheObject key, int
GridCacheVersion ver = null;
if (readNoEntry) {
+ KeyCacheObject key0 = (KeyCacheObject)cctx.cacheObjects().prepareForCache(key, cctx);
+
CacheDataRow row = cctx.mvccEnabled() ?
- cctx.offheap().mvccRead(cctx, key, mvccSnapshot()) :
- cctx.offheap().read(cctx, key);
+ cctx.offheap().mvccRead(cctx, key0, mvccSnapshot()) :
+ cctx.offheap().read(cctx, key0);
if (row != null) {
long expireTime = row.expireTime();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 0d6948586926..88784140a7e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -440,9 +440,11 @@ private boolean localGet(AffinityTopologyVersion topVer, KeyCacheObject key, int
boolean skipEntry = readNoEntry;
if (readNoEntry) {
+ KeyCacheObject key0 = (KeyCacheObject)cctx.cacheObjects().prepareForCache(key, cctx);
+
CacheDataRow row = mvccSnapshot != null ?
- cctx.offheap().mvccRead(cctx, key, mvccSnapshot) :
- cctx.offheap().read(cctx, key);
+ cctx.offheap().mvccRead(cctx, key0, mvccSnapshot) :
+ cctx.offheap().read(cctx, key0);
if (row != null) {
long expireTime = row.expireTime();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalGetSerializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalGetSerializationTest.java
new file mode 100644
index 000000000000..bfcc41345574
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheLocalGetSerializationTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.Map;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ *
+ */
+@RunWith(JUnit4.class)
+public class CacheLocalGetSerializationTest extends GridCommonAbstractTest {
+ /**
+ * Check correct Map.Entry serialization key on local get/put operation.
+ * https://issues.apache.org/jira/browse/IGNITE-10290
+ *
+ * @throws Exception If failed.
+ */
+ @Test
+ public void test() throws Exception {
+ Ignite ig = startGrid();
+
+ IgniteCache<Map.Entry<Integer, Integer>, Long> cache = ig.getOrCreateCache(DEFAULT_CACHE_NAME);
+
+ // Try use Map.Entry as key in destributed map.
+ Map.Entry<Integer, Integer> key = new Map.Entry<Integer, Integer>() {
+ @Override public Integer getKey() {
+ return 123;
+ }
+
+ @Override public Integer getValue() {
+ return 123;
+ }
+
+ @Override public Integer setValue(Integer value) {
+ throw new UnsupportedOperationException();
+ }
+ };
+
+ cache.put(key, Long.MAX_VALUE);
+
+ Long val = cache.get(key);
+
+ Assert.assertNotNull(val);
+ Assert.assertEquals(Long.MAX_VALUE, (long)val);
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 276dbc5e6b80..369a0b5288ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -47,6 +47,7 @@
import org.apache.ignite.internal.managers.IgniteDiagnosticMessagesTest;
import org.apache.ignite.internal.processors.affinity.GridAffinityProcessorMemoryLeakTest;
import org.apache.ignite.internal.processors.affinity.GridAffinityProcessorRendezvousSelfTest;
+import org.apache.ignite.internal.processors.cache.CacheLocalGetSerializationTest;
import org.apache.ignite.internal.processors.cache.CacheRebalanceConfigValidationTest;
import org.apache.ignite.internal.processors.cache.GridLocalIgniteSerializationTest;
import org.apache.ignite.internal.processors.cache.GridProjectionForCachesOnDaemonNodeSelfTest;
@@ -219,6 +220,8 @@ public static TestSuite suite(@Nullable final Set<Class> ignoredTests) {
suite.addTest(new JUnit4TestAdapter(ListeningTestLoggerTest.class));
+ suite.addTest(new JUnit4TestAdapter(CacheLocalGetSerializationTest.class));
+
return suite;
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services