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 2017/05/22 15:13:10 UTC
[42/50] [abbrv] ignite git commit: Merge branch ignite-gg-8.0.4.ea2
into ignite-gg-12163
Merge branch ignite-gg-8.0.4.ea2 into ignite-gg-12163
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1924873b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1924873b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1924873b
Branch: refs/heads/ignite-5075-pds
Commit: 1924873b26d0704eb188faa3d6f4e6a4730ac126
Parents: 930c87c
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri May 19 19:50:04 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri May 19 19:50:04 2017 +0300
----------------------------------------------------------------------
modules/pds/pom.xml | 2 +-
.../IgnitePersistentStoreWalTlbSelfTest.java | 7 +++++--
.../DbPageEvictionDuringPartitionClearSelfTest.java | 2 +-
.../db/IgniteDbMultiNodePutGetRestartSelfTest.java | 9 ++++++---
.../database/db/IgniteDbPageEvictionSelfTest.java | 7 +++++--
.../db/RebalancingOnNotStableTopologyTest.java | 10 ++++++----
.../IgniteCachePageStoreIntegrationSelfTest.java | 15 +++++++++------
.../db/file/IgniteNoActualWalHistorySelfTest.java | 9 ++++++---
.../database/db/file/PageStoreEvictionSelfTest.java | 2 +-
.../db/file/WalRecoveryTxLogicalRecordsTest.java | 7 +++++--
10 files changed, 45 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pds/pom.xml b/modules/pds/pom.xml
index c3bcec6..01385a2 100644
--- a/modules/pds/pom.xml
+++ b/modules/pds/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-pds</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<properties>
<common.io.version>2.4</common.io.version>
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java
index 692117d..d720e87 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java
@@ -41,11 +41,14 @@ public class IgnitePersistentStoreWalTlbSelfTest extends GridCommonAbstractTest
/** Ip finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+ /** Cache name. */
+ private static final String CACHE_NAME = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(CACHE_NAME);
cfg.setCacheConfiguration(ccfg);
@@ -119,7 +122,7 @@ public class IgnitePersistentStoreWalTlbSelfTest extends GridCommonAbstractTest
boolean locked = true;
try {
- IgniteDataStreamer<Integer, Integer> streamer = ig.dataStreamer(null);
+ IgniteDataStreamer<Integer, Integer> streamer = ig.dataStreamer(CACHE_NAME);
for (int i = 0; i < 100_000; i++) {
streamer.addData(i, 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java
index dfbc548..05067bd 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java
@@ -48,7 +48,7 @@ public class DbPageEvictionDuringPartitionClearSelfTest extends GridCommonAbstra
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- CacheConfiguration ccfg = new CacheConfiguration("cache")
+ CacheConfiguration ccfg = new CacheConfiguration(CACHE_NAME)
.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)
.setAffinity(new RendezvousAffinityFunction(false, 128))
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java
index d9f9a54..a0fc4bd 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java
@@ -55,6 +55,9 @@ public class IgniteDbMultiNodePutGetRestartSelfTest extends GridCommonAbstractTe
/** */
private static final int GRID_CNT = 3;
+ /** */
+ private static final String CACHE_NAME = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -72,7 +75,7 @@ public class IgniteDbMultiNodePutGetRestartSelfTest extends GridCommonAbstractTe
cfg.setMemoryConfiguration(dbCfg);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(CACHE_NAME);
ccfg.setIndexedTypes(Integer.class, DbValue.class);
@@ -161,10 +164,10 @@ public class IgniteDbMultiNodePutGetRestartSelfTest extends GridCommonAbstractTe
* @param write Write.
*/
private void checkPutGetSql(IgniteEx ig, boolean write) {
- IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ IgniteCache<Integer, DbValue> cache = ig.cache(CACHE_NAME);
if (write) {
- try (IgniteDataStreamer<Object, Object> streamer = ig.dataStreamer(null)) {
+ try (IgniteDataStreamer<Object, Object> streamer = ig.dataStreamer(CACHE_NAME)) {
for (int i = 0; i < 10_000; i++)
streamer.addData(i, new DbValue(i, "value-" + i, i));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java
index b7a5773..1d1ca46 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java
@@ -50,6 +50,9 @@ public class IgniteDbPageEvictionSelfTest extends GridCommonAbstractTest {
/** Test entry count. */
public static final int ENTRY_CNT = 1_000_000;
+ /** Cache name. */
+ private static final String CACHE_NAME = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -116,7 +119,7 @@ public class IgniteDbPageEvictionSelfTest extends GridCommonAbstractTest {
public void testPageEvictionSql() throws Exception {
IgniteEx ig = grid(0);
- try (IgniteDataStreamer<DbKey, DbValue> streamer = ig.dataStreamer(null)) {
+ try (IgniteDataStreamer<DbKey, DbValue> streamer = ig.dataStreamer(CACHE_NAME)) {
for (int i = 0; i < ENTRY_CNT; i++) {
streamer.addData(new DbKey(i), new DbValue(i, "value-" + i, Long.MAX_VALUE - i));
@@ -125,7 +128,7 @@ public class IgniteDbPageEvictionSelfTest extends GridCommonAbstractTest {
}
}
- IgniteCache<DbKey, DbValue> cache = ignite(0).cache(null);
+ IgniteCache<DbKey, DbValue> cache = ignite(0).cache(CACHE_NAME);
for (int i = 0; i < ENTRY_CNT; i++) {
assertEquals(Long.MAX_VALUE - i, cache.get(new DbKey(i)).lVal);
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java
index d8df973..d638570 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java
@@ -49,6 +49,9 @@ public class RebalancingOnNotStableTopologyTest extends GridCommonAbstractTest {
/** Cluster size. */
private static final int CLUSTER_SIZE = 5;
+ /** */
+ private static final String CACHE_NAME = "cache1";
+
/**
* @throws Exception When fails.
*/
@@ -76,7 +79,7 @@ public class RebalancingOnNotStableTopologyTest extends GridCommonAbstractTest {
startLatch.countDown();
- IgniteCache<Object, Object> cache1 = ex1.cache("cache1");
+ IgniteCache<Object, Object> cache1 = ex1.cache(CACHE_NAME);
int key = keyCnt.get();
@@ -136,7 +139,7 @@ public class RebalancingOnNotStableTopologyTest extends GridCommonAbstractTest {
checkTopology(CLUSTER_SIZE);
- IgniteCache<Object, Object> cache1 = ex.cache("cache1");
+ IgniteCache<Object, Object> cache1 = ex.cache(CACHE_NAME);
assert keyCnt.get() > 0;
@@ -152,9 +155,8 @@ public class RebalancingOnNotStableTopologyTest extends GridCommonAbstractTest {
cfg.setActiveOnStart(false);
- CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(CACHE_NAME);
- ccfg.setName("cache1");
ccfg.setPartitionLossPolicy(PartitionLossPolicy.READ_ONLY_SAFE);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
ccfg.setCacheMode(CacheMode.PARTITIONED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java
index 9107b1c..c0416d9 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java
@@ -56,6 +56,9 @@ public class IgniteCachePageStoreIntegrationSelfTest extends GridCommonAbstractT
/** */
private static final int GRID_CNT = 3;
+ /** */
+ private static final String CACHE_NAME = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -77,7 +80,7 @@ public class IgniteCachePageStoreIntegrationSelfTest extends GridCommonAbstractT
cfg.setMemoryConfiguration(dbCfg);
- CacheConfiguration ccfg = new CacheConfiguration();
+ CacheConfiguration ccfg = new CacheConfiguration(CACHE_NAME);
ccfg.setIndexedTypes(Integer.class, DbValue.class);
@@ -167,7 +170,7 @@ public class IgniteCachePageStoreIntegrationSelfTest extends GridCommonAbstractT
GridTestUtils.runMultiThreaded(new Callable<Object>() {
@Override public Object call() throws Exception {
for (int i = 0; i < 1000; i++)
- grid.cache(null).put(i, i);
+ grid.cache(CACHE_NAME).put(i, i);
return null;
}
@@ -183,12 +186,12 @@ public class IgniteCachePageStoreIntegrationSelfTest extends GridCommonAbstractT
* @param write Write flag.
*/
private void checkPutGetSql(Ignite ig, boolean write) {
- IgniteCache<Integer, DbValue> cache = ig.cache(null);
+ IgniteCache<Integer, DbValue> cache = ig.cache(CACHE_NAME);
int entryCnt = 50_000;
if (write) {
- try (IgniteDataStreamer<Object, Object> streamer = ig.dataStreamer(null)) {
+ try (IgniteDataStreamer<Object, Object> streamer = ig.dataStreamer(CACHE_NAME)) {
streamer.allowOverwrite(true);
for (int i = 0; i < entryCnt; i++)
@@ -199,12 +202,12 @@ public class IgniteCachePageStoreIntegrationSelfTest extends GridCommonAbstractT
for (int i = 0; i < GRID_CNT; i++) {
IgniteEx ignite = grid(i);
- GridCacheAdapter<Object, Object> cache0 = ignite.context().cache().internalCache(null);
+ GridCacheAdapter<Object, Object> cache0 = ignite.context().cache().internalCache(CACHE_NAME);
for (int k = 0; k < entryCnt; k++)
assertNull(cache0.peekEx(i));
- assertEquals(entryCnt, ignite.cache(null).size());
+ assertEquals(entryCnt, ignite.cache(CACHE_NAME).size());
}
for (int i = 0; i < entryCnt; i++)
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java
index c53766c..f98bded 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java
@@ -42,11 +42,14 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
*
*/
public class IgniteNoActualWalHistorySelfTest extends GridCommonAbstractTest {
+ /** Cache name. */
+ private static final String CACHE_NAME = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- CacheConfiguration<Integer, IndexedObject> ccfg = new CacheConfiguration<>();
+ CacheConfiguration<Integer, IndexedObject> ccfg = new CacheConfiguration<>(CACHE_NAME);
ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
@@ -104,7 +107,7 @@ public class IgniteNoActualWalHistorySelfTest extends GridCommonAbstractTest {
try {
IgniteEx ignite = startGrid(1);
- IgniteCache<Object, Object> cache = ignite.cache(null);
+ IgniteCache<Object, Object> cache = ignite.cache(CACHE_NAME);
Random rnd = new Random();
@@ -147,7 +150,7 @@ public class IgniteNoActualWalHistorySelfTest extends GridCommonAbstractTest {
ignite = startGrid(1);
- cache = ignite.cache(null);
+ cache = ignite.cache(CACHE_NAME);
// Check.
for (Integer k : map.keySet())
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
index 275ed3f..1c43582 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.MemoryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.MemoryConfiguration;
import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.configuration.PersistenceConfiguration;
import org.apache.ignite.internal.IgniteEx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/1924873b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java
index e3e35a7..8b78c21 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java
@@ -71,6 +71,9 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
/** Cache name. */
private static final String CACHE_NAME = "cache";
+ /** Cache 2 name. */
+ private static final String CACHE2_NAME = "cache2";
+
/** */
public static final int PARTS = 32;
@@ -297,7 +300,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
* @throws Exception if failed.
*/
public void testRebalanceIterator() throws Exception {
- extraCcfg = new CacheConfiguration(CACHE_NAME + "2");
+ extraCcfg = new CacheConfiguration(CACHE2_NAME);
extraCcfg.setAffinity(new RendezvousAffinityFunction(false, PARTS));
Ignite ignite = startGrid();
@@ -312,7 +315,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
int entries = 25;
IgniteCache<Integer, Integer> cache = ignite.cache(CACHE_NAME);
- IgniteCache<Integer, Integer> cache2 = ignite.cache(CACHE_NAME + "2");
+ IgniteCache<Integer, Integer> cache2 = ignite.cache(CACHE2_NAME);
for (int i = 0; i < entries; i++) {
// Put to partition 0.