ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/16] incubator-ignite git commit: # ignite-6
Date Mon, 26 Jan 2015 14:18:51 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-6 [created] c1c60c7ea


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
index ea1d2ed..42c09bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
@@ -147,7 +147,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      */
     public void testLatchLocal() throws Exception {
         // Test main functionality.
-        CacheCountDownLatch latch = grid(0).cache("local").dataStructures().countDownLatch("latch", 2, false,
+        IgniteCountDownLatch latch = grid(0).cache("local").dataStructures().countDownLatch("latch", 2, false,
             true);
 
         assert latch.count() == 2;
@@ -155,7 +155,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
         IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
             new Callable<Object>() {
                 @Nullable @Override public Object call() throws Exception {
-                    CacheCountDownLatch latch = grid(0).cache("local").dataStructures()
+                    IgniteCountDownLatch latch = grid(0).cache("local").dataStructures()
                         .countDownLatch("latch", 2, false, true);
 
                     assert latch != null && latch.count() == 2;
@@ -203,7 +203,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
         checkCountDown(cacheName);
 
         // Test main functionality.
-        CacheCountDownLatch latch1 = grid(0).cache(cacheName).dataStructures().countDownLatch("latch", 2, false,
+        IgniteCountDownLatch latch1 = grid(0).cache(cacheName).dataStructures().countDownLatch("latch", 2, false,
             true);
 
         assert latch1.count() == 2;
@@ -222,7 +222,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
                 IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(
                     new Callable<Object>() {
                         @Nullable @Override public Object call() throws Exception {
-                            CacheCountDownLatch latch = ignite.cache(cacheName).dataStructures()
+                            IgniteCountDownLatch latch = ignite.cache(cacheName).dataStructures()
                                 .countDownLatch("latch", 2, false, true);
 
                             assert latch != null && latch.count() == 2;
@@ -268,7 +268,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      *
      * @throws Exception If failed.
      */
-    private void checkRemovedLatch(CacheCountDownLatch latch) throws Exception {
+    private void checkRemovedLatch(IgniteCountDownLatch latch) throws Exception {
         assert latch.removed();
 
         assert latch.count() == 0;
@@ -291,14 +291,14 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      * @throws Exception Exception.
      */
     private void checkAutoDelete(String cacheName) throws Exception {
-        CacheCountDownLatch latch = createLatch(cacheName, "rmv", 5, true);
+        IgniteCountDownLatch latch = createLatch(cacheName, "rmv", 5, true);
 
         latch.countDownAll();
 
         // Latch should be removed since autoDelete = true
         checkRemovedLatch(latch);
 
-        CacheCountDownLatch latch1 = createLatch(cacheName, "rmv1", 5, false);
+        IgniteCountDownLatch latch1 = createLatch(cacheName, "rmv1", 5, false);
 
         latch1.countDownAll();
 
@@ -314,7 +314,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      */
     private void checkAwait(String cacheName) throws Exception {
         // Check only 'false' cases here. Successful await is tested over the grid.
-        CacheCountDownLatch latch = createLatch(cacheName, "await", 5, true);
+        IgniteCountDownLatch latch = createLatch(cacheName, "await", 5, true);
 
         assert !latch.await(10);
         assert !latch.await(10, MILLISECONDS);
@@ -327,7 +327,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      * @throws Exception Exception.
      */
     private void checkCountDown(String cacheName) throws Exception {
-        CacheCountDownLatch latch = createLatch(cacheName, "cnt", 10, true);
+        IgniteCountDownLatch latch = createLatch(cacheName, "cnt", 10, true);
 
         assert latch.countDown() == 9;
         assert latch.countDown(2) == 7;
@@ -338,7 +338,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
 
         checkRemovedLatch(latch);
 
-        CacheCountDownLatch latch1 = createLatch(cacheName, "cnt1", 10, true);
+        IgniteCountDownLatch latch1 = createLatch(cacheName, "cnt1", 10, true);
 
         assert latch1.countDown() == 9;
         assert latch1.countDown(2) == 7;
@@ -358,9 +358,9 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      * @throws Exception If failed.
      * @return New latch.
      */
-    private CacheCountDownLatch createLatch(String cacheName, String latchName, int cnt, boolean autoDel)
+    private IgniteCountDownLatch createLatch(String cacheName, String latchName, int cnt, boolean autoDel)
         throws Exception {
-        CacheCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
+        IgniteCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
             .countDownLatch(latchName, cnt, autoDel, true);
 
         // Test initialization.
@@ -379,7 +379,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
      */
     private void removeLatch(String cacheName, String latchName)
         throws Exception {
-        CacheCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
+        IgniteCountDownLatch latch = grid(RND.nextInt(NODES_CNT)).cache(cacheName).dataStructures()
             .countDownLatch(latchName, 10, false, true);
 
         assert latch != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
index b739318..33b82dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
@@ -59,9 +59,9 @@ public class GridCacheMultiNodeDataStructureTest {
     private static void sample(Ignite g, String cacheName) throws IgniteCheckedException {
         GridCache<Long, Object> cache = g.cache(cacheName);
 
-        CacheAtomicLong atomicLong = cache.dataStructures().atomicLong("keygen", 0, true);
+        IgniteAtomicLong atomicLong = cache.dataStructures().atomicLong("keygen", 0, true);
 
-        CacheAtomicSequence seq = cache.dataStructures().atomicSequence("keygen", 0, true);
+        IgniteAtomicSequence seq = cache.dataStructures().atomicSequence("keygen", 0, true);
 
         seq.incrementAndGet();
         seq.incrementAndGet();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
index 88b9991..fd118be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java
@@ -80,9 +80,9 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         String queueName1 = UUID.randomUUID().toString();
         String queueName2 = UUID.randomUUID().toString();
 
-        CacheQueue queue1 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
-        CacheQueue queue2 = grid().cache(null).dataStructures().queue(queueName2, 0, false, true);
-        CacheQueue queue3 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
+        IgniteQueue queue1 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
+        IgniteQueue queue2 = grid().cache(null).dataStructures().queue(queueName2, 0, false, true);
+        IgniteQueue queue3 = grid().cache(null).dataStructures().queue(queueName1, 0, false, true);
 
         assertNotNull(queue1);
         assertNotNull(queue2);
@@ -108,7 +108,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         String val = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        IgniteQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assert queue.add(val);
 
@@ -126,7 +126,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         String val = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        IgniteQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assert queue.add(val);
 
@@ -145,7 +145,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         String queueName = UUID.randomUUID().toString();
 
         // TODO was LIFO
-        CacheQueue<SameHashItem> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        IgniteQueue<SameHashItem> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         int retries = 100;
 
@@ -221,7 +221,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        IgniteQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assert queue.add("1");
 
@@ -243,7 +243,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, true, true);
+        IgniteQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, true, true);
 
         String item1 = "1";
         assert queue.add(item1);
@@ -268,7 +268,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
+        IgniteQueue<String> queue = grid().cache(null).dataStructures().queue(queueName, 0, false, true);
 
         for (int i = 0; i < 100; i++)
             assert queue.add(Integer.toString(i));
@@ -324,7 +324,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures()
+        IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         String thName = Thread.currentThread().getName();
@@ -347,7 +347,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final CacheQueue<String> queue = grid().cache(null).dataStructures()
+        final IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         multithreaded(new Callable<String>() {
@@ -376,7 +376,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final CacheQueue<String> queue = grid().cache(null).dataStructures()
+        final IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         multithreaded(new Callable<String>() {
@@ -406,7 +406,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         final AtomicInteger rmvNum = new AtomicInteger(0);
 
-        final CacheQueue<String> queue = grid().cache(null).dataStructures()
+        final IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         final CountDownLatch putLatch = new CountDownLatch(THREAD_NUM);
@@ -494,7 +494,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
 
         final AtomicInteger rmvNum = new AtomicInteger(0);
 
-        final CacheQueue<String> queue = grid().cache(null).dataStructures()
+        final IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, false, true);
 
         final CountDownLatch takeLatch = new CountDownLatch(THREAD_NUM);
@@ -615,7 +615,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<String> queue = grid().cache(null).dataStructures()
+        IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, 0, false, true);
 
         String thread = Thread.currentThread().getName();
@@ -641,7 +641,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final CacheQueue<String> queue = grid().cache(null).dataStructures()
+        final IgniteQueue<String> queue = grid().cache(null).dataStructures()
             .queue(queueName, 0, false, true);
 
         multithreaded(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/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 b123402..4279645 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
@@ -77,7 +77,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testCleanup() throws Exception {
-        CacheQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME1, 0, false, true);
+        IgniteQueue<Integer> queue = cache().dataStructures().queue(QUEUE_NAME1, 0, false, true);
 
         ClusterNode node = grid(0).cache(null).affinity().mapKeyToNode(new GridCacheQueueHeaderKey(QUEUE_NAME1));
 
@@ -211,7 +211,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
     private IgniteFuture<?> startAddPollThread(final Ignite ignite, final AtomicBoolean stop, final String queueName) {
         return GridTestUtils.runAsync(new Callable<Void>() {
             @Override public Void call() throws Exception {
-                CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, false, true);
+                IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, false, true);
 
                 assertEquals(0, queue.size());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
index 36ecfe1..7d8e5ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java
@@ -76,7 +76,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
     public void testTakeFromJoined() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures()
+        IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures()
             .queue(queueName, 0, true, true);
 
         assertNotNull(queue);
@@ -175,7 +175,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
                 ", job=" + getClass().getSimpleName() + "]");
 
             try {
-                CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
+                IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
 
                 assertNotNull(queue);
 
@@ -269,7 +269,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo
             Integer lastPolled = null;
 
             try {
-                CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
+                IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, true, false);
 
                 assertNotNull(queue);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
index a480880..131474a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
@@ -138,7 +138,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
     public void testPut() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue.isEmpty());
@@ -184,7 +184,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                         F.nodeId8s(g.cache(null).affinity().mapKeyToPrimaryAndBackups(
                             new GridCacheInternalKeyImpl(queueName))) + ']');
 
-                    CacheQueue<Integer> q = g.cache(null).dataStructures().queue(queueName, 5, true, true);
+                    IgniteQueue<Integer> q = g.cache(null).dataStructures().queue(queueName, 5, true, true);
 
                     assert q.isEmpty();
 
@@ -217,7 +217,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                             F.nodeId8s(g1.cache(null).affinity().mapKeyToPrimaryAndBackups(
                                 new GridCacheInternalKeyImpl(queueName))) + ']');
 
-                        CacheQueue<Integer> q = g1.cache(null).dataStructures().queue(queueName, 5, true, true);
+                        IgniteQueue<Integer> q = g1.cache(null).dataStructures().queue(queueName, 5, true, true);
 
                         int cnt = 0;
                         int nullCnt = 0;
@@ -280,7 +280,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             GridCache c = grid(0).cache(null);
 
-            CacheQueue<Integer> queue = c.dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
+            IgniteQueue<Integer> queue = c.dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
 
             assertTrue(queue.isEmpty());
 
@@ -307,7 +307,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
         info("Queue name: " + queueName);
 
-        CacheQueue<String> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        IgniteQueue<String> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue.isEmpty());
@@ -331,7 +331,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
         info("Queue name: " + queueName);
 
-        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue.isEmpty());
@@ -374,7 +374,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                     @Override public Void call() throws Exception {
                         GridCache cache = grid(idx).cache(null);
 
-                        CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+                        IgniteQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
                         for (int i = 0; i < ITEMS_PER_THREAD; i++)
                             assertTrue(queue.add(i));
@@ -389,7 +389,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             GridCache cache = grid(0).cache(null);
 
-            CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+            IgniteQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
             assertEquals(THREADS_PER_NODE * ITEMS_PER_THREAD * GRID_CNT, queue.size());
 
@@ -445,7 +445,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                     @Override public Void call() throws Exception {
                         GridCache cache = grid(idx).cache(null);
 
-                        CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+                        IgniteQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
                         for (int i = 0; i < ITEMS_PER_THREAD; i++)
                             assertTrue(queue.add(i));
@@ -463,7 +463,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
                         @Override public Void call() throws Exception {
                             GridCache cache = grid(idx).cache(null);
 
-                            CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0,
+                            IgniteQueue<Integer> queue = cache.dataStructures().queue(queueName, 0,
                                 collocated, true);
 
                             while (!stopPoll.get()) {
@@ -489,7 +489,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             GridCache cache = grid(0).cache(null);
 
-            CacheQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
+            IgniteQueue<Integer> queue = cache.dataStructures().queue(queueName, 0, collocated, true);
 
             int[] resItems = new int[ITEMS_PER_THREAD];
 
@@ -522,7 +522,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
         info("Queue name: " + queueName);
 
-        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
+        IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY, false, true);
 
         assertTrue(queue.isEmpty());
 
@@ -543,7 +543,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
                     grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
 
-                    CacheQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName,
+                    IgniteQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName,
                         QUEUE_CAPACITY, false, true);
 
                     grid.log().info("Queue size " + locQueue.size());
@@ -570,7 +570,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
         // Random queue name.
         String queueName = UUID.randomUUID().toString();
 
-        final CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, 0, false, true);
+        final IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, 0, false, true);
 
         assertNotNull(queue);
 
@@ -594,7 +594,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
      * @param q Queue.
      * @param v Value.
      */
-    private static <T> void put(CacheQueue<T> q, T v) {
+    private static <T> void put(IgniteQueue<T> q, T v) {
         X.println("Putting value: " + v);
 
         q.put(v);
@@ -607,12 +607,12 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
      */
     private static class QueueJob implements Callable<Integer>, Serializable {
         /** */
-        private CacheQueue<Integer> queue;
+        private IgniteQueue<Integer> queue;
 
         /**
          * @param queue Queue.
          */
-        private QueueJob(CacheQueue<Integer> queue) {
+        private QueueJob(IgniteQueue<Integer> queue) {
             this.queue = queue;
         }
 
@@ -654,7 +654,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);
@@ -701,7 +701,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);
@@ -757,7 +757,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            CacheQueue<String> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            IgniteQueue<String> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);
@@ -809,7 +809,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']');
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                 false, true);
 
             assertNotNull(queue);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/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 d76f29e..bab3db3 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
@@ -204,7 +204,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
 
         final String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<Integer> queue0 = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        IgniteQueue<Integer> queue0 = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             false, true);
 
         assertTrue(queue0.isEmpty());
@@ -223,7 +223,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
         Ignite newIgnite = startGrid(GRID_CNT + 1);
 
         // Intentionally commented code cause in this way inconsistent queue problem doesn't appear.
-        // CacheQueue<Integer> newQueue = newGrid.cache().queue(queueName);
+        // IgniteQueue<Integer> newQueue = newGrid.cache().queue(queueName);
         // assertTrue(CollectionUtils.isEqualCollection(queue0, newQueue));
 
         Collection<Integer> locQueueContent = compute(newIgnite.cluster().forLocal()).call(new IgniteCallable<Collection<Integer>>() {
@@ -236,7 +236,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra
 
                 grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]");
 
-                CacheQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+                IgniteQueue<Integer> locQueue = grid.cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
                     false, true);
 
                 grid.log().info("Queue size " + locQueue.size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
index bbed86f..0e882ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
@@ -96,7 +96,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
     public void testPutRotativeNodes() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             true, true);
 
         assertTrue(queue.isEmpty());
@@ -125,7 +125,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
     public void testPutTakeRotativeNodes() throws Exception {
         String queueName = UUID.randomUUID().toString();
 
-        CacheQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
+        IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures().queue(queueName, QUEUE_CAPACITY,
             true, true);
 
         assertTrue(queue.isEmpty());
@@ -156,7 +156,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
         final String queueName = UUID.randomUUID().toString();
 
-        final CacheQueue<Integer> queue = grid(0).cache(null).dataStructures()
+        final IgniteQueue<Integer> queue = grid(0).cache(null).dataStructures()
             .queue(queueName, QUEUE_CAPACITY, true, true);
 
         assertTrue(queue.isEmpty());
@@ -221,7 +221,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -273,7 +273,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            CacheQueue<String> queue = ignite.cache(null).dataStructures()
+            IgniteQueue<String> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -325,7 +325,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']');
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -373,7 +373,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']');
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, true);
 
             assertNotNull(queue);
@@ -421,7 +421,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo
 
             ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]");
 
-            CacheQueue<Integer> queue = ignite.cache(null).dataStructures()
+            IgniteQueue<Integer> queue = ignite.cache(null).dataStructures()
                 .queue(queueName, QUEUE_CAPACITY, true, false);
 
             assert queue != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
index cee2004..62216ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
@@ -58,7 +58,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     private static String[] seqNames = new String[SEQ_NUM];
 
     /** Mandatory sequences. */
-    private static CacheAtomicSequence[] seqArr = new CacheAtomicSequence[SEQ_NUM];
+    private static IgniteAtomicSequence[] seqArr = new IgniteAtomicSequence[SEQ_NUM];
 
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -99,7 +99,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         seqArr[2] = grid().cache(null).dataStructures().atomicSequence(seqNames[2], -1 * RND.nextLong(), true);
 
         // Check and change batch size.
-        for (CacheAtomicSequence seq : seqArr) {
+        for (IgniteAtomicSequence seq : seqArr) {
             assert seq != null;
 
             // Compare with default batch size.
@@ -129,9 +129,9 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName1 = UUID.randomUUID().toString();
         String locSeqName2 = UUID.randomUUID().toString();
 
-        CacheAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
-        CacheAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, 0, true);
-        CacheAtomicSequence locSeq3 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
+        IgniteAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
+        IgniteAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, 0, true);
+        IgniteAtomicSequence locSeq3 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
 
         assertNotNull(locSeq1);
         assertNotNull(locSeq2);
@@ -151,7 +151,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      */
     public void testAddWrongValue() throws Exception {
-        for (CacheAtomicSequence seq : seqArr) {
+        for (IgniteAtomicSequence seq : seqArr) {
             try {
                 seq.getAndAdd(-15);
 
@@ -177,7 +177,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testGetAndIncrement() throws Exception {
         for (int i = 0; i < MAX_LOOPS_NUM; i++) {
-            for (CacheAtomicSequence seq : seqArr)
+            for (IgniteAtomicSequence seq : seqArr)
                 getAndIncrement(seq);
 
             if (i % 100 == 0)
@@ -190,7 +190,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testIncrementAndGet() throws Exception {
         for (int i = 0; i < MAX_LOOPS_NUM; i++) {
-            for (CacheAtomicSequence seq : seqArr)
+            for (IgniteAtomicSequence seq : seqArr)
                 incrementAndGet(seq);
 
             if (i % 100 == 0)
@@ -203,7 +203,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testAddAndGet() throws Exception {
         for (int i = 1; i < MAX_LOOPS_NUM; i++) {
-            for (CacheAtomicSequence seq : seqArr)
+            for (IgniteAtomicSequence seq : seqArr)
                 addAndGet(seq, i);
 
             if (i % 100 == 0)
@@ -216,7 +216,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testGetAndAdd() throws Exception {
         for (int i = 1; i < MAX_LOOPS_NUM; i++) {
-            for (CacheAtomicSequence seq : seqArr)
+            for (IgniteAtomicSequence seq : seqArr)
                 getAndAdd(seq, i);
 
             if (i % 100 == 0)
@@ -230,7 +230,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     public void testGetAndAddInTx() throws Exception {
         try (IgniteTx tx = grid().cache(null).txStart(PESSIMISTIC, REPEATABLE_READ)) {
             for (int i = 1; i < MAX_LOOPS_NUM; i++) {
-                for (CacheAtomicSequence seq : seqArr)
+                for (IgniteAtomicSequence seq : seqArr)
                     getAndAdd(seq, i);
 
                 if (i % 100 == 0)
@@ -248,14 +248,14 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName2 = UUID.randomUUID().toString();
 
         // Sequence.
-        CacheAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
+        IgniteAtomicSequence locSeq1 = grid().cache(null).dataStructures().atomicSequence(locSeqName1, 0, true);
 
         locSeq1.batchSize(1);
 
         // Sequence.
         long initVal = -1500;
 
-        CacheAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, initVal, true);
+        IgniteAtomicSequence locSeq2 = grid().cache(null).dataStructures().atomicSequence(locSeqName2, initVal, true);
 
         locSeq2.batchSize(7);
 
@@ -298,7 +298,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     public void testEviction() throws Exception {
         String locSeqName = UUID.randomUUID().toString();
 
-        CacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
+        IgniteAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
 
         locSeq.addAndGet(153);
 
@@ -313,7 +313,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
     public void testRemove() throws Exception {
         String locSeqName = UUID.randomUUID().toString();
 
-        CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
+        IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(locSeqName, 0, true);
 
         seq.addAndGet(153);
 
@@ -334,7 +334,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      */
     public void testCacheSets() throws Exception {
         // Make new atomic sequence in cache.
-        CacheAtomicSequence seq = grid().cache(null).dataStructures()
+        IgniteAtomicSequence seq = grid().cache(null).dataStructures()
             .atomicSequence(UUID.randomUUID().toString(), 0, true);
 
         seq.incrementAndGet();
@@ -370,7 +370,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long getAndIncrement(CacheAtomicSequence seq) throws Exception {
+    private long getAndIncrement(IgniteAtomicSequence seq) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal, seq.getAndIncrement());
@@ -387,7 +387,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long incrementAndGet(CacheAtomicSequence seq) throws Exception {
+    private long incrementAndGet(IgniteAtomicSequence seq) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal + 1, seq.incrementAndGet());
@@ -405,7 +405,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long addAndGet(CacheAtomicSequence seq, long l) throws Exception {
+    private long addAndGet(IgniteAtomicSequence seq, long l) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal + l, seq.addAndGet(l));
@@ -423,7 +423,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @throws Exception If failed.
      * @return Result of operation.
      */
-    private long getAndAdd(CacheAtomicSequence seq, long l) throws Exception {
+    private long getAndAdd(IgniteAtomicSequence seq, long l) throws Exception {
         long locSeqVal = seq.get();
 
         assertEquals(locSeqVal, seq.getAndAdd(l));
@@ -445,7 +445,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName = UUID.randomUUID().toString();
 
         // Sequence.
-        CacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal, true);
+        IgniteAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal, true);
 
         locSeq.batchSize(batchSize);
 
@@ -480,7 +480,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
         String locSeqName = UUID.randomUUID().toString();
 
         // Sequence.
-        final CacheAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal,
+        final IgniteAtomicSequence locSeq = grid().cache(null).dataStructures().atomicSequence(locSeqName, initVal,
             true);
 
         locSeq.batchSize(batchSize);
@@ -550,7 +550,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs
      * @param calcVal Manually calculated value.
      * @throws Exception If failed.
      */
-    private void integrity(CacheAtomicSequence seq, long calcVal) throws Exception {
+    private void integrity(IgniteAtomicSequence seq, long calcVal) throws Exception {
         assert calcVal == seq.get();
 
         getAndAdd(seq, 1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
index b63e1a1..9b887aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
@@ -152,7 +152,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
     public void testMarshalling() throws Exception {
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid(0).cache(null).dataStructures().atomicSequence(seqName, 0, true);
+        final IgniteAtomicSequence seq = grid(0).cache(null).dataStructures().atomicSequence(seqName, 0, true);
 
         grid(1).compute().run(new CAX() {
             @Override public void applyx() throws IgniteCheckedException {
@@ -208,7 +208,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
             if (log.isInfoEnabled())
                 log.info("Running IncrementAndGetJob on node: " + ignite.cluster().localNode().id());
 
-            CacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
+            IgniteAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
 
             assert seq != null;
 
@@ -262,7 +262,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom
             if (log.isInfoEnabled())
                 log.info("Running GetAndIncrementJob on node: " + ignite.cluster().localNode().id());
 
-            CacheAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
+            IgniteAtomicSequence seq = ignite.cache(null).dataStructures().atomicSequence(seqName, 0, true);
 
             assert seq != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/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 f92a963..548341f 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
@@ -184,12 +184,12 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         for (int i = 0; i < gridCount(); i++)
             assertNull(cache(i).dataStructures().set(SET_NAME, collocated, false));
 
-        CacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
+        IgniteSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
 
         assertNotNull(set0);
 
         for (int i = 0; i < gridCount(); i++) {
-            CacheSet<Integer> set = cache().dataStructures().set(SET_NAME, collocated, true);
+            IgniteSet<Integer> set = cache().dataStructures().set(SET_NAME, collocated, true);
 
             assertNotNull(set);
             assertTrue(set.isEmpty());
@@ -392,10 +392,10 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      */
     @SuppressWarnings("deprecation")
     private void testIterator(boolean collocated) throws Exception {
-        final CacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
+        final IgniteSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
 
         for (int i = 0; i < gridCount(); i++) {
-            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            IgniteSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertFalse(set.iterator().hasNext());
         }
@@ -410,7 +410,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         }
 
         for (int i = 0; i < gridCount(); i++) {
-            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            IgniteSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertSetContent(set, cnt);
         }
@@ -436,7 +436,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         set0.clear();
 
         for (int i = 0; i < gridCount(); i++) {
-            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            IgniteSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertFalse(set.iterator().hasNext());
         }
@@ -482,7 +482,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      */
     @SuppressWarnings({"BusyWait", "ErrorNotRethrown"})
     private void testIteratorClose(boolean collocated) throws Exception {
-        CacheSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
+        IgniteSet<Integer> set0 = cache().dataStructures().set(SET_NAME, collocated, true);
 
         for (int i = 0; i < 5000; i++)
             assertTrue(set0.add(i));
@@ -533,7 +533,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
     /**
      * @param set Set.
      */
-    private void createIterators(CacheSet<Integer> set) {
+    private void createIterators(IgniteSet<Integer> set) {
         for (int i = 0; i < 10; i++) {
             Iterator<Integer> iter = set.iterator();
 
@@ -581,12 +581,12 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         startGrid(gridCount());
 
         try {
-            CacheSet<Integer> set1 = cache().dataStructures().set(SET_NAME, collocated, false);
+            IgniteSet<Integer> set1 = cache().dataStructures().set(SET_NAME, collocated, false);
 
             assertNotNull(set1);
 
             for (int i = 0; i < gridCount() + 1; i++) {
-                CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+                IgniteSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
                 assertEquals(ITEMS, set.size());
 
@@ -598,7 +598,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         }
 
         for (int i = 0; i < gridCount(); i++) {
-            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            IgniteSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertSetContent(set, ITEMS);
         }
@@ -681,7 +681,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
                 @Override public Void call() throws Exception {
                     GridCache cache = grid(idx).cache(null);
 
-                    CacheSet<Integer> set = cache.dataStructures().set(SET_NAME, collocated, false);
+                    IgniteSet<Integer> set = cache.dataStructures().set(SET_NAME, collocated, false);
 
                     assertNotNull(set);
 
@@ -755,7 +755,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
         final Collection<Set<Integer>> sets = new ArrayList<>();
 
         for (int i = 0; i < gridCount(); i++) {
-            CacheSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
+            IgniteSet<Integer> set = cache(i).dataStructures().set(SET_NAME, collocated, false);
 
             assertNotNull(set);
 
@@ -836,7 +836,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      * @throws Exception If failed.
      */
     public void testSerialization() throws Exception {
-        final CacheSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
+        final IgniteSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
 
         assertNotNull(set);
 
@@ -861,7 +861,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
      * @param set Set.
      * @param size Expected size.
      */
-    private void assertSetContent(CacheSet<Integer> set, int size) {
+    private void assertSetContent(IgniteSet<Integer> set, int size) {
         Collection<Integer> data = new HashSet<>(size);
 
         for (Integer val : set)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index 67d8300..ac2a22d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -98,7 +98,7 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT
      */
     @SuppressWarnings("WhileLoopReplaceableByForEach")
     public void testNodeRestart() throws Exception {
-        CacheSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
+        IgniteSet<Integer> set = cache().dataStructures().set(SET_NAME, false, true);
 
         final int ITEMS = 10_000;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
index 7810c6f..1d8f83b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
@@ -168,10 +168,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.incrementAndGet();
             }
         }, seq, ITERATION_NUM, THREAD_NUM);
@@ -184,10 +184,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.incrementAndGet();
             }
         }, seq, ITERATION_NUM, THREAD_NUM);
@@ -200,10 +200,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.getAndIncrement();
             }
         }, seq, ITERATION_NUM, THREAD_NUM);
@@ -216,10 +216,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.getAndIncrement();
             }
         }, seq, ITERATION_NUM, THREAD_NUM);
@@ -232,10 +232,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.addAndGet(5);
             }
         }, seq, ITERATION_NUM, THREAD_NUM);
@@ -248,10 +248,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.getAndAdd(5);
             }
         }, seq, ITERATION_NUM, THREAD_NUM);
@@ -264,10 +264,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.incrementAndGet();
                 t.getAndIncrement();
                 t.incrementAndGet();
@@ -285,10 +285,10 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
-        runSequenceClosure(new GridInUnsafeClosure<CacheAtomicSequence>() {
-            @Override public void apply(CacheAtomicSequence t) throws IgniteCheckedException {
+        runSequenceClosure(new GridInUnsafeClosure<IgniteAtomicSequence>() {
+            @Override public void apply(IgniteAtomicSequence t) throws IgniteCheckedException {
                 t.getAndAdd(2);
                 t.addAndGet(3);
                 t.addAndGet(5);
@@ -308,8 +308,8 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
      * @param threadCnt Thread count.
      * @throws Exception If failed.
      */
-    protected void runSequenceClosure(final GridInUnsafeClosure<CacheAtomicSequence> c,
-        final CacheAtomicSequence seq, final int cnt, final int threadCnt) throws Exception {
+    protected void runSequenceClosure(final GridInUnsafeClosure<IgniteAtomicSequence> c,
+        final IgniteAtomicSequence seq, final int cnt, final int threadCnt) throws Exception {
         multithreaded(new Runnable() {
             @Override public void run() {
                 try {
@@ -331,7 +331,7 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom
     private void checkUpdate(boolean updated) throws Exception {
         String seqName = UUID.randomUUID().toString();
 
-        final CacheAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
+        final IgniteAtomicSequence seq = grid().cache(null).dataStructures().atomicSequence(seqName, 0L, true);
 
         long curVal = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
index e5472f8..40fa923 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
@@ -211,7 +211,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac
 
             assert PARTITIONED == grid(i).cache(null).configuration().getCacheMode();
 
-            CacheAtomicLong atomic = grid(i).cache(null).dataStructures().atomicLong(name, 0, true);
+            IgniteAtomicLong atomic = grid(i).cache(null).dataStructures().atomicLong(name, 0, true);
 
             long val = atomic.get();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/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 63aaf60..98c5bba 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
@@ -100,7 +100,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon
 
                     info("Creating queue: " + locNodeId);
 
-                    CacheQueue<String> q = cache.dataStructures().queue("queue", 1, true, true);
+                    IgniteQueue<String> q = cache.dataStructures().queue("queue", 1, true, true);
 
                     assert q != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/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 2401115..64b08de 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
@@ -104,7 +104,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra
                 @Override public Void call() throws IgniteCheckedException {
                     Ignite ignite = grid(0);
 
-                    CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP,
+                    IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, QUEUE_CAP,
                         true, true);
 
                     for (int i = 0; i < QUEUE_CAP * 2; i++) {
@@ -144,7 +144,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra
                 @Override public Void call() throws IgniteCheckedException {
                     Ignite ignite = grid(GRID_CNT);
 
-                    CacheQueue<Integer> queue = ignite.cache(null).dataStructures().
+                    IgniteQueue<Integer> queue = ignite.cache(null).dataStructures().
                         queue(queueName, Integer.MAX_VALUE, true, true);
 
                     int cnt = 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index 60cf7d6..c960fe7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -97,7 +97,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
         ClusterNode other = nodes.get2();
 
         // Create on non-primary node.
-        CacheAtomicLong l = grid(other).cache(null).dataStructures().atomicLong(ATOMIC_LONG_NAME, 1, true);
+        IgniteAtomicLong l = grid(other).cache(null).dataStructures().atomicLong(ATOMIC_LONG_NAME, 1, true);
 
         assert l != null;
         assert l.get() == 1;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
index ad4c07a..40644b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java
@@ -80,7 +80,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true);
+            IgniteAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
                 al.addAndGet(RAND.nextInt(MAX_INT));
@@ -98,7 +98,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true);
+            IgniteAtomicLong al = cache.cache().dataStructures().atomicLong(TEST_LONG_NAME, 0, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
                 al.get();
@@ -116,7 +116,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME,
+            IgniteAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME,
                 null, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
@@ -135,7 +135,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, null,
+            IgniteAtomicReference<Integer> ar = cache.cache().dataStructures().atomicReference(TEST_REF_NAME, null,
                 true);
 
             for (int i = 0; i < operationsPerTx; i++) {
@@ -154,7 +154,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true);
+            IgniteAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
                 as.addAndGet(RAND.nextInt(MAX_INT) + 1);
@@ -172,7 +172,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true);
+            IgniteAtomicSequence as = cache.cache().dataStructures().atomicSequence(TEST_SEQ_NAME, 0, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
                 as.get();
@@ -190,7 +190,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME,
+            IgniteAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME,
                 0, 0, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
@@ -209,7 +209,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME,
+            IgniteAtomicStamped<Integer, Integer> as = cache.cache().dataStructures().atomicStamped(TEST_STAMP_NAME,
                 0, 0, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
@@ -228,7 +228,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true);
+            IgniteQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
                 q.put(RAND.nextInt(MAX_INT));
@@ -246,7 +246,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true);
+            IgniteQueue<Integer> q = cache.cache().dataStructures().queue(TEST_QUEUE_NAME, 0, true, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
                 q.peek();
@@ -264,7 +264,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT,
+            IgniteCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT,
                 true, true);
 
             for (int i = 0; i < operationsPerTx; i++) {
@@ -283,7 +283,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad
         new CIX1<CacheProjection<Integer, Integer>>() {
         @Override public void applyx(CacheProjection<Integer, Integer> cache)
             throws IgniteCheckedException {
-            CacheCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT,
+            IgniteCountDownLatch l = cache.cache().dataStructures().countDownLatch(TEST_LATCH_NAME, LATCH_INIT_CNT,
                 true, true);
 
             for (int i = 0; i < operationsPerTx; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 0418a9d..e128750 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -106,7 +106,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
 
             assert cache != null;
 
-            CacheAtomicSequence seq = cache.dataStructures().atomicSequence("SEQUENCE", 0, true);
+            IgniteAtomicSequence seq = cache.dataStructures().atomicSequence("SEQUENCE", 0, true);
 
             long start = System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
index 483cbb5..5563920 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
@@ -308,7 +308,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
 
         assert cache != null;
 
-        CacheAtomicSequence seq = cache.dataStructures().atomicSequence("ID", 0, true);
+        IgniteAtomicSequence seq = cache.dataStructures().atomicSequence("ID", 0, true);
 
         return seq.incrementAndGet();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/712ce142/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
index dbb2d2d..464c5bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
@@ -805,7 +805,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
     public void testDataStructures() throws Exception {
         CacheDataStructures dataStructures = grid().cache(CACHE_NAME).dataStructures();
 
-        CacheAtomicLong atomicLong = dataStructures.atomicLong("test", 0, true);
+        IgniteAtomicLong atomicLong = dataStructures.atomicLong("test", 0, true);
 
         assert atomicLong != null;
 


Mime
View raw message