You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/12/19 20:25:14 UTC
[51/52] [abbrv] ignite git commit: merge
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index dc98854,072918e..dcea831
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@@ -923,12 -911,9 +919,11 @@@ public class GridNearAtomicUpdateFutur
* @return Mapping.
* @throws Exception If failed.
*/
- @SuppressWarnings("ForLoopReplaceableByForEach")
- private Map<UUID, PrimaryRequestState> mapUpdate(Collection<ClusterNode> topNodes,
+ private Map<UUID, PrimaryRequestState> mapUpdate(
+ Collection<ClusterNode> topNodes,
AffinityTopologyVersion topVer,
Long futId,
+ boolean remap,
@Nullable Collection<KeyCacheObject> remapKeys,
boolean mappingKnown) throws Exception {
Iterator<?> it = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 462ca31,6cb9d05..7c5c953
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@@ -219,7 -235,11 +235,8 @@@ public abstract class GridCacheValueCon
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutConsistencyMultithreaded() throws Exception {
- if (nearEnabled())
- fail("https://issues.apache.org/jira/browse/IGNITE-627");
-
for (int i = 0; i < 20; i++) {
log.info("Iteration: " + i);
@@@ -269,8 -289,12 +286,9 @@@
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutRemoveConsistencyMultithreaded() throws Exception {
- for (int i = 0; i < 10; i++) {
- if (nearEnabled())
- fail("https://issues.apache.org/jira/browse/IGNITE-627");
-
+ for (int i = 0; i < SF.applyLB(10, 2); i++) {
log.info("Iteration: " + i);
putRemoveConsistencyMultithreaded();
http://git-wip-us.apache.org/repos/asf/ignite/blob/404a9f3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
----------------------------------------------------------------------