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 2015/09/29 08:52:59 UTC
ignite git commit: Added tests.
Repository: ignite
Updated Branches:
refs/heads/master c6bb01b49 -> ce3f20be6
Added tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce3f20be
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce3f20be
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce3f20be
Branch: refs/heads/master
Commit: ce3f20be6d1950fa182f1622b92984b465ae27cd
Parents: c6bb01b
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 29 09:52:46 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 29 09:52:46 2015 +0300
----------------------------------------------------------------------
.../IgniteCrossCacheTxNearEnabledSelfTest.java | 28 +++
.../dht/IgniteCrossCacheTxSelfTest.java | 213 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
3 files changed, 243 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
new file mode 100644
index 0000000..f70cedf
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxNearEnabledSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.distributed.dht;
+
+/**
+ *
+ */
+public class IgniteCrossCacheTxNearEnabledSelfTest extends IgniteCrossCacheTxSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean nearEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
new file mode 100644
index 0000000..bf9b1c6
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -0,0 +1,213 @@
+/*
+ * 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.distributed.dht;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+import org.jsr166.ThreadLocalRandom8;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+
+/**
+ * Tests specific combinations of cross-cache transactions.
+ */
+public class IgniteCrossCacheTxSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final String FIRST_CACHE = "FirstCache";
+
+ /** */
+ private static final String SECOND_CACHE = "SecondCache";
+
+ /** */
+ private static final int TX_CNT = 500;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ return cfg;
+ }
+
+ /**
+ * @return Node count for this test.
+ */
+ private int nodeCount() {
+ return 4;
+ }
+
+ /**
+ * @return {@code True} if near cache should be enabled.
+ */
+ protected boolean nearEnabled() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
+ @Override protected void beforeTestsStarted() throws Exception {
+ startGridsMultiThreaded(nodeCount());
+
+ CacheConfiguration firstCfg = new CacheConfiguration(FIRST_CACHE);
+ firstCfg.setBackups(1);
+ firstCfg.setAtomicityMode(TRANSACTIONAL);
+ firstCfg.setWriteSynchronizationMode(FULL_SYNC);
+
+ grid(0).createCache(firstCfg);
+
+ CacheConfiguration secondCfg = new CacheConfiguration(SECOND_CACHE);
+ secondCfg.setBackups(1);
+ secondCfg.setAtomicityMode(TRANSACTIONAL);
+ secondCfg.setWriteSynchronizationMode(FULL_SYNC);
+
+ if (nearEnabled())
+ secondCfg.setNearConfiguration(new NearCacheConfiguration());
+
+ grid(0).createCache(secondCfg);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPessimisticReadCommitted() throws Exception {
+ checkTxsSingleOp(PESSIMISTIC, READ_COMMITTED);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPessimisticRepeatableRead() throws Exception {
+ checkTxsSingleOp(PESSIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testOptimisticReadCommitted() throws Exception {
+ checkTxsSingleOp(OPTIMISTIC, READ_COMMITTED);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testOptimisticRepeatableRead() throws Exception {
+ checkTxsSingleOp(OPTIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @param concurrency Concurrency.
+ * @param isolation Isolation.
+ * @throws Exception If failed.
+ */
+ private void checkTxsSingleOp(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception {
+ Map<Integer, String> firstCheck = new HashMap<>();
+ Map<Integer, String> secondCheck = new HashMap<>();
+
+ for (int i = 0; i < TX_CNT; i++) {
+ int grid = ThreadLocalRandom8.current().nextInt(nodeCount());
+
+ try (Transaction tx = grid(grid).transactions().txStart(concurrency, isolation)) {
+ try {
+ IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
+ IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
+
+ int size = ThreadLocalRandom8.current().nextInt(24) + 1;
+
+ for (int k = 0; k < size; k++) {
+ boolean rnd = ThreadLocalRandom8.current().nextBoolean();
+
+ IgniteCache<Integer, String> cache = rnd ? first : second;
+ Map<Integer, String> check = rnd ? firstCheck : secondCheck;
+
+ String val = rnd ? "first" + i : "second" + i;
+
+ cache.put(k, val);
+ check.put(k, val);
+ }
+
+ tx.commit();
+ }
+ catch (Throwable e) {
+ e.printStackTrace();
+
+ throw e;
+ }
+ }
+
+ if (i > 0 && i % 100 == 0)
+ info("Finished iteration: " + i);
+ }
+
+ for (int g = 0; g < nodeCount(); g++) {
+ IgniteEx grid = grid(g);
+
+ assertEquals(0, grid.context().cache().context().tm().idMapSize());
+
+ ClusterNode locNode = grid.localNode();
+
+ IgniteCache<Object, Object> firstCache = grid.cache(FIRST_CACHE);
+
+ for (Map.Entry<Integer, String> entry : firstCheck.entrySet()) {
+ boolean primary = grid.affinity(FIRST_CACHE).isPrimary(locNode, entry.getKey());
+
+ boolean backup = grid.affinity(FIRST_CACHE).isBackup(locNode, entry.getKey());
+
+ assertEquals("Invalid value found first cache [primary=" + primary + ", backup=" + backup +
+ ", node=" + locNode.id() + ", key=" + entry.getKey() + ']',
+ entry.getValue(), firstCache.get(entry.getKey()));
+ }
+
+ for (Map.Entry<Integer, String> entry : secondCheck.entrySet()) {
+ boolean primary = grid.affinity(SECOND_CACHE).isPrimary(locNode, entry.getKey());
+
+ boolean backup = grid.affinity(SECOND_CACHE).isBackup(locNode, entry.getKey());
+
+ assertEquals("Invalid value found second cache [primary=" + primary + ", backup=" + backup +
+ ", node=" + locNode.id() + ", key=" + entry.getKey() + ']',
+ entry.getValue(), grid.cache(SECOND_CACHE).get(entry.getKey()));
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce3f20be/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index 80d53e9..3842336 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -81,6 +81,7 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheNoValueClass
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtTxPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheLockFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheMultiTxLockSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCrossCacheTxSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearReadCommittedTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridReplicatedTxPreloadTest;
@@ -273,6 +274,7 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(IgniteDynamicCacheFilterTest.class);
suite.addTestSuite(CrossCacheLockTest.class);
+ suite.addTestSuite(IgniteCrossCacheTxSelfTest.class);
return suite;
}