http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 bcdf274..f3b0dec 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 @@ -121,7 +121,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl public void testPut() throws Exception { String queueName = UUID.randomUUID().toString(); - IgniteQueue<Integer> queue = grid(0).queue(queueName, config(false), QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue = grid(0).queue(queueName, QUEUE_CAPACITY, config(false)); assertTrue(queue.isEmpty()); @@ -139,7 +139,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info("Queue name: " + queueName); - grid(0).queue(queueName, config(true), 5, true); + grid(0).queue(queueName, 5, config(true)); final CountDownLatch latch = new CountDownLatch(1); @@ -150,7 +150,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info(">>> Executing put callable [node=" + g.cluster().localNode().id() + ", thread=" + Thread.currentThread().getName() + ']'); - IgniteQueue<Integer> q = g.queue(queueName, config(true), 5, true); + IgniteQueue<Integer> q = g.queue(queueName, 5, config(true)); assertTrue(q.isEmpty()); @@ -181,7 +181,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info(">>> Executing poll callable [node=" + g1.cluster().localNode().id() + ", thread=" + Thread.currentThread().getName() + ']'); - IgniteQueue<Integer> q = g1.queue(queueName, config(true), 5, true); + IgniteQueue<Integer> q = g1.queue(queueName, 5, config(true)); int cnt = 0; int nullCnt = 0; @@ -220,7 +220,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl fut1.get(); fut2.get(); - grid(0).queue(queueName, null, 0, false).close(); + grid(0).queue(queueName, 0, null).close(); } finally { stopGrid(GRID_CNT + 1); @@ -242,7 +242,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info("Queue name: " + queueName); - IgniteQueue<Integer> queue = grid(0).queue(queueName, config(false), QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue = grid(0).queue(queueName, QUEUE_CAPACITY, config(false)); assertTrue(queue.isEmpty()); @@ -269,7 +269,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info("Queue name: " + queueName); - IgniteQueue<String> queue = grid(0).queue(queueName, config(false), QUEUE_CAPACITY, true); + IgniteQueue<String> queue = grid(0).queue(queueName, QUEUE_CAPACITY, config(false)); assertTrue(queue.isEmpty()); @@ -292,7 +292,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info("Queue name: " + queueName); - IgniteQueue<Integer> queue = grid(0).queue(queueName, config(false), QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue = grid(0).queue(queueName, QUEUE_CAPACITY, config(false)); assertTrue(queue.isEmpty()); @@ -334,7 +334,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl @Override public Void call() throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - IgniteQueue<Integer> queue = grid(idx).queue(queueName, colCfg, 0, true); + IgniteQueue<Integer> queue = grid(idx).queue(queueName, 0, colCfg); for (int i = 0; i < ITEMS_PER_THREAD; i++) assertTrue(queue.add(i)); @@ -347,7 +347,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl for (IgniteInternalFuture fut : futs) fut.get(); - IgniteQueue<Integer> queue = grid(0).queue(queueName, null, 0, false); + IgniteQueue<Integer> queue = grid(0).queue(queueName, 0, null); assertEquals(THREADS_PER_NODE * ITEMS_PER_THREAD * GRID_CNT, queue.size()); @@ -362,7 +362,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl assertEquals(THREADS_PER_NODE * GRID_CNT, items[i]); } finally { - grid(0).queue(queueName, null, 0, false).close(); + grid(0).queue(queueName, 0, null).close(); } } @@ -403,7 +403,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl @Override public Void call() throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - IgniteQueue<Integer> queue = grid(idx).queue(queueName, colCfg, 0, true); + IgniteQueue<Integer> queue = grid(idx).queue(queueName, 0, colCfg); for (int i = 0; i < ITEMS_PER_THREAD; i++) assertTrue(queue.add(i)); @@ -421,7 +421,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl @Override public Void call() throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - IgniteQueue<Integer> queue = grid(idx).queue(queueName, colCfg, 0, true); + IgniteQueue<Integer> queue = grid(idx).queue(queueName, 0, colCfg); while (!stopPoll.get()) { Integer val = queue.poll(); @@ -446,7 +446,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl IgniteCollectionConfiguration colCfg = config(collocated); - IgniteQueue<Integer> queue = grid(0).queue(queueName, colCfg, 0, true); + IgniteQueue<Integer> queue = grid(0).queue(queueName, 0, colCfg); int[] resItems = new int[ITEMS_PER_THREAD]; @@ -466,7 +466,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl assertTrue(queue.isEmpty()); } finally { - grid(0).queue(queueName, null, 0, false).close(); + grid(0).queue(queueName, 0, null).close(); } } @@ -479,7 +479,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl info("Queue name: " + queueName); - try (IgniteQueue<Integer> queue = grid(0).queue(queueName, config(false), QUEUE_CAPACITY, true)) { + try (IgniteQueue<Integer> queue = grid(0).queue(queueName, QUEUE_CAPACITY, config(false))) { assertTrue(queue.isEmpty()); grid(0).compute().call(new AddAllJob(queueName, RETRIES)); @@ -499,7 +499,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<Integer> locQueue = grid.queue(queueName, null, 0, false); + IgniteQueue<Integer> locQueue = grid.queue(queueName, 0, null); grid.log().info("Queue size " + locQueue.size()); @@ -524,7 +524,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl // Random queue name. String queueName = UUID.randomUUID().toString(); - final IgniteQueue<Integer> queue = grid(0).queue(queueName, config(false), 0, true); + final IgniteQueue<Integer> queue = grid(0).queue(queueName, 0, config(false)); assertNotNull(queue); @@ -608,7 +608,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<Integer> queue = ignite.queue(queueName, null, 0, false); + IgniteQueue<Integer> queue = ignite.queue(queueName, 0, null); assertNotNull(queue); @@ -654,7 +654,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<Integer> queue = ignite.queue(queueName, null, 0, false); + IgniteQueue<Integer> queue = ignite.queue(queueName, 0, null); assertNotNull(queue); @@ -714,7 +714,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<String> queue = ignite.queue(queueName, colCfg, QUEUE_CAPACITY, true); + IgniteQueue<String> queue = ignite.queue(queueName, QUEUE_CAPACITY, colCfg); assertNotNull(queue); @@ -765,7 +765,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']'); - IgniteQueue<Integer> queue = ignite.queue(queueName, null, 0, false); + IgniteQueue<Integer> queue = ignite.queue(queueName, 0, null); assertNotNull(queue);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 24ceff9..6beeb6e 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 @@ -137,7 +137,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection final String queueName = UUID.randomUUID().toString(); - IgniteQueue<Integer> queue0 = grid(0).queue(queueName, config(false), QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue0 = grid(0).queue(queueName, QUEUE_CAPACITY, config(false)); assertTrue(queue0.isEmpty()); @@ -168,7 +168,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection grid.log().info("Running job [node=" + grid.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<Integer> locQueue = grid.queue(queueName, config(false), QUEUE_CAPACITY, true); + IgniteQueue<Integer> locQueue = grid.queue(queueName, QUEUE_CAPACITY, config(false)); grid.log().info("Queue size " + locQueue.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 000d89e..b638d98 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 @@ -90,7 +90,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite String queueName = UUID.randomUUID().toString(); IgniteQueue<Integer> queue = - grid(0).queue(queueName, config(true), QUEUE_CAPACITY, true); + grid(0).queue(queueName, QUEUE_CAPACITY, config(true)); assertTrue(queue.isEmpty()); @@ -105,7 +105,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite stopGrid(i); } - queue = grid((GRID_CNT * 3) - 1).queue(queueName, null, 0, false); + queue = grid((GRID_CNT * 3) - 1).queue(queueName, 0, null); assertEquals(RETRIES * GRID_CNT * 2, queue.size()); } @@ -119,7 +119,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite String queueName = UUID.randomUUID().toString(); IgniteQueue<Integer> queue = - grid(0).queue(queueName, config(true), QUEUE_CAPACITY, true); + grid(0).queue(queueName, QUEUE_CAPACITY, config(true)); assertTrue(queue.isEmpty()); @@ -134,7 +134,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite stopGrid(i); } - queue = grid((GRID_CNT * 3) - 1).queue(queueName, config(true), QUEUE_CAPACITY, true); + queue = grid((GRID_CNT * 3) - 1).queue(queueName, QUEUE_CAPACITY, config(true)); assertEquals(0, queue.size()); } @@ -150,7 +150,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite final String queueName = UUID.randomUUID().toString(); final IgniteQueue<Integer> queue = - grid(0).queue(queueName, config(true), QUEUE_CAPACITY, true); + grid(0).queue(queueName, QUEUE_CAPACITY, config(true)); assertTrue(queue.isEmpty()); @@ -219,7 +219,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<Integer> queue = ignite.queue(queueName, colCfg, QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue = ignite.queue(queueName, QUEUE_CAPACITY, colCfg); assertNotNull(queue); @@ -255,6 +255,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite /** * @param queueName Queue name. + * @param colCfg Queue configuration. * @param retries Number of operations. */ PutTakeJob(String queueName, IgniteCollectionConfiguration colCfg, int retries) { @@ -269,7 +270,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']'); - IgniteQueue<Integer> queue = ignite.queue(queueName, colCfg, QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue = ignite.queue(queueName, QUEUE_CAPACITY, colCfg); assertNotNull(queue); @@ -321,7 +322,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + ']'); - IgniteQueue<Integer> queue = ignite.queue(queueName, colCfg, QUEUE_CAPACITY, true); + IgniteQueue<Integer> queue = ignite.queue(queueName, QUEUE_CAPACITY, colCfg); assertNotNull(queue); @@ -368,7 +369,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends Ignite ignite.log().info("Running job [node=" + ignite.cluster().localNode().id() + ", job=" + this + "]"); - IgniteQueue<Integer> queue = ignite.queue(queueName, null, 0, false); + IgniteQueue<Integer> queue = ignite.queue(queueName, 0, null); assert queue != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 d4c907e..87df3e6 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 @@ -69,14 +69,14 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - IgniteSet<Object> set = grid(0).set(SET_NAME, null, false); + IgniteSet<Object> set = grid(0).set(SET_NAME, null); if (set != null) set.close(); waitSetResourcesCleared(); - assertNull(grid(0).set(SET_NAME, null, false)); + assertNull(grid(0).set(SET_NAME, null)); super.afterTest(); } @@ -175,18 +175,18 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr */ private void testCreateRemove(boolean collocated) throws Exception { for (int i = 0; i < gridCount(); i++) - assertNull(grid(i).set(SET_NAME, null, false)); + assertNull(grid(i).set(SET_NAME, null)); IgniteCollectionConfiguration colCfg0 = config(collocated); - IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg0, true); + IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg0); assertNotNull(set0); for (int i = 0; i < gridCount(); i++) { IgniteCollectionConfiguration colCfg = config(collocated); - IgniteSet<Integer> set = grid(i).set(SET_NAME, colCfg, true); + IgniteSet<Integer> set = grid(i).set(SET_NAME, colCfg); assertNotNull(set); assertTrue(set.isEmpty()); @@ -204,7 +204,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr @Override public boolean apply() { try { for (int i = 0; i < gridCount(); i++) { - if (grid(i).set(SET_NAME, null, false) != null) + if (grid(i).set(SET_NAME, null) != null) return false; } @@ -219,7 +219,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr }, 1000); for (int i = 0; i < gridCount(); i++) - assertNull(grid(i).set(SET_NAME, null, false)); + assertNull(grid(i).set(SET_NAME, null)); } /** @@ -243,10 +243,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr private void testApi(boolean collocated) throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - assertNotNull(grid(0).set(SET_NAME, colCfg, true)); + assertNotNull(grid(0).set(SET_NAME, colCfg)); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertNotNull(set); assertFalse(set.contains(1)); @@ -256,10 +256,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr // Add, isEmpty. - assertTrue(grid(0).set(SET_NAME, null, false).add(1)); + assertTrue(grid(0).set(SET_NAME, null).add(1)); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(1, set.size()); assertFalse(set.isEmpty()); @@ -272,10 +272,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr // Remove. - assertTrue(grid(0).set(SET_NAME, null, false).remove(1)); + assertTrue(grid(0).set(SET_NAME, null).remove(1)); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(0, set.size()); assertTrue(set.isEmpty()); @@ -293,7 +293,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr final int ITEMS = 100; for (int i = 0; i < ITEMS; i++) { - assertTrue(grid(i % gridCount()).set(SET_NAME, null, false).add(i)); + assertTrue(grid(i % gridCount()).set(SET_NAME, null).add(i)); col1.add(i); col2.add(i); @@ -302,7 +302,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr col2.add(ITEMS); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(ITEMS, set.size()); assertTrue(set.containsAll(col1)); @@ -312,7 +312,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr // To array. for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertArrayContent(set.toArray(), ITEMS); assertArrayContent(set.toArray(new Integer[ITEMS]), ITEMS); @@ -325,10 +325,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr for (int i = ITEMS - 10; i < ITEMS; i++) rmvCol.add(i); - assertTrue(grid(0).set(SET_NAME, null, false).removeAll(rmvCol)); + assertTrue(grid(0).set(SET_NAME, null).removeAll(rmvCol)); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertFalse(set.removeAll(rmvCol)); @@ -341,10 +341,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr // Add all. - assertTrue(grid(0).set(SET_NAME, null, false).addAll(rmvCol)); + assertTrue(grid(0).set(SET_NAME, null).addAll(rmvCol)); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(ITEMS, set.size()); @@ -356,10 +356,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr // Retain all. - assertTrue(grid(0).set(SET_NAME, null, false).retainAll(rmvCol)); + assertTrue(grid(0).set(SET_NAME, null).retainAll(rmvCol)); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(rmvCol.size(), set.size()); @@ -374,10 +374,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr // Clear. - grid(0).set(SET_NAME, null, false).clear(); + grid(0).set(SET_NAME, null).clear(); for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(0, set.size()); assertTrue(set.isEmpty()); @@ -407,10 +407,10 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr private void testIterator(boolean collocated) throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - final IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg, true); + final IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg); for (int i = 0; i < gridCount(); i++) { - IgniteSet<Integer> set = grid(i).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(i).set(SET_NAME, null); assertFalse(set.iterator().hasNext()); } @@ -418,14 +418,14 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr int cnt = 0; for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); for (int j = 0; j < 100; j++) assertTrue(set.add(cnt++)); } for (int i = 0; i < gridCount(); i++) { - IgniteSet<Integer> set = grid(i).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(i).set(SET_NAME, null); assertSetContent(set, cnt); } @@ -451,7 +451,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr set0.clear(); for (int i = 0; i < gridCount(); i++) { - IgniteSet<Integer> set = grid(i).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(i).set(SET_NAME, null); assertFalse(set.iterator().hasNext()); } @@ -471,7 +471,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr } for (int i = 0; i < gridCount(); i++) { - Set<Integer> set = grid(i).set(SET_NAME, null, false); + Set<Integer> set = grid(i).set(SET_NAME, null); assertEquals(i % 2 != 0, set.contains(i)); } @@ -499,7 +499,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr private void testIteratorClose(boolean collocated) throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg, true); + IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg); for (int i = 0; i < 5000; i++) assertTrue(set0.add(i)); @@ -530,7 +530,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr int idx = gridCount() > 1 ? 1 : 0; - grid(idx).set(SET_NAME, null, false).close(); + grid(idx).set(SET_NAME, null).close(); for (int i = 0; i < 10; i++) { try { @@ -590,7 +590,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr IgniteCollectionConfiguration colCfg = config(collocated); - Set<Integer> set0 = grid(0).set(SET_NAME, colCfg, true); + Set<Integer> set0 = grid(0).set(SET_NAME, colCfg); final int ITEMS = 10_000; @@ -600,12 +600,12 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr startGrid(gridCount()); try { - IgniteSet<Integer> set1 = grid(0).set(SET_NAME, null, false); + IgniteSet<Integer> set1 = grid(0).set(SET_NAME, null); assertNotNull(set1); for (int i = 0; i < gridCount() + 1; i++) { - IgniteSet<Integer> set = grid(i).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(i).set(SET_NAME, null); assertEquals(ITEMS, set.size()); @@ -617,7 +617,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr } for (int i = 0; i < gridCount(); i++) { - IgniteSet<Integer> set = grid(i).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(i).set(SET_NAME, null); assertSetContent(set, ITEMS); } @@ -647,7 +647,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr private void testMultithreaded(final boolean collocated) throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - Set<Integer> set0 = grid(0).set(SET_NAME, colCfg, true); + Set<Integer> set0 = grid(0).set(SET_NAME, colCfg); assertNotNull(set0); @@ -662,7 +662,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr futs.add(GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { - IgniteSet<Integer> set = grid(idx).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(idx).set(SET_NAME, null); assertNotNull(set); @@ -731,14 +731,14 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr private void testCleanup(boolean collocated) throws Exception { IgniteCollectionConfiguration colCfg = config(collocated); - final IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg, true); + final IgniteSet<Integer> set0 = grid(0).set(SET_NAME, colCfg); assertNotNull(set0); final Collection<Set<Integer>> sets = new ArrayList<>(); for (int i = 0; i < gridCount(); i++) { - IgniteSet<Integer> set = grid(i).set(SET_NAME, null, false); + IgniteSet<Integer> set = grid(i).set(SET_NAME, null); assertNotNull(set); @@ -821,7 +821,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr * @throws Exception If failed. */ public void testSerialization() throws Exception { - final IgniteSet<Integer> set = grid(0).set(SET_NAME, config(false), true); + final IgniteSet<Integer> set = grid(0).set(SET_NAME, config(false)); assertNotNull(set); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 ef7595c..b7a95a8 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 @@ -82,7 +82,7 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect */ @SuppressWarnings("WhileLoopReplaceableByForEach") public void testNodeRestart() throws Exception { - IgniteSet<Integer> set = grid(0).set(SET_NAME, config(false), true); + IgniteSet<Integer> set = grid(0).set(SET_NAME, config(false)); final int ITEMS = 10_000; @@ -149,7 +149,7 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect log.info("Create new set."); - set = grid(0).set(SET_NAME, config(false), true); + set = grid(0).set(SET_NAME, config(false)); set.addAll(items); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java index e6ff8f1..8c63bbc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java @@ -52,7 +52,7 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes cfg.setDiscoverySpi(spi); - // TODO IGNITE-45: remove cache configuration when dynamic cache start is implemented. + // TODO IGNITE-180: remove cache configuration when dynamic cache start is implemented. TestCollectionConfiguration colCfg = collectionConfiguration(); assertNotNull(colCfg); @@ -129,7 +129,7 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes } /** - * TODO IGNITE-45: move properties to IgniteCollectionConfiguration. + * TODO IGNITE-180: move properties to IgniteCollectionConfiguration. */ public static class TestCollectionConfiguration { /** Default backups number. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 83053eb..06962d4 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 @@ -128,7 +128,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - ignite.queue(name, config(false), 0, true); + ignite.queue(name, 0, config(false)); return null; } @@ -136,7 +136,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - ignite.queue(name, null, 0, false); + ignite.queue(name, 0, null); return null; } @@ -144,7 +144,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - ignite.set(name, config(false), true); + ignite.set(name, config(false)); return null; } @@ -152,7 +152,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - ignite.set(name, null, false); + ignite.set(name, null); return null; } @@ -160,25 +160,26 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT atomicLong.close(); - IgniteQueue<Integer> q = ignite.queue(name, config(false), 0, true); + IgniteQueue<Integer> q = ignite.queue(name, 0, config(false)); assertNotNull(q); - assertSame(q, ignite.queue(name, config(false), 0, true)); + assertSame(q, ignite.queue(name, 0, config(false))); - assertSame(q, ignite.queue(name, null, 0, false)); + assertSame(q, ignite.queue(name, 0, null)); q.close(); - assertNull(ignite.set(name, null, false)); + assertNull(ignite.set(name, null)); - IgniteSet<Integer> set = ignite.set(name, config(false), true); + IgniteSet<Integer> set = ignite.set(name, config(false)); assertNotNull(set); - assertSame(set, ignite.set(name, config(false), true)); + assertSame(set, ignite.set(name, config(false))); + + assertSame(set, ignite.set(name, null)); - assertSame(set, ignite.set(name, null, false)); GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { ignite.atomicReference(name, 0, false); @@ -189,7 +190,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - ignite.queue(name, config(false), 0, true); + ignite.queue(name, 0, config(false)); return null; } @@ -198,7 +199,7 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { - ignite.queue(name, null, 0, false); + ignite.queue(name, 0, null); return null; } @@ -284,14 +285,14 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT case 5: log.info("Create queue, grid: " + ignite.name()); - res = ignite.queue(name, config(false), 0, true); + res = ignite.queue(name, 0, config(false)); break; case 6: log.info("Create set, grid: " + ignite.name()); - res = ignite.set(name, config(false), true); + res = ignite.set(name, config(false)); break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 bc3c952..d31c69d 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 @@ -114,7 +114,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl info("Creating queue: " + locNodeId); - IgniteQueue<String> q = ignite.queue("queue", config(true), 1, true); + IgniteQueue<String> q = ignite.queue("queue", 1, config(true)); assert q != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 d55e89a..dfc9410 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 @@ -108,9 +108,8 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends IgniteCollection Ignite ignite = grid(0); IgniteQueue<Integer> queue = ignite.queue(queueName, - config(true), QUEUE_CAP, - true); + config(true)); for (int i = 0; i < QUEUE_CAP * 2; i++) { if (i == QUEUE_CAP) { @@ -149,10 +148,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends IgniteCollection @Override public Void call() throws IgniteCheckedException { Ignite ignite = grid(GRID_CNT); - IgniteQueue<Integer> queue = ignite.queue(queueName, - config(true), - Integer.MAX_VALUE, - true); + IgniteQueue<Integer> queue = ignite.queue(queueName, Integer.MAX_VALUE, config(true)); int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java index 38d0499..ecdb208 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java @@ -40,7 +40,7 @@ public class IgnitePartitionedSetNoBackupsSelfTest extends GridCachePartitionedS * @throws Exception If failed. */ public void testCollocation() throws Exception { - Set<Integer> set0 = grid(0).set(SET_NAME, config(true), true); + Set<Integer> set0 = grid(0).set(SET_NAME, config(true)); for (int i = 0; i < 1000; i++) assertTrue(set0.add(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/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 58e8e90..475b1bb 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 @@ -236,7 +236,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad new CIX1<Ignite>() { @Override public void applyx(Ignite ignite) throws IgniteCheckedException { - IgniteQueue<Integer> q = ignite.queue(TEST_QUEUE_NAME, colCfg, 0, true); + IgniteQueue<Integer> q = ignite.queue(TEST_QUEUE_NAME, 0, colCfg); for (int i = 0; i < operationsPerTx; i++) { q.put(RAND.nextInt(MAX_INT)); @@ -254,7 +254,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad new CIX1<Ignite>() { @Override public void applyx(Ignite ignite) throws IgniteCheckedException { - IgniteQueue<Integer> q = ignite.queue(TEST_QUEUE_NAME, colCfg, 0, true); + IgniteQueue<Integer> q = ignite.queue(TEST_QUEUE_NAME, 0, colCfg); for (int i = 0; i < operationsPerTx; i++) { q.peek(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index 956c9d3..9297995 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -254,17 +254,15 @@ public class IgniteMock implements Ignite { /** {@inheritDoc} */ @Nullable @Override public <T> IgniteQueue<T> queue(String name, - IgniteCollectionConfiguration cfg, int cap, - boolean create) + IgniteCollectionConfiguration cfg) { return null; } /** {@inheritDoc} */ @Nullable @Override public <T> IgniteSet<T> set(String name, - IgniteCollectionConfiguration cfg, - boolean create) + IgniteCollectionConfiguration cfg) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaaebbd3/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index 9e99f06..e876747 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -364,23 +364,21 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea /** {@inheritDoc} */ @Nullable @Override public <T> IgniteQueue<T> queue(String name, - IgniteCollectionConfiguration cfg, int cap, - boolean create) + IgniteCollectionConfiguration cfg) { assert g != null; - return g.queue(name, cfg, cap, create); + return g.queue(name, cap, cfg); } /** {@inheritDoc} */ @Nullable @Override public <T> IgniteSet<T> set(String name, - IgniteCollectionConfiguration cfg, - boolean create) + IgniteCollectionConfiguration cfg) { assert g != null; - return g.set(name, cfg, create); + return g.set(name, cfg); } /** {@inheritDoc} */
