# i-484-1 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/642f1c7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/642f1c7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/642f1c7a Branch: refs/heads/ignite-917 Commit: 642f1c7a2786fd95a43d97cc5b0d955ad890f0c4 Parents: 0b8587b Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jun 17 15:14:16 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jun 17 15:14:16 2015 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionsReservation.java | 3 +- .../cache/query/GridCacheTwoStepQuery.java | 10 +++---- .../IgniteCacheQueryNodeRestartSelfTest.java | 3 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 30 ++++++++++++++------ 4 files changed, 30 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/642f1c7a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java index aced999..207c7f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionsReservation.java @@ -218,7 +218,8 @@ public class GridDhtPartitionsReservation implements GridReservable { // Unregister from partitions. if (!F.isEmpty(arr) && parts.compareAndSet(arr, EMPTY)) { - // Reverse order makes sure that addReservation on the same topVer reservation will fail on the first partition. + // Reverse order makes sure that addReservation on the same topVer + // reservation will fail on the first partition. for (int i = arr.length - 1; i >= 0; i--) { GridDhtLocalPartition part = arr[i]; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/642f1c7a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java index 1aa5890..1dacd10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java @@ -117,11 +117,6 @@ public class GridCacheTwoStepQuery { return mapQrys.values(); } - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridCacheTwoStepQuery.class, this); - } - /** * @return Spaces. */ @@ -135,4 +130,9 @@ public class GridCacheTwoStepQuery { public void spaces(Set<String> spaces) { this.spaces = spaces; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(GridCacheTwoStepQuery.class, this); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/642f1c7a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java index d729e4a..5c87603 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java @@ -39,6 +39,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.CacheRebalanceMode.*; /** * Test for distributed queries with node restarts. @@ -84,7 +85,7 @@ public class IgniteCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTe cc.setBackups(1); cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); - cc.setRebalanceMode(CacheRebalanceMode.SYNC); + cc.setRebalanceMode(SYNC); cc.setAffinity(new RendezvousAffinityFunction(false, 15)); cc.setIndexedTypes( Integer.class, Integer.class http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/642f1c7a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java index 527dfea..93831cc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.query.*; @@ -40,6 +39,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.CacheRebalanceMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test for distributed queries with node restarts. @@ -95,9 +96,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest cc.setName(name); cc.setCacheMode(PARTITIONED); cc.setBackups(2); - cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); - cc.setRebalanceMode(CacheRebalanceMode.SYNC); + cc.setRebalanceMode(SYNC); cc.setAffinity(new RendezvousAffinityFunction(false, 60)); if (name.equals("pe")) { @@ -119,9 +120,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest cc.setName(name); cc.setCacheMode(REPLICATED); - cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); + cc.setWriteSynchronizationMode(FULL_SYNC); cc.setAtomicityMode(TRANSACTIONAL); - cc.setRebalanceMode(CacheRebalanceMode.SYNC); + cc.setRebalanceMode(SYNC); cc.setAffinity(new RendezvousAffinityFunction(false, 50)); if (name.equals("co")) { @@ -143,6 +144,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest return c; } + /** + * + */ private void fillCaches() { IgniteCache<Integer, Company> co = grid(0).cache("co"); @@ -172,8 +176,6 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest } /** - * JUnit. - * * @throws Exception If failed. */ public void testRestarts() throws Exception { @@ -323,7 +325,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest info("Queries stopped."); } - // Partitioned + /** + * + */ private static class Person implements Serializable { @QuerySqlField(index = true) int id; @@ -333,6 +337,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest } } + /** + * + */ private static class Purchase implements Serializable { @QuerySqlField(index = true) int personId; @@ -346,7 +353,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest } } - // Replicated + /** + * + */ private static class Company implements Serializable { @QuerySqlField(index = true) int id; @@ -356,6 +365,9 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest } } + /** + * + */ private static class Product implements Serializable { @QuerySqlField(index = true) int id;
