You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2021/10/06 08:10:15 UTC
[ignite] branch master updated: IGNITE-15621 Replace atomic caches
with transactional in tests. (#9464)
This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 12d8dfb IGNITE-15621 Replace atomic caches with transactional in tests. (#9464)
12d8dfb is described below
commit 12d8dfbc87eced9cdf81cf1a2aabc1f423a9a271
Author: Maksim Timonin <ti...@gmail.com>
AuthorDate: Wed Oct 6 11:09:51 2021 +0300
IGNITE-15621 Replace atomic caches with transactional in tests. (#9464)
---
.../test/java/org/apache/ignite/cache/query/IndexQueryAliasTest.java | 2 ++
.../java/org/apache/ignite/cache/query/IndexQueryAllTypesTest.java | 2 ++
.../java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java | 2 ++
.../java/org/apache/ignite/cache/query/IndexQueryFilterTest.java | 2 ++
.../java/org/apache/ignite/cache/query/IndexQueryKeepBinaryTest.java | 2 ++
.../org/apache/ignite/cache/query/IndexQueryQueryEntityTest.java | 3 +++
.../test/java/org/apache/ignite/cache/query/IndexQueryRangeTest.java | 5 +++++
.../java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java | 2 ++
.../java/org/apache/ignite/cache/query/MultiTableIndexQuery.java | 2 ++
.../java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java | 2 ++
10 files changed, 24 insertions(+)
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAliasTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAliasTest.java
index 29afaf7..9b49518 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAliasTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAliasTest.java
@@ -29,6 +29,7 @@ import java.util.stream.LongStream;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -102,6 +103,7 @@ public class IndexQueryAliasTest extends GridCommonAbstractTest {
CacheConfiguration<?, ?> ccfg1 = new CacheConfiguration<>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setQueryEntities(Collections.singletonList(e));
cfg.setCacheConfiguration(ccfg1);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAllTypesTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAllTypesTest.java
index 9ab6593..6519d0b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAllTypesTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryAllTypesTest.java
@@ -38,6 +38,7 @@ import java.util.stream.LongStream;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -92,6 +93,7 @@ public class IndexQueryAllTypesTest extends GridCommonAbstractTest {
CacheConfiguration<Long, Person> ccfg = new CacheConfiguration<Long, Person>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Long.class, Person.class);
cfg.setCacheConfiguration(ccfg);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java
index 06728a8..3891bc6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFailoverTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.cluster.ClusterTopologyException;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -86,6 +87,7 @@ public class IndexQueryFailoverTest extends GridCommonAbstractTest {
CacheConfiguration<Long, Person> ccfg = new CacheConfiguration<Long, Person>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Long.class, Person.class);
cfg.setCacheConfiguration(ccfg);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFilterTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFilterTest.java
index d66b41c..11d63c8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFilterTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryFilterTest.java
@@ -27,6 +27,7 @@ import javax.cache.Cache;
import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -79,6 +80,7 @@ public class IndexQueryFilterTest extends GridCommonAbstractTest {
CacheConfiguration<?, ?> ccfg1 = new CacheConfiguration<>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Integer.class, Person.class);
cfg.setCacheConfiguration(ccfg1);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryKeepBinaryTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryKeepBinaryTest.java
index 598338d..e37971a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryKeepBinaryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryKeepBinaryTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -69,6 +70,7 @@ public class IndexQueryKeepBinaryTest extends GridCommonAbstractTest {
CacheConfiguration<Long, Person> ccfg = new CacheConfiguration<Long, Person>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Long.class, Person.class);
cfg.setCacheConfiguration(ccfg);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryQueryEntityTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryQueryEntityTest.java
index 00b0b7e..7bc90f7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryQueryEntityTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryQueryEntityTest.java
@@ -29,6 +29,7 @@ import java.util.stream.LongStream;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -114,6 +115,7 @@ public class IndexQueryQueryEntityTest extends GridCommonAbstractTest {
CacheConfiguration<?, ?> ccfg1 = new CacheConfiguration<>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setQueryEntities(Collections.singletonList(e));
QueryEntity entTableName = new QueryEntity(e);
@@ -121,6 +123,7 @@ public class IndexQueryQueryEntityTest extends GridCommonAbstractTest {
CacheConfiguration<?, ?> ccfg2 = new CacheConfiguration<>()
.setName(CACHE_TBL_NAME)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setQueryEntities(Collections.singletonList(entTableName));
cfg.setCacheConfiguration(ccfg1, ccfg2);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryRangeTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryRangeTest.java
index adb9653..593cc28 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryRangeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryRangeTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -160,6 +161,10 @@ public class IndexQueryRangeTest extends GridCommonAbstractTest {
.setQueryParallelism(qryParallelism)
.setBackups(backups);
+ // TODO: remove after IGNITE-15671.
+ if (atomicityMode == ATOMIC)
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+
cfg.setCacheConfiguration(ccfg);
return cfg;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java
index 781b58f..92e1626 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryWrongIndexTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.cache.query;
import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.testframework.GridTestUtils;
@@ -43,6 +44,7 @@ public class IndexQueryWrongIndexTest extends GridCommonAbstractTest {
IgniteCache<Integer, Person> cache = crd.getOrCreateCache(new CacheConfiguration<Integer, Person>()
.setName("CACHE")
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Integer.class, Person.class));
// Wrong fields in query.
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultiTableIndexQuery.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultiTableIndexQuery.java
index dbb63f6..20c7db4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultiTableIndexQuery.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultiTableIndexQuery.java
@@ -27,6 +27,7 @@ import java.util.stream.LongStream;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -97,6 +98,7 @@ public class MultiTableIndexQuery extends GridCommonAbstractTest {
CacheConfiguration<?, ?> ccfg = new CacheConfiguration<>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Long.class, Person.class, Long.class, SecondPerson.class)
.setQueryParallelism(4);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java
index 887704c..931fffb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java
@@ -31,6 +31,7 @@ import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -112,6 +113,7 @@ public class MultifieldIndexQueryTest extends GridCommonAbstractTest {
CacheConfiguration<?, ?> ccfg = new CacheConfiguration<>()
.setName(CACHE)
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setIndexedTypes(Long.class, Person.class)
.setQueryParallelism(4);