Repository: ignite Updated Branches: refs/heads/master 4c273204b -> 4153b74e3
IGNITE-584 Fixed scan query to return consistent results on changing topology - Fixes #4351. Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4153b74e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4153b74e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4153b74e Branch: refs/heads/master Commit: 4153b74e3c77ef8bbdd5ed99bab4db615390cab5 Parents: 4c27320 Author: Evgeny Stanilovskiy <[email protected]> Authored: Mon Sep 3 16:21:58 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Sep 3 16:21:58 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +- .../processors/datastructures/GridSetQueryPredicate.java | 4 ++-- .../cache/datastructures/GridCacheSetAbstractSelfTest.java | 4 ---- .../datastructures/GridCacheSetFailoverAbstractSelfTest.java | 6 ++---- .../GridCachePartitionedAtomicSetFailoverSelfTest.java | 2 +- .../partitioned/IgnitePartitionedSetNoBackupsSelfTest.java | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4153b74e/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 4dc4944..8c2b939 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 @@ -3357,7 +3357,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme null, topVer); - cctx.dataStructures().onEntryUpdated(key, false, true); + cctx.dataStructures().onEntryUpdated(key, false, false); } onUpdateFinished(updateCntr); http://git-wip-us.apache.org/repos/asf/ignite/blob/4153b74e/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java index bc6c182..2de3dec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridSetQueryPredicate.java @@ -99,7 +99,7 @@ public class GridSetQueryPredicate<K, V> implements IgniteBiPredicate<K, V>, Ext */ private boolean filterKeys() { return !collocated && !(ctx.isLocal() || ctx.isReplicated()) && - (ctx.config().getBackups() > 0 || CU.isNearEnabled(ctx)); + (CU.isNearEnabled(ctx) || ctx.isPartitioned()); } /** {@inheritDoc} */ @@ -118,4 +118,4 @@ public class GridSetQueryPredicate<K, V> implements IgniteBiPredicate<K, V>, Ext @Override public String toString() { return S.toString(GridSetQueryPredicate.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/4153b74e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index 9a707eb..0ed4a97 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -582,8 +582,6 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr if (collectionCacheMode() == LOCAL) return; - fail("https://issues.apache.org/jira/browse/IGNITE-584";); - testNodeJoinsAndLeaves(false); } @@ -594,8 +592,6 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr if (collectionCacheMode() == LOCAL) return; - fail("https://issues.apache.org/jira/browse/IGNITE-584";); - testNodeJoinsAndLeaves(true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4153b74e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java index f8af2a2..ce320bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java @@ -116,8 +116,7 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect try { int size = set.size(); - // TODO: IGNITE-584, check for equality when IGNITE-584 fixed. - assertTrue(size > 0); + assertEquals(ITEMS, size); } catch (IgniteException ignore) { // No-op. @@ -134,8 +133,7 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect cnt++; } - // TODO: IGNITE-584, check for equality when IGNITE-584 fixed. - assertTrue(cnt > 0); + assertEquals(ITEMS, cnt); } catch (IgniteException ignore) { // No-op. http://git-wip-us.apache.org/repos/asf/ignite/blob/4153b74e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java index c2af2b1..4673549 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java @@ -35,4 +35,4 @@ public class GridCachePartitionedAtomicSetFailoverSelfTest extends GridCacheSetF @Override public void testNodeRestart() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-170";); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/4153b74e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java index 4daaeca..5f09dfa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java @@ -70,4 +70,4 @@ public class IgnitePartitionedSetNoBackupsSelfTest extends GridCachePartitionedS } } } -} \ No newline at end of file +}
