Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 4b67acb71 -> 421e06e81
IGNITE-80 - Code cleanup. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/421e06e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/421e06e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/421e06e8 Branch: refs/heads/ignite-80 Commit: 421e06e8178a3e480c6528ca329539a657a96c5f Parents: 4b67acb Author: Alexey Goncharuk <[email protected]> Authored: Tue Apr 28 16:47:34 2015 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Apr 28 16:47:34 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheMvcc.java | 3 --- .../processors/cache/GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 -- .../distributed/dht/colocated/GridDhtColocatedLockFuture.java | 1 - .../cache/distributed/near/GridNearTxPrepareFuture.java | 4 +--- .../internal/processors/cache/transactions/IgniteTxManager.java | 2 -- .../testsuites/IgniteCacheDataStructuresSelfTestSuite.java | 2 ++ 7 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java index 8f2f395..158ec8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java @@ -690,9 +690,6 @@ public final class GridCacheMvcc { if (c.owner()) continue; - if (c.ready()) - GridDebug.dump(log); - assert !c.ready() : "Cannot have more then one ready near-local candidate [c=" + c + ", cand=" + cand + ", mvcc=" + this + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index cea6b2c..e61168e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -409,7 +409,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana * @param ver Topology version. * @return Future or {@code null} is future is already completed. */ - public @Nullable IgniteInternalFuture<?> affinityReadyFuture(AffinityTopologyVersion ver) { + @Nullable public IgniteInternalFuture<?> affinityReadyFuture(AffinityTopologyVersion ver) { GridDhtPartitionsExchangeFuture lastInitializedFut0 = lastInitializedFut; if (lastInitializedFut0 != null && lastInitializedFut0.topologyVersion().compareTo(ver) == 0) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 7256b5a..6fae10b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -493,8 +493,6 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu tx.state(PREPARED); } - GridDebug.debug("Completing DHT tx prepare future [locNodeId=" + cctx.localNodeId() + ", ver=" + tx.xidVersion() + ", nearVer=" + tx.nearXidVersion() + ']'); - if (tx.onePhaseCommit()) { assert last; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 64f2901..6292f2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index 8b4a469..806bbfa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -417,9 +417,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut return null; } - GridDhtTopologyFuture fut = nonLocCtx.topology().topologyVersionFuture(); - - return fut; + return nonLocCtx.topology().topologyVersionFuture(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index cfcb0df..874e640 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -1199,8 +1199,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (log.isDebugEnabled()) log.debug("Committing from TM [locNodeId=" + cctx.localNodeId() + ", tx=" + tx + ']'); - GridDebug.debug("Committing from TM [locNodeId=" + cctx.localNodeId() + ", xidVer=" + tx.xidVersion() + - ", type=" + tx.getClass().getSimpleName() + ']'); if (tx.timeout() > 0) { cctx.time().removeTimeoutObject(tx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/421e06e8/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 1cf2db6..2f8be2b 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 @@ -66,6 +66,8 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class));
