This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 17f66a2 IGNITE-9216 Uncomment tests in IgniteCacheTestSuite.
17f66a2 is described below
commit 17f66a2271965edc13aca5e282fa4f7dd3efe814
Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
AuthorDate: Tue Feb 11 18:48:18 2020 +0300
IGNITE-9216 Uncomment tests in IgniteCacheTestSuite.
Also remove 'multiple update' from GridDhtCacheAdapter.
Fixes #7346.
---
.../cache/distributed/dht/GridDhtCacheAdapter.java | 114 ------------
.../communication/GridIoManagerSelfTest.java | 5 +
.../CacheAtomicSingleMessageCountSelfTest.java | 120 ++++++-------
.../cache/GridCacheClearLocallySelfTest.java | 16 +-
.../cache/GridCacheKeyCheckSelfTest.java | 13 +-
.../processors/cache/GridCacheLeakTest.java | 5 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 196 ---------------------
.../processors/cache/GridCacheMvccFlagsTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 10 +-
.../processors/cache/GridCacheSlowTxWarnTest.java | 4 +-
.../cache/IgniteCacheObjectPutSelfTest.java | 4 +-
.../cache/IgniteCachingProviderSelfTest.java | 6 +-
.../cache/IgniteOnePhaseCommitNearSelfTest.java | 6 +-
.../InterceptorWithKeepBinaryCacheFullApiTest.java | 5 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 73 +++++---
.../testsuites/IgnitePerformanceTestSuite.java | 2 +
...ridCacheFullTextQueryMultithreadedSelfTest.java | 3 +-
.../IgniteBinaryCacheQueryTestSuite.java | 2 +
18 files changed, 167 insertions(+), 420 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 6a45ec5..ead81e3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -76,7 +75,6 @@ import
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import
org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
import org.apache.ignite.internal.processors.security.SecurityUtils;
-import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.CI2;
@@ -106,12 +104,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends
GridDistributedCacheAdap
/** */
private static final long serialVersionUID = 0L;
- /** Multi tx future holder. */
- private ThreadLocal<IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture>>
multiTxHolder = new ThreadLocal<>();
-
- /** Multi tx futures. */
- private ConcurrentMap<IgniteUuid, MultiUpdateFuture> multiTxFuts = new
ConcurrentHashMap<>();
-
/** Force key futures. */
private final ConcurrentMap<IgniteUuid, GridDhtForceKeysFuture<?, ?>>
forceKeyFuts = newMap();
@@ -428,112 +420,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends
GridDistributedCacheAdap
}
/**
- * @return Topology version future registered for multi-update.
- */
- @Nullable public GridDhtTopologyFuture multiUpdateTopologyFuture() {
- IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture> tup =
multiTxHolder.get();
-
- return tup == null ? null : tup.get2();
- }
-
- /**
- * Starts multi-update lock. Will wait for topology future is ready.
- *
- * @return Topology version.
- * @throws IgniteCheckedException If failed.
- */
- public AffinityTopologyVersion beginMultiUpdate() throws
IgniteCheckedException {
- IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture> tup =
multiTxHolder.get();
-
- if (tup != null)
- throw new IgniteCheckedException("Nested multi-update locks are
not supported");
-
- GridDhtPartitionTopology top = ctx.group().topology();
-
- top.readLock();
-
- GridDhtTopologyFuture topFut;
-
- AffinityTopologyVersion topVer;
-
- try {
- // While we are holding read lock, register lock future for
partition release future.
- IgniteUuid lockId = IgniteUuid.fromUuid(ctx.localNodeId());
-
- topVer = top.readyTopologyVersion();
-
- MultiUpdateFuture fut = new MultiUpdateFuture(topVer);
-
- MultiUpdateFuture old = multiTxFuts.putIfAbsent(lockId, fut);
-
- assert old == null;
-
- topFut = top.topologyVersionFuture();
-
- multiTxHolder.set(F.t(lockId, topFut));
- }
- finally {
- top.readUnlock();
- }
-
- topFut.get();
-
- return topVer;
- }
-
- /**
- * Ends multi-update lock.
- *
- * @throws IgniteCheckedException If failed.
- */
- public void endMultiUpdate() throws IgniteCheckedException {
- IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture> tup =
multiTxHolder.get();
-
- if (tup == null)
- throw new IgniteCheckedException("Multi-update was not started or
released twice.");
-
- ctx.group().topology().readLock();
-
- try {
- IgniteUuid lockId = tup.get1();
-
- MultiUpdateFuture multiFut = multiTxFuts.remove(lockId);
-
- multiTxHolder.set(null);
-
- // Finish future.
- multiFut.onDone(lockId);
- }
- finally {
- ctx.group().topology().readUnlock();
- }
- }
-
- /**
- * Creates multi update finish future. Will return {@code null} if no
multi-update locks are found.
- *
- * @param topVer Topology version.
- * @return Finish future.
- */
- @Nullable public IgniteInternalFuture<?>
multiUpdateFinishFuture(AffinityTopologyVersion topVer) {
- GridCompoundFuture<IgniteUuid, Object> fut = null;
-
- for (MultiUpdateFuture multiFut : multiTxFuts.values()) {
- if (multiFut.topologyVersion().compareTo(topVer) <= 0) {
- if (fut == null)
- fut = new GridCompoundFuture<>();
-
- fut.add(multiFut);
- }
- }
-
- if (fut != null)
- fut.markInitialized();
-
- return fut;
- }
-
- /**
* @param key Key.
* @return DHT entry.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 4e61922..16f389a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.testframework.GridTestNode;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.GridTestKernalContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
@@ -89,6 +90,7 @@ public class GridIoManagerSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
@Test
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-12661";)
public void testSendIfOneOfNodesIsLocalAndTopicIsEnum() throws Exception {
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -104,6 +106,7 @@ public class GridIoManagerSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
@Test
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-12661";)
public void testSendUserMessageThinVersionIfOneOfNodesIsLocal() throws
Exception {
Object msg = new Object();
@@ -129,6 +132,7 @@ public class GridIoManagerSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
@Test
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-12661";)
public void testSendUserMessageUnorderedThickVersionIfOneOfNodesIsLocal()
throws Exception {
Object msg = new Object();
@@ -154,6 +158,7 @@ public class GridIoManagerSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
@Test
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-12661";)
public void testSendUserMessageOrderedThickVersionIfOneOfNodesIsLocal()
throws Exception {
Object msg = new Object();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
index 5491d2b..c171527 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
@@ -65,6 +65,11 @@ public class CacheAtomicSingleMessageCountSelfTest extends
GridCommonAbstractTes
return cfg;
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
@@ -73,30 +78,25 @@ public class CacheAtomicSingleMessageCountSelfTest extends
GridCommonAbstractTes
startClientGrid(0);
startGrid(1);
- try {
- awaitPartitionMapExchange();
+ awaitPartitionMapExchange();
- TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
- commSpi.resetCount();
+ TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
+ commSpi.resetCount();
- commSpi.registerMessage(GridNearAtomicFullUpdateRequest.class);
- commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
-
commSpi.registerMessage(GridNearAtomicSingleUpdateInvokeRequest.class);
-
commSpi.registerMessage(GridNearAtomicSingleUpdateFilterRequest.class);
+ commSpi.registerMessage(GridNearAtomicFullUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateInvokeRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateFilterRequest.class);
- int putCnt = 15;
+ int putCnt = 15;
- for (int i = 0; i < putCnt; i++)
- jcache(0).put(i, i);
+ for (int i = 0; i < putCnt; i++)
+ jcache(0).put(i, i);
- assertEquals(0,
commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
- assertEquals(putCnt,
commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
- assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateInvokeRequest.class));
- assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateFilterRequest.class));
- }
- finally {
- stopAllGrids();
- }
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
+ assertEquals(putCnt,
commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateInvokeRequest.class));
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateFilterRequest.class));
}
/**
@@ -109,38 +109,33 @@ public class CacheAtomicSingleMessageCountSelfTest
extends GridCommonAbstractTes
int cacheId =
((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME).context().cacheId();
- try {
- awaitPartitionMapExchange();
-
- TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
+ awaitPartitionMapExchange();
- commSpi.resetCount();
- commSpi.filterCacheId(cacheId);
+ TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
- commSpi.registerMessage(GridNearAtomicFullUpdateRequest.class);
- commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
-
commSpi.registerMessage(GridNearAtomicSingleUpdateInvokeRequest.class);
-
commSpi.registerMessage(GridNearAtomicSingleUpdateFilterRequest.class);
+ commSpi.resetCount();
+ commSpi.filterCacheId(cacheId);
- int putCnt = 15;
+ commSpi.registerMessage(GridNearAtomicFullUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateInvokeRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateFilterRequest.class);
- for (int i = 0; i < putCnt; i++) {
- jcache(0).invoke(i, new CacheEntryProcessor<Object, Object,
Object>() {
- @Override public Object process(MutableEntry<Object,
Object> entry,
- Object... objects) throws EntryProcessorException {
- return 2;
- }
- });
- }
+ int putCnt = 15;
- assertEquals(0,
commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
- assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
- assertEquals(putCnt,
commSpi.messageCount(GridNearAtomicSingleUpdateInvokeRequest.class));
- assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateFilterRequest.class));
- }
- finally {
- stopAllGrids();
+ for (int i = 0; i < putCnt; i++) {
+ jcache(0).invoke(i, new CacheEntryProcessor<Object, Object,
Object>() {
+ @Override public Object process(MutableEntry<Object, Object>
entry,
+ Object... objects) throws EntryProcessorException {
+ return 2;
+ }
+ });
}
+
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
+ assertEquals(putCnt,
commSpi.messageCount(GridNearAtomicSingleUpdateInvokeRequest.class));
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateFilterRequest.class));
}
/**
@@ -151,31 +146,26 @@ public class CacheAtomicSingleMessageCountSelfTest
extends GridCommonAbstractTes
startClientGrid(0);
startGrid(1);
- try {
- awaitPartitionMapExchange();
+ awaitPartitionMapExchange();
- TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
+ TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid(0).configuration().getCommunicationSpi();
- commSpi.resetCount();
+ commSpi.resetCount();
- commSpi.registerMessage(GridNearAtomicFullUpdateRequest.class);
- commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
-
commSpi.registerMessage(GridNearAtomicSingleUpdateInvokeRequest.class);
-
commSpi.registerMessage(GridNearAtomicSingleUpdateFilterRequest.class);
+ commSpi.registerMessage(GridNearAtomicFullUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateInvokeRequest.class);
+ commSpi.registerMessage(GridNearAtomicSingleUpdateFilterRequest.class);
- int putCnt = 15;
+ int putCnt = 15;
- for (int i = 0; i < putCnt; i++)
- jcache(0).putIfAbsent(i, i);
+ for (int i = 0; i < putCnt; i++)
+ jcache(0).putIfAbsent(i, i);
- assertEquals(0,
commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
- assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
- assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateInvokeRequest.class));
- assertEquals(putCnt,
commSpi.messageCount(GridNearAtomicSingleUpdateFilterRequest.class));
- }
- finally {
- stopAllGrids();
- }
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicFullUpdateRequest.class));
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateRequest.class));
+ assertEquals(0,
commSpi.messageCount(GridNearAtomicSingleUpdateInvokeRequest.class));
+ assertEquals(putCnt,
commSpi.messageCount(GridNearAtomicSingleUpdateFilterRequest.class));
}
/**
@@ -192,7 +182,7 @@ public class CacheAtomicSingleMessageCountSelfTest extends
GridCommonAbstractTes
@Override public void sendMessage(ClusterNode node, Message msg,
IgniteInClosure<IgniteException> ackC)
throws IgniteSpiException {
- if (((GridIoMessage)msg).message() instanceof GridCacheMessage) {
+ if (((GridIoMessage)msg).message() instanceof GridCacheIdMessage) {
int msgCacheId =
((GridCacheIdMessage)((GridIoMessage)msg).message()).cacheId();
if (filterCacheId == null || filterCacheId == msgCacheId) {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
index 98d5b98..e8b81f8 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearLocallySelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache;
import java.lang.reflect.Array;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -37,6 +38,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static
org.apache.ignite.internal.processors.cache.GridCacheAdapter.CLEAR_ALL_SPLIT_THRESHOLD;
+import static org.apache.ignite.testframework.MvccFeatureChecker.forcedMvcc;
/**
* Test {@link IgniteCache#localClearAll(java.util.Set)} operations in
multinode environment with nodes having caches with different names.
@@ -242,6 +244,9 @@ public class GridCacheClearLocallySelfTest extends
GridCommonAbstractTest {
* @throws Exception In case of exception.
*/
private void test(Mode mode, int keysCnt) throws Exception {
+ if (forcedMvcc())
+ return;
+
startUp();
switch (mode) {
@@ -264,14 +269,15 @@ public class GridCacheClearLocallySelfTest extends
GridCommonAbstractTest {
// Ensure correct no-op clean of CLIENT_ONLY cache.
warmCache(cachesPartitioned[2], keysCnt);
- assert cachesPartitioned[2].localSize() == 0;
- assert cachesPartitioned[2].localSize() == 0;
+ assert cachesPartitioned[1].localSize(CachePeekMode.ALL) == 0;
+ // XXX I think it was supposed that NEAR cache will only be
present on node 1.
+ assert cachesPartitioned[2].localSize(CachePeekMode.PRIMARY)
== 0;
stopGrid(2); // Shutdown Grid in order to remove reader in
NEAR_PARTITIONED cache.
- // Ensure correct clearLocally of NEA_ONLY cache.
+ // Ensure correct clearLocally of NEAR_ONLY cache.
warmCache(cachesPartitioned[1], keysCnt);
- assert cachesPartitioned[1].localSize() != 0;
+ assert cachesPartitioned[1].localSize(CachePeekMode.NEAR) != 0;
cachesPartitioned[1].localClearAll(keySet(cachesPartitioned[1]));
assert cachesPartitioned[1].localSize() == 0;
fillCache(cachesPartitioned[1], keysCnt);
@@ -318,6 +324,8 @@ public class GridCacheClearLocallySelfTest extends
GridCommonAbstractTest {
tx.commit();
}
+
+ awaitPartitionMapExchange(true, true, null);
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
index ffbb3e8..cbabcd5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheKeyCheckSelfTest.java
@@ -125,7 +125,7 @@ public class GridCacheKeyCheckSelfTest extends
GridCacheAbstractSelfTest {
this.atomicityMode = atomicityMode;
try {
- IgniteCache<IncorrectCacheKey, String> cache =
grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<IncorrectCacheKey, String> cache = cache();
cache.get(new IncorrectCacheKey(0));
@@ -145,7 +145,7 @@ public class GridCacheKeyCheckSelfTest extends
GridCacheAbstractSelfTest {
this.atomicityMode = atomicityMode;
try {
- IgniteCache<IncorrectCacheKey, String> cache =
grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<IncorrectCacheKey, String> cache = cache();
cache.put(new IncorrectCacheKey(0), "test_value");
@@ -165,7 +165,7 @@ public class GridCacheKeyCheckSelfTest extends
GridCacheAbstractSelfTest {
this.atomicityMode = atomicityMode;
try {
- IgniteCache<IncorrectCacheKey, String> cache =
grid(0).cache(DEFAULT_CACHE_NAME);
+ IgniteCache<IncorrectCacheKey, String> cache = cache();
cache.remove(new IncorrectCacheKey(0));
@@ -178,6 +178,13 @@ public class GridCacheKeyCheckSelfTest extends
GridCacheAbstractSelfTest {
}
}
+ /** */
+ private IgniteCache<IncorrectCacheKey, String> cache() {
+
grid(0).context().cache().internalCache(DEFAULT_CACHE_NAME).forceKeyCheck();
+
+ return grid(0).cache(DEFAULT_CACHE_NAME);
+ }
+
/**
* Cache key that doesn't override hashCode()/equals().
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index 2dac3c1..261986a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -40,6 +40,9 @@ public class GridCacheLeakTest extends GridCommonAbstractTest
{
/** Cache name. */
private static final String CACHE_NAME = "igfs-data";
+ /** Iterations to run. */
+ private static final int ITERS = 10_000;
+
/** Atomicity mode. */
private CacheAtomicityMode atomicityMode;
@@ -126,7 +129,7 @@ public class GridCacheLeakTest extends
GridCommonAbstractTest {
}
}
- if (i == 50_000)
+ if (i == ITERS)
break;
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
deleted file mode 100644
index 1887e0a..0000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.apache.ignite.transactions.Transaction;
-import org.junit.Test;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
-
-/**
- * Tests multi-update locks.
- */
-public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
- /** Near enabled flag. */
- private boolean nearEnabled;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- cfg.setCacheConfiguration(cacheConfiguration());
-
- cfg.setCheckpointSpi(new NoopCheckpointSpi());
-
- return cfg;
- }
-
- /**
- * @return Cache configuration.
- */
- protected CacheConfiguration cacheConfiguration() {
- CacheConfiguration cfg = defaultCacheConfiguration();
-
- cfg.setCacheMode(PARTITIONED);
- cfg.setBackups(1);
-
- if (!nearEnabled)
- cfg.setNearConfiguration(null);
-
- cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setRebalanceMode(SYNC);
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testMultiUpdateLocksNear() throws Exception {
- checkMultiUpdateLocks(true);
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testMultiUpdateLocksColocated() throws Exception {
- checkMultiUpdateLocks(false);
- }
-
- /**
- * @param nearEnabled Near enabled flag.
- * @throws Exception If failed.
- */
- private void checkMultiUpdateLocks(boolean nearEnabled) throws Exception {
- this.nearEnabled = nearEnabled;
-
- startGrids(3);
-
- try {
- IgniteKernal g = (IgniteKernal)grid(0);
-
- GridCacheContext<Object, Object> cctx =
g.internalCache(DEFAULT_CACHE_NAME).context();
-
- GridDhtCacheAdapter cache = nearEnabled ? cctx.near().dht() :
cctx.colocated();
-
- AffinityTopologyVersion topVer = cache.beginMultiUpdate();
-
- IgniteInternalFuture<?> startFut;
-
- try {
- assertEquals(3, topVer.topologyVersion());
-
- final AtomicBoolean started = new AtomicBoolean();
-
- startFut = multithreadedAsync(new Callable<Object>() {
- @Override public Object call() throws Exception {
- info(">>>> Starting grid.");
-
- Ignite g4 = startGrid(4);
-
- started.set(true);
-
- IgniteCache<Object, Object> c =
g4.cache(DEFAULT_CACHE_NAME);
-
- info(">>>> Checking tx in new grid.");
-
- try (Transaction tx =
g4.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
- assertEquals(2, c.get("a"));
- assertEquals(4, c.get("b"));
- assertEquals(6, c.get("c"));
- }
-
- return null;
- }
- }, 1);
-
- U.sleep(200);
-
- info(">>>> Checking grid has not started yet.");
-
- assertFalse(started.get());
-
- // Check we can proceed with transactions.
- IgniteCache<Object, Object> cache0 =
g.cache(DEFAULT_CACHE_NAME);
-
- info(">>>> Checking tx commit.");
-
- Transaction tx = g.transactions().txStart(PESSIMISTIC,
REPEATABLE_READ);
-
- try {
- cache0.put("a", 1);
- cache0.put("b", 2);
- cache0.put("c", 3);
-
- tx.commit();
- }
- finally {
- tx.close();
- }
-
- info(">>>> Checking grid still is not started");
-
- assertFalse(started.get());
-
- tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ);
-
- try {
- cache0.put("a", 2);
- cache0.put("b", 4);
- cache0.put("c", 6);
-
- tx.commit();
- }
- finally {
- tx.close();
- }
- }
- finally {
- info(">>>> Releasing multi update.");
-
- cache.endMultiUpdate();
- }
-
- info("Waiting for thread termination.");
-
- startFut.get();
- }
- finally {
- stopAllGrids();
- }
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
index c13dd27..c9e8458 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
@@ -91,12 +91,13 @@ public class GridCacheMvccFlagsTest extends
GridCommonAbstractTest {
true,
true,
null,
- false
+ true
);
c.setOwner();
c.setReady();
c.setUsed();
+ c.setRemoved();
short flags = c.flags();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 1a4a55e..570697f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -32,7 +32,6 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -72,7 +71,6 @@ public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest
* @throws Exception If failed.
* TODO IGNITE-581 enable when fixed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-581";)
@Test
public void testTransformTransactionalNoBackups() throws Exception {
// Test works too long and fails.
@@ -83,7 +81,6 @@ public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest
* @throws Exception If failed.
* TODO IGNITE-581 enable when fixed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-581";)
@Test
public void testTransformTransactionalOneBackup() throws Exception {
// Test works too long and fails.
@@ -143,7 +140,10 @@ public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest
private static class Transform implements EntryProcessor<Integer,
TestObject, Void>, Serializable {
/** {@inheritDoc} */
@Override public Void process(MutableEntry<Integer, TestObject> entry,
Object... args) {
- entry.setValue(new TestObject());
+ if (entry.getKey() < 100)
+ assertNotNull(entry.getValue());
+ else
+ assertNull(entry.getValue());
return null;
}
@@ -167,7 +167,7 @@ public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- assert !failDeserialization;
+ // No-op.
}
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
index 1d5acbc..9a6f63d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
@@ -29,6 +29,8 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.testframework.MvccFeatureChecker.forcedMvcc;
+import static org.apache.ignite.testframework.MvccFeatureChecker.isSupported;
/**
* Test to check slow TX warning timeout defined by
@@ -54,7 +56,7 @@ public class GridCacheSlowTxWarnTest extends
GridCommonAbstractTest {
CacheConfiguration cc3 = defaultCacheConfiguration();
cc3.setName("local");
- cc3.setCacheMode(LOCAL);
+ cc3.setCacheMode((!forcedMvcc() || isSupported(LOCAL)) ? LOCAL :
REPLICATED);
c.setCacheConfiguration(cc1, cc2, cc3);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
index cc43bc8..6fa2877 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
@@ -38,9 +38,9 @@ public class IgniteCacheObjectPutSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
+ CacheConfiguration ccfg = new CacheConfiguration(CACHE_NAME);
- ccfg.setName(CACHE_NAME);
+ ccfg.setOnheapCacheEnabled(true);
cfg.setCacheConfiguration(ccfg);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
index dc7711b..80ffb7a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachingProviderSelfTest.java
@@ -85,7 +85,11 @@ public class IgniteCachingProviderSelfTest extends
IgniteCacheAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- stopAllGrids();
+ try {
+ Caching.getCachingProvider().close();
+ } finally {
+ stopAllGrids();
+ }
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
index 81c6c82..c44de3aa 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java
@@ -42,6 +42,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import org.junit.Test;
+import static org.apache.ignite.testframework.MvccFeatureChecker.forcedMvcc;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -91,6 +92,9 @@ public class IgniteOnePhaseCommitNearSelfTest extends
GridCommonAbstractTest {
*/
@Test
public void testOnePhaseCommitFromNearNode() throws Exception {
+ if (forcedMvcc())
+ return;
+
backups = 1;
startGrids(GRID_CNT);
@@ -182,7 +186,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends
GridCommonAbstractTest {
assertMessageCount(GridNearTxPrepareRequest.class, 1);
assertMessageCount(GridDhtTxPrepareRequest.class, 1);
assertMessageCount(GridNearTxFinishRequest.class, 1);
- assertMessageCount(GridDhtTxFinishRequest.class, 0);
+ assertMessageCount(GridDhtTxFinishRequest.class, 1);
msgCntMap.clear();
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/InterceptorWithKeepBinaryCacheFullApiTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/InterceptorWithKeepBinaryCacheFullApiTest.java
index d16e6e7..dacbfc9 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/InterceptorWithKeepBinaryCacheFullApiTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/InterceptorWithKeepBinaryCacheFullApiTest.java
@@ -56,6 +56,11 @@ public class InterceptorWithKeepBinaryCacheFullApiTest
extends WithKeepBinaryCac
super.afterTest();
}
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
/**
*
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 84aec2e..5876bee 100755
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -40,6 +40,8 @@ import
org.apache.ignite.cache.store.jdbc.CacheJdbcPojoWriteBehindStoreWithCoale
import
org.apache.ignite.cache.store.jdbc.GridCacheJdbcBlobStoreMultithreadedSelfTest;
import org.apache.ignite.cache.store.jdbc.GridCacheJdbcBlobStoreSelfTest;
import org.apache.ignite.cache.store.jdbc.JdbcTypesDefaultTransformerTest;
+import org.apache.ignite.internal.IgniteInternalCacheRemoveTest;
+import org.apache.ignite.internal.managers.communication.GridIoManagerSelfTest;
import
org.apache.ignite.internal.managers.communication.IgniteCommunicationBalanceMultipleConnectionsTest;
import
org.apache.ignite.internal.managers.communication.IgniteCommunicationBalancePairedConnectionsTest;
import
org.apache.ignite.internal.managers.communication.IgniteCommunicationBalanceTest;
@@ -51,6 +53,7 @@ import
org.apache.ignite.internal.managers.communication.MessageDirectTypeIdConf
import
org.apache.ignite.internal.processors.cache.BinaryMetadataRegistrationInsideEntryProcessorTest;
import org.apache.ignite.internal.processors.cache.CacheAffinityCallSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheAffinityKeyConfigurationMismatchTest;
+import
org.apache.ignite.internal.processors.cache.CacheAtomicSingleMessageCountSelfTest;
import
org.apache.ignite.internal.processors.cache.CacheDeferredDeleteQueueTest;
import
org.apache.ignite.internal.processors.cache.CacheDeferredDeleteSanitySelfTest;
import
org.apache.ignite.internal.processors.cache.CacheFutureExceptionSelfTest;
@@ -62,16 +65,23 @@ import
org.apache.ignite.internal.processors.cache.GridCacheAffinityApiSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheAffinityMapperSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheAsyncOperationsLimitSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheAtomicUsersAffinityMapperSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheClearAllSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheClearLocallySelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheColocatedTxStoreExceptionSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheConcurrentGetCacheOnClientTest;
import
org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheConfigurationConsistencySelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheConfigurationValidationSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheKeyCheckNearEnabledSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheKeyCheckSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheLeakTest;
import
org.apache.ignite.internal.processors.cache.GridCacheLifecycleAwareSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheLocalTxStoreExceptionSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheMissingCommitVersionSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheMixedPartitionExchangeSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFlagsTest;
import
org.apache.ignite.internal.processors.cache.GridCacheMvccManagerSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheMvccPartitionedSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheMvccSelfTest;
@@ -82,10 +92,15 @@ import
org.apache.ignite.internal.processors.cache.GridCacheOffHeapMultiThreaded
import
org.apache.ignite.internal.processors.cache.GridCachePartitionedLocalStoreSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheReplicatedLocalStoreSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheReplicatedTxStoreExceptionSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheReplicatedUsersAffinityMapperSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheReturnValueTransferSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheSlowTxWarnTest;
import org.apache.ignite.internal.processors.cache.GridCacheStopSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheStoreValueBytesSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerLoadTest;
import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheTxPartitionedLocalStoreSelfTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheTxUsersAffinityMapperSelfTest;
import
org.apache.ignite.internal.processors.cache.GridDataStorageConfigurationConsistencySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicInvokeTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalInvokeTest;
@@ -93,6 +108,7 @@ import
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalWithSto
import
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledInvokeTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStopBusySelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicWithStoreInvokeTest;
+import
org.apache.ignite.internal.processors.cache.IgniteCacheBinaryEntryProcessorSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicLocalTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicReplicatedTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicTest;
@@ -103,16 +119,22 @@ import
org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerTxTes
import
org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorCallTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheManyAsyncOperationsTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheNearLockValueSelfTest;
+import
org.apache.ignite.internal.processors.cache.IgniteCacheObjectPutSelfTest;
+import
org.apache.ignite.internal.processors.cache.IgniteCacheSerializationSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheTransactionalStopBusySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheTxInvokeTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheTxLocalInvokeTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheTxNearEnabledInvokeTest;
+import
org.apache.ignite.internal.processors.cache.IgniteCachingProviderSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteClientAffinityAssignmentSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteGetNonPlainKeyReadThroughSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteIncompleteCacheObjectSelfTest;
+import
org.apache.ignite.internal.processors.cache.IgniteOnePhaseCommitNearSelfTest;
import
org.apache.ignite.internal.processors.cache.IgnitePutAllLargeBatchSelfTest;
import
org.apache.ignite.internal.processors.cache.IgnitePutAllUpdateNonPreloadedPartitionSelfTest;
+import
org.apache.ignite.internal.processors.cache.IgniteStaticCacheStartSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteTxConfigCacheSelfTest;
+import
org.apache.ignite.internal.processors.cache.InterceptorWithKeepBinaryCacheFullApiTest;
import
org.apache.ignite.internal.processors.cache.context.IgniteCacheAtomicExecutionContextTest;
import
org.apache.ignite.internal.processors.cache.context.IgniteCacheContinuousExecutionContextTest;
import
org.apache.ignite.internal.processors.cache.context.IgniteCacheIsolatedExecutionContextTest;
@@ -325,7 +347,6 @@ public class IgniteCacheTestSuite {
GridTestUtils.addTestIfNeeded(suite, CacheTxFastFinishTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite, GridIoManagerSelfTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteVariousConnectionNumberTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteCommunicationBalanceTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteCommunicationBalancePairedConnectionsTest.class, ignoredTests);
@@ -343,30 +364,32 @@ public class IgniteCacheTestSuite {
GridTestUtils.addTestIfNeeded(suite, CacheStoreWriteErrorTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
CacheTransactionalStoreReadFromBackupTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
CacheAtomicSingleMessageCountSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheAtomicUsersAffinityMapperSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheClearLocallySelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheConcurrentGetCacheOnClientTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheFullTextQueryMultithreadedSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheKeyCheckNearEnabledSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheKeyCheckSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite, GridCacheLeakTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheMultiUpdateLockSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite, GridCacheMvccFlagsTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheReplicatedUsersAffinityMapperSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheReturnValueTransferSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite, GridCacheSlowTxWarnTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheTtlManagerLoadTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheTxUsersAffinityMapperSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteInternalCacheRemoveTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheBinaryEntryProcessorSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheObjectPutSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheSerializationSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheStartStopLoadTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCachingProviderSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteOnePhaseCommitNearSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteStaticCacheStartSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
InterceptorWithKeepBinaryCacheFullApiTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, GridIoManagerSelfTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
CacheAtomicSingleMessageCountSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheClearLocallySelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheConcurrentGetCacheOnClientTest.class, ignoredTests);
+
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheKeyCheckNearEnabledSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, GridCacheKeyCheckSelfTest.class,
ignoredTests);
+
+ GridTestUtils.addTestIfNeeded(suite, GridCacheLeakTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, GridCacheMvccFlagsTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheReturnValueTransferSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, GridCacheSlowTxWarnTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheTtlManagerLoadTest.class, ignoredTests);
+
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheAtomicUsersAffinityMapperSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheTxUsersAffinityMapperSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheReplicatedUsersAffinityMapperSelfTest.class, ignoredTests);
+
+ GridTestUtils.addTestIfNeeded(suite,
IgniteInternalCacheRemoveTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheBinaryEntryProcessorSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheObjectPutSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheSerializationSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCachingProviderSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteOnePhaseCommitNearSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteStaticCacheStartSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
InterceptorWithKeepBinaryCacheFullApiTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
BinaryMetadataRegistrationInsideEntryProcessorTest.class, ignoredTests);
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePerformanceTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePerformanceTestSuite.java
index b122ecb..8b44a52 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePerformanceTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePerformanceTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
import
org.apache.ignite.internal.processors.cache.GridCacheConcurrentTxMultiNodeLoadTest;
import
org.apache.ignite.internal.processors.cache.GridCacheIteratorPerformanceTest;
+import
org.apache.ignite.internal.processors.cache.IgniteCacheStartStopLoadTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadPerformanceTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAffinityExcludeNeighborsPerformanceTest;
import
org.apache.ignite.internal.processors.cache.eviction.sorted.SortedEvictionPolicyPerformanceTest;
@@ -90,6 +91,7 @@ import org.junit.runners.Suite;
GridUnsafePartitionedMapPerformanceTest.class,
IgniteDataStreamerPerformanceTest.class,
SortedEvictionPolicyPerformanceTest.class,
+ IgniteCacheStartStopLoadTest.class,
IgnitePerformanceTestSuite.TentativeTests.class
})
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
similarity index 97%
rename from
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
rename to
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
index e4ded48..097b967 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
@@ -60,6 +60,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest
extends GridCacheAbstra
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(1);
cfg.setWriteSynchronizationMode(FULL_SYNC);
+ cfg.setIndexedTypes(Integer.class, H2TextValue.class);
return cfg;
}
@@ -95,7 +96,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest
extends GridCacheAbstra
// Create query.
final CacheQuery<Map.Entry<Integer, H2TextValue>> qry =
c.context().queries().createFullTextQuery(
- H2TextValue.class.getName(), txt, limit, false);
+ H2TextValue.class.getSimpleName(), txt, limit, false);
qry.enableDedup(false);
qry.includeBackups(false);
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index 1dbc179..fa8ec6a 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -44,6 +44,7 @@ import
org.apache.ignite.internal.processors.cache.DdlTransactionSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheCrossCacheQuerySelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheDynamicLoadOnClientPersistentTest;
import
org.apache.ignite.internal.processors.cache.GridCacheDynamicLoadOnClientTest;
+import
org.apache.ignite.internal.processors.cache.GridCacheFullTextQueryMultithreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheFullTextQuerySelfTest;
import
org.apache.ignite.internal.processors.cache.GridCacheLazyQueryPartitionsReleaseTest;
import
org.apache.ignite.internal.processors.cache.GridCacheQueryIndexDisabledSelfTest;
@@ -454,6 +455,7 @@ import org.junit.runners.Suite;
// Full text queries.
GridCacheFullTextQuerySelfTest.class,
+ GridCacheFullTextQueryMultithreadedSelfTest.class,
IgniteCacheFullTextQueryNodeJoiningSelfTest.class,
// Ignite cache and H2 comparison.
