ignite-642 review (code style)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30dd1daf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30dd1daf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30dd1daf Branch: refs/heads/ignite-642 Commit: 30dd1daf82605964a09ee3171370c8c0d58caf00 Parents: 08d34d2 Author: Yakov Zhdanov <[email protected]> Authored: Tue Apr 12 20:47:59 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Tue Apr 12 20:47:59 2016 +0300 ---------------------------------------------------------------------- .../datastructures/IgniteLockExample.java | 9 ++- .../main/java/org/apache/ignite/IgniteLock.java | 1 - .../datastructures/DataStructuresProcessor.java | 8 +-- .../datastructures/GridCacheLockEx.java | 1 - .../datastructures/GridCacheLockState.java | 75 +++++++++++++------- .../IgniteCacheDataStructuresSelfTestSuite.java | 6 ++ 6 files changed, 63 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/30dd1daf/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java index e6c19c3..1f84787 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datastructures/IgniteLockExample.java @@ -111,7 +111,6 @@ public class IgniteLockExample { } finally { lock.unlock(); - } } @@ -134,7 +133,6 @@ public class IgniteLockExample { ReentrantLockExampleClosure(String reentrantLockName) { this.reentrantLockName = reentrantLockName; } - } /** @@ -191,7 +189,6 @@ public class IgniteLockExample { } finally { lock.unlock(); - } } @@ -208,7 +205,8 @@ public class IgniteLockExample { // Signals the master thread. done.signal(); - }finally { + } + finally { lock.unlock(); } } @@ -286,7 +284,8 @@ public class IgniteLockExample { // Signals the master thread. done.signal(); - }finally { + } + finally { lock.unlock(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/30dd1daf/modules/core/src/main/java/org/apache/ignite/IgniteLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLock.java b/modules/core/src/main/java/org/apache/ignite/IgniteLock.java index cb3b942..9b5155f 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteLock.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLock.java @@ -91,7 +91,6 @@ import java.util.concurrent.locks.Lock; * */ public interface IgniteLock extends Lock, Closeable { - /** * Name of atomic reentrant lock. * http://git-wip-us.apache.org/repos/asf/ignite/blob/30dd1daf/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 105c262..1cad22f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -269,13 +269,11 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { super.onKernalStop(cancel); for (GridCacheRemovable ds : dsMap.values()) { - if (ds instanceof GridCacheSemaphoreEx) { + if (ds instanceof GridCacheSemaphoreEx) ((GridCacheSemaphoreEx)ds).stop(); - } - if (ds instanceof GridCacheLockEx) { + if (ds instanceof GridCacheLockEx) ((GridCacheLockEx)ds).onStop(); - } } if (initLatch.getCount() > 0) { @@ -1463,7 +1461,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { }, name, REENTRANT_LOCK, null); } - /** * Remove internal entry by key from cache. * @@ -1629,7 +1626,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { ", actual=" + reentrantLock.getClass() + ", value=" + reentrantLock + ']'); } } - } else { assert evt.getEventType() == EventType.REMOVED : evt; http://git-wip-us.apache.org/repos/asf/ignite/blob/30dd1daf/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockEx.java index a54b85b..0887345 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockEx.java @@ -49,5 +49,4 @@ public interface GridCacheLockEx extends IgniteLock, GridCacheRemovable { * Callback to notify local reentrant lock instance on node stop. */ public void onStop(); - } http://git-wip-us.apache.org/repos/asf/ignite/blob/30dd1daf/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java index dae7e9c..3feb9bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockState.java @@ -40,7 +40,7 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab /** Count. */ private int cnt; - /** Owner thread local id. */ + /** Owner thread local ID. */ private long threadId; /** Owner node ID. */ @@ -64,8 +64,10 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab @GridToStringInclude private LinkedList<UUID> nodes; - /** Flag indicating that global state changed. Used in fair mode to ensure that only successful acquires - * and releases trigger update. */ + /** + * Flag indicating that global state changed. + * Used in fair mode to ensure that only successful acquires and releases trigger update. + */ private boolean changed; /** @@ -117,73 +119,106 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab } /** - * @return Current owner thread id. + * @return Current owner thread ID. */ public long getThreadId() { return threadId; } /** - * @param threadId New thread owner id. + * @param threadId New thread owner ID. */ public void setThreadId(long threadId) { this.threadId = threadId; } /** - * @return Current owner node id. + * @return Current owner node ID. */ public UUID getId() { return id; } /** - * @return New owner node id. + * @return New owner node ID. */ public void setId(UUID id) { this.id = id; } + /** + * @return Failover safe flag. + */ public boolean isFailoverSafe() { return failoverSafe; } + /** + * @return Condition count. + */ public int condtionCount(){ return conditionMap.size(); } + /** + * @return Condition map. + */ public Map<String, LinkedList<UUID>> getConditionMap() { return conditionMap; } + /** + * @param conditionMap Condition map. + */ public void setConditionMap(Map<String, LinkedList<UUID>> conditionMap) { this.conditionMap = conditionMap; } + /** + * @return Signals. + */ public Map<UUID, LinkedList<String>> getSignals() { return signals; } + /** + * @param signals Signals. + */ public void setSignals(Map<UUID, LinkedList<String>> signals) { this.signals = signals; } + /** + * @return Nodes. + */ public LinkedList<UUID> getNodes() { return nodes; } + /** + * @param nodes Nodes. + */ public void setNodes(LinkedList<UUID> nodes) { this.nodes = nodes; } + /** + * @return Fair flag. + */ public boolean isFair() { return fair; } + /** + * @return Changed flag. + */ public boolean isChanged() { return changed; } + /** + * @param changed Changed flag. + */ public void setChanged(boolean changed) { this.changed = changed; } @@ -215,9 +250,8 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab out.writeInt(e.getValue().size()); - for(UUID uuid:e.getValue()){ + for (UUID uuid:e.getValue()) U.writeUuid(out, uuid); - } } } @@ -231,9 +265,8 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab out.writeInt(e.getValue().size()); - for(String condition:e.getValue()){ + for (String condition:e.getValue()) U.writeString(out, condition); - } } } @@ -242,9 +275,8 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab if (nodes != null) { out.writeInt(nodes.size()); - for (UUID uuid: nodes) { + for (UUID uuid: nodes) U.writeUuid(out, uuid); - } } } @@ -272,15 +304,14 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab LinkedList<UUID> list = new LinkedList(); - for (int j = 0; j < size1; j++) { + for (int j = 0; j < size1; j++) list.add(U.readUuid(in)); - } conditionMap.put(key, list); } } - if(in.readBoolean()) { + if (in.readBoolean()) { assert (conditionMap != null); int size = in.readInt(); @@ -294,29 +325,25 @@ public final class GridCacheLockState implements GridCacheInternal, Externalizab LinkedList<String> list = new LinkedList(); - for (int j = 0; j < size1; j++) { + for (int j = 0; j < size1; j++) list.add(U.readString(in)); - } signals.put(node, list); } } - else{ + else signals = null; - } if (in.readBoolean()) { int size = in.readInt(); nodes = new LinkedList(); - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; i++) nodes.add(U.readUuid(in)); - } } - else{ + else nodes = null; - } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/30dd1daf/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index e663a99..59a18e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -33,6 +33,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.local.GridCach import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalSetSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalAtomicLongApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalCountDownLatchSelfTest; +import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalLockSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.IgniteLocalSemaphoreSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest; @@ -66,6 +67,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest; +import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedLockSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSemaphoreSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest; @@ -80,6 +82,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.replicated.Gri import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedAtomicLongApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedCountDownLatchSelfTest; +import org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedLockSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedSemaphoreSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest; @@ -107,6 +110,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class)); suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class)); suite.addTest(new TestSuite(IgniteLocalSemaphoreSelfTest.class)); + suite.addTest(new TestSuite(IgniteLocalLockSelfTest.class)); suite.addTest(new TestSuite(GridCacheReplicatedSequenceApiSelfTest.class)); suite.addTest(new TestSuite(GridCacheReplicatedSequenceMultiNodeSelfTest.class)); @@ -117,6 +121,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCacheReplicatedDataStructuresFailoverSelfTest.class)); suite.addTest(new TestSuite(IgniteReplicatedCountDownLatchSelfTest.class)); suite.addTest(new TestSuite(IgniteReplicatedSemaphoreSelfTest.class)); + suite.addTest(new TestSuite(IgniteReplicatedLockSelfTest.class)); suite.addTest(new TestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class)); @@ -139,6 +144,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class)); suite.addTest(new TestSuite(IgniteDataStructureWithJobTest.class)); suite.addTest(new TestSuite(IgnitePartitionedSemaphoreSelfTest.class)); + suite.addTest(new TestSuite(IgnitePartitionedLockSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedSetFailoverSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedOffheapSetFailoverSelfTest.class));
