GG-9141 - Fixing queries and enabling passing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ee2df1d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ee2df1d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ee2df1d8 Branch: refs/heads/ignite-41 Commit: ee2df1d8d23256be0b911849878c652d0eda6076 Parents: 59d9cd6 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Dec 12 19:21:15 2014 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Dec 12 19:21:15 2014 -0800 ---------------------------------------------------------------------- .../grid/kernal/processors/cache/GridCacheMapEntry.java | 4 ++-- .../deployment/GridDeploymentMessageCountSelfTest.java | 2 +- .../GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java | 2 +- .../cache/eviction/GridCacheDistributedEvictionsSelfTest.java | 1 - .../cache/eviction/GridCacheEvictionTouchSelfTest.java | 4 ++-- .../eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java | 2 +- .../continuous/GridCacheContinuousQueryAbstractSelfTest.java | 1 - .../gridgain/testsuites/GridCacheEvictionSelfTestSuite.java | 2 +- .../org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java | 6 +++--- 9 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java index 32c1485..eb131fd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java @@ -1212,7 +1212,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> GridCacheMode mode = cctx.config().getCacheMode(); if (mode == GridCacheMode.LOCAL || mode == GridCacheMode.REPLICATED || - (tx != null && (tx.dht() || tx.colocated()) && tx.local())) + (tx != null && tx.local() && !isNear())) cctx.continuousQueries().onEntryUpdate(this, key, val, valueBytesUnlocked(), old, oldBytes); cctx.dataStructures().onEntryUpdated(key, false); @@ -1366,7 +1366,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> GridCacheMode mode = cctx.config().getCacheMode(); if (mode == GridCacheMode.LOCAL || mode == GridCacheMode.REPLICATED || - (tx != null && (tx.dht() || tx.colocated()) && tx.local())) + (tx != null && tx.local() && !isNear())) cctx.continuousQueries().onEntryUpdate(this, key, null, null, old, oldBytes); cctx.dataStructures().onEntryUpdated(key, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java index e16e19b..51a0e3e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java @@ -114,7 +114,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testCacheValueDeploymentOnPut() throws Exception { // TODO GG-9141 + public void testCacheValueDeploymentOnPut() throws Exception { ClassLoader ldr = getExternalClassLoader(); Class valCls = ldr.loadClass(TEST_VALUE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java index a57799b..e1f5c5a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java @@ -64,7 +64,7 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend /** * @throws Exception If failed. */ - public void _testTransform() throws Exception { // TODO GG-9141 + public void testTransform() throws Exception { testTransform(keyForNode(0)); if (gridCount() > 1) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 0489e36..e120287 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.cache.eviction; import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.fifo.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index 1ca5003..5c798fe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -202,7 +202,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testGroupLock() throws Exception { // TODO GG-9141 + public void testGroupLock() throws Exception { plc = new GridCacheFifoEvictionPolicy<>(100); try { @@ -248,7 +248,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void _testPartitionGroupLock() throws Exception { // TODO GG-9141 + public void testPartitionGroupLock() throws Exception { plc = new GridCacheFifoEvictionPolicy<>(100); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index 2465b1d..3a9901e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -81,7 +81,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ - public void _testTransactionalNearEvictionMaxSize() throws Exception { // TODO GG-9141 + public void testTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; checkNearEvictionMaxSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 2984da1..f81cb45 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/core/src/test/java/org/gridgain/testsuites/GridCacheEvictionSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheEvictionSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheEvictionSelfTestSuite.java index e5288b9..8b6ab21 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheEvictionSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheEvictionSelfTestSuite.java @@ -39,7 +39,7 @@ public class GridCacheEvictionSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheConcurrentEvictionsSelfTest.class)); suite.addTest(new TestSuite(GridCacheConcurrentEvictionConsistencySelfTest.class)); suite.addTest(new TestSuite(GridCacheEvictionTouchSelfTest.class)); -// suite.addTest(new TestSuite(GridCacheDistributedEvictionsSelfTest.class)); // TODO GG-9141 + suite.addTest(new TestSuite(GridCacheDistributedEvictionsSelfTest.class)); suite.addTest(new TestSuite(GridCacheEvictionLockUnlockSelfTest.class)); suite.addTest(new TestSuite(GridCacheBatchEvictUnswapSelfTest.class)); suite.addTest(new TestSuite(GridCachePreloadingEvictionsSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee2df1d8/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java index bd430e3..a939fdf 100644 --- a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java @@ -38,8 +38,8 @@ public class GridCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheReplicatedQuerySelfTest.class); suite.addTestSuite(GridCacheReplicatedQueryP2PDisabledSelfTest.class); suite.addTestSuite(GridCachePartitionedQuerySelfTest.class); -// suite.addTestSuite(GridCacheAtomicQuerySelfTest.class); // TODO GG-9141 -// suite.addTestSuite(GridCacheAtomicNearEnabledQuerySelfTest.class); // TODO GG-9141 + suite.addTestSuite(GridCacheAtomicQuerySelfTest.class); + suite.addTestSuite(GridCacheAtomicNearEnabledQuerySelfTest.class); suite.addTestSuite(GridCachePartitionedQueryP2PDisabledSelfTest.class); suite.addTestSuite(GridCachePartitionedQueryMultiThreadedSelfTest.class); suite.addTestSuite(GridCacheQueryIndexSelfTest.class); @@ -71,7 +71,7 @@ public class GridCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class); -// suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class); // TODO GG-9141 + suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class);
