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/04/09 16:59:48 UTC
[32/50] [abbrv] incubator-ignite git commit: #ignite-180: fix
comments after review.
#ignite-180: fix comments after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5720aedb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5720aedb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5720aedb
Branch: refs/heads/ignite-673
Commit: 5720aedbb3fead0d7e37066684fb76b705291569
Parents: 8b2324f
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Apr 9 12:09:12 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Apr 9 12:09:12 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/datastructures/IgniteQueueExample.java | 5 +++--
.../ignite/examples/datastructures/IgniteSetExample.java | 8 +++++---
.../cache/datastructures/GridCacheQueueCleanupSelfTest.java | 3 ++-
.../GridCacheQueueMultiNodeConsistencySelfTest.java | 3 ++-
.../cache/datastructures/GridCacheSetAbstractSelfTest.java | 1 -
.../datastructures/IgniteDataStructureUniqueNameTest.java | 3 ++-
.../local/GridCacheLocalAtomicOffheapSetSelfTest.java | 4 +++-
.../local/GridCacheLocalAtomicQueueApiSelfTest.java | 3 ++-
.../local/GridCacheLocalAtomicSetSelfTest.java | 3 ++-
.../local/GridCacheLocalOffheapQueueApiSelfTest.java | 4 +++-
.../datastructures/local/GridCacheLocalQueueApiSelfTest.java | 3 ++-
.../datastructures/local/GridCacheLocalSetSelfTest.java | 3 ++-
.../GridCachePartitionedAtomicOffheapQueueApiSelfTest.java | 4 +++-
...PartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java | 4 +++-
...dCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java | 4 +++-
.../GridCachePartitionedAtomicQueueApiSelfTest.java | 3 ++-
...idCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java | 3 ++-
...artitionedAtomicQueueFailoverDataConsistencySelfTest.java | 3 ++-
.../GridCachePartitionedAtomicQueueMultiNodeSelfTest.java | 3 ++-
...GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java | 3 ++-
.../GridCachePartitionedAtomicSetFailoverSelfTest.java | 3 ++-
.../GridCachePartitionedDataStructuresFailoverSelfTest.java | 3 ++-
.../GridCachePartitionedOffHeapValuesQueueApiSelfTest.java | 4 +++-
.../GridCachePartitionedOffHeapValuesSetSelfTest.java | 4 +++-
...achePartitionedOffheapDataStructuresFailoverSelfTest.java | 4 +++-
.../GridCachePartitionedOffheapSetFailoverSelfTest.java | 4 +++-
.../partitioned/GridCachePartitionedQueueApiSelfTest.java | 3 ++-
.../GridCachePartitionedQueueCreateMultiNodeSelfTest.java | 3 ++-
.../GridCachePartitionedQueueEntryMoveSelfTest.java | 3 ++-
...CachePartitionedQueueFailoverDataConsistencySelfTest.java | 3 ++-
.../GridCachePartitionedQueueJoinedNodeSelfTest.java | 3 ++-
.../GridCachePartitionedQueueMultiNodeSelfTest.java | 3 ++-
.../GridCachePartitionedQueueRotativeMultiNodeTest.java | 3 ++-
.../partitioned/GridCachePartitionedSetFailoverSelfTest.java | 3 ++-
.../partitioned/GridCachePartitionedSetSelfTest.java | 3 ++-
.../GridCacheReplicatedDataStructuresFailoverSelfTest.java | 3 ++-
.../replicated/GridCacheReplicatedQueueApiSelfTest.java | 3 ++-
.../GridCacheReplicatedQueueMultiNodeSelfTest.java | 3 ++-
.../GridCacheReplicatedQueueRotativeMultiNodeTest.java | 3 ++-
.../replicated/GridCacheReplicatedSetSelfTest.java | 3 ++-
.../testsuites/IgniteCacheDataStructuresSelfTestSuite.java | 2 +-
41 files changed, 92 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
index fae9523..79067e6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteQueueExample.java
@@ -18,13 +18,14 @@
package org.apache.ignite.examples.datastructures;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import java.util.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
/**
* Ignite cache distributed queue example. This example demonstrates {@code FIFO} unbounded
* cache queue.
@@ -79,7 +80,7 @@ public class IgniteQueueExample {
private static IgniteQueue<String> initializeQueue(Ignite ignite, String queueName) throws IgniteException {
CollectionConfiguration colCfg = new CollectionConfiguration();
- colCfg.setCacheMode(CacheMode.PARTITIONED);
+ colCfg.setCacheMode(PARTITIONED);
// Initialize new FIFO queue.
IgniteQueue<String> queue = ignite.queue(queueName, 0, colCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
index 29f7f37..8d4fc89 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteSetExample.java
@@ -18,13 +18,15 @@
package org.apache.ignite.examples.datastructures;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import java.util.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
/**
* Ignite cache distributed set example.
* <p>
@@ -73,8 +75,8 @@ public class IgniteSetExample {
private static IgniteSet<String> initializeSet(Ignite ignite, String setName) throws IgniteException {
CollectionConfiguration setCfg = new CollectionConfiguration();
- setCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- setCfg.setCacheMode(CacheMode.PARTITIONED);
+ setCfg.setAtomicityMode(TRANSACTIONAL);
+ setCfg.setCacheMode(PARTITIONED);
// Initialize new set.
IgniteSet<String> set = ignite.set(setName, setCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index 8bf30fa..f25c0e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -32,6 +32,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -56,7 +57,7 @@ public class GridCacheQueueCleanupSelfTest extends IgniteCollectionAbstractTest
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
index 495bcef..2232493 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.resources.*;
import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeAbstractSelfTest.*;
@@ -69,7 +70,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 8da3234..fe5892e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
import junit.framework.*;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
index 1255153..5e66ccb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
@@ -29,6 +29,7 @@ import java.util.*;
import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -47,7 +48,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
index 394eaab..bffd80a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicOffheapSetSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Set tests.
*/
public class GridCacheLocalAtomicOffheapSetSelfTest extends GridCacheLocalAtomicSetSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
index 51c08a0..3cb4dab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Queue tests with local atomic cache.
@@ -27,7 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
public class GridCacheLocalAtomicQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
index d149a06..688417f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -39,7 +40,7 @@ public class GridCacheLocalAtomicSetSelfTest extends GridCacheSetAbstractSelfTes
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
index c8e5bf7..441e89e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalOffheapQueueApiSelfTest.java
@@ -18,12 +18,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Queue tests with local cache.
*/
public class GridCacheLocalOffheapQueueApiSelfTest extends GridCacheLocalQueueApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
index 837c94b..7b6e0d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCacheLocalQueueApiSelfTest extends GridCacheQueueApiSelfAbstrac
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
index b312a65..580d770 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -39,7 +40,7 @@ public class GridCacheLocalSetSelfTest extends GridCacheSetAbstractSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
index f571f60..84dabda 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueApiSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Queue tests with partitioned atomic cache.
*/
public class GridCachePartitionedAtomicOffheapQueueApiSelfTest extends GridCachePartitionedAtomicQueueApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
index 9c31319..f29a752 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.java
@@ -18,6 +18,8 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
*
*/
@@ -25,6 +27,6 @@ public class GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest
extends GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
index 5efc2ed..8004dde 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Queue multi node test.
*/
public class GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest extends GridCachePartitionedAtomicQueueMultiNodeSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
index 02fc8ad..01be8c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Queue tests with partitioned atomic cache.
@@ -27,7 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
public class GridCachePartitionedAtomicQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
index 1b36a74..e2cebec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
*
@@ -28,7 +29,7 @@ public class GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest
extends GridCachePartitionedQueueCreateMultiNodeSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
index 1772d5f..85aedf8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Queue failover test for atomic cache.
@@ -29,7 +30,7 @@ public class GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest exte
GridCacheAbstractQueueFailoverDataConsistencySelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
index 914f7d2..cc4eb68 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueMultiNodeSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Queue multi node test.
@@ -27,7 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
public class GridCachePartitionedAtomicQueueMultiNodeSelfTest extends GridCachePartitionedQueueMultiNodeSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
index 7451e38..ed12d52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Sequence multi node tests.
@@ -28,7 +29,7 @@ public class GridCachePartitionedAtomicQueueRotativeMultiNodeTest extends
GridCachePartitionedQueueRotativeMultiNodeTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
index 771d685..f453aa8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Set failover tests.
@@ -28,7 +29,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
public class GridCachePartitionedAtomicSetFailoverSelfTest extends GridCacheSetFailoverAbstractSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
index fdb344d..519148e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -35,7 +36,7 @@ public class GridCachePartitionedDataStructuresFailoverSelfTest
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
index 1cffd46..f844bf3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesQueueApiSelfTest.java
@@ -18,12 +18,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Queue tests with partitioned cache.
*/
public class GridCachePartitionedOffHeapValuesQueueApiSelfTest extends GridCachePartitionedQueueApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_VALUES;
+ return OFFHEAP_VALUES;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
index 7c6041f..0c7f973 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffHeapValuesSetSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Set tests with off-heap values cache memory mode.
*/
public class GridCachePartitionedOffHeapValuesSetSelfTest extends GridCachePartitionedSetSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_VALUES;
+ return OFFHEAP_VALUES;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
index e729e96..9878693 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapDataStructuresFailoverSelfTest.java
@@ -19,13 +19,15 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Failover tests for cache data structures.
*/
public class GridCachePartitionedOffheapDataStructuresFailoverSelfTest extends GridCachePartitionedDataStructuresFailoverSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
index 0b28dd8..bf1866f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedOffheapSetFailoverSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+
/**
* Set failover tests.
*/
public class GridCachePartitionedOffheapSetFailoverSelfTest extends GridCachePartitionedSetFailoverSelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
index 41d8417..dd095a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueApiSelfTest extends GridCacheQueueApiSelfA
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 4bbbf8c..5b6627e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
@@ -52,7 +53,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index 92b61f4..13363cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@ -33,6 +33,7 @@ import java.util.*;
import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -63,7 +64,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends IgniteCollection
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
index 495036e..4b809e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Queue failover test for transactional cache.
@@ -29,7 +30,7 @@ public class GridCachePartitionedQueueFailoverDataConsistencySelfTest extends
GridCacheAbstractQueueFailoverDataConsistencySelfTest {
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
index b3a575f..5681c01 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueJoinedNodeSelfTest extends GridCacheQueueJ
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
index bdf7f95..c336209 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueMultiNodeSelfTest extends GridCacheQueueMu
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
index 0807d46..3fbfda5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCachePartitionedQueueRotativeMultiNodeTest extends GridCacheQue
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index 68659c1..2186afb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
/**
* Set failover tests.
@@ -33,6 +34,6 @@ public class GridCachePartitionedSetFailoverSelfTest extends GridCacheSetFailove
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
index a76fec1..0eb989d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCachePartitionedSetSelfTest extends GridCacheSetAbstractSelfTes
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
index f2dbdcf..46e458b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -35,7 +36,7 @@ public class GridCacheReplicatedDataStructuresFailoverSelfTest
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
index 0a854cc..8933fbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedQueueApiSelfTest extends GridCacheQueueApiSelfAb
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.OFFHEAP_TIERED;
+ return OFFHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
index 5969bcd..ecaf704 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedQueueMultiNodeSelfTest extends GridCacheQueueMul
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
index d013c2f..07781f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedQueueRotativeMultiNodeTest extends GridCacheQueu
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
index 897660c..3473e32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.datastructures.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
/**
@@ -34,7 +35,7 @@ public class GridCacheReplicatedSetSelfTest extends GridCacheSetAbstractSelfTest
/** {@inheritDoc} */
@Override protected CacheMemoryMode collectionMemoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
+ return ONHEAP_TIERED;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5720aedb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index d17b3db..4c40e75 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -68,7 +68,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class));
- // TODO: IGNITE-180.
+ // TODO: IGNITE-80.
//suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
//suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
//suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));