Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-2893 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java # modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java # modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89bfbad1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89bfbad1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89bfbad1 Branch: refs/heads/ignite-2893 Commit: 89bfbad19b398446320c7e519aa9d6e74d49c037 Parents: 81835e4 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 20 10:46:58 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 20 10:46:58 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/transactions/IgniteTxEntry.java | 9 --------- .../datastructures/DataStructuresProcessor.java | 6 +++--- .../datastructures/GridCacheAtomicReferenceImpl.java | 6 ------ .../datastructures/GridCacheAtomicStampedImpl.java | 6 ------ .../processors/datastructures/GridCacheLockImpl.java | 11 +++++------ .../datastructures/GridCacheSemaphoreImpl.java | 4 ++-- 6 files changed, 10 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/89bfbad1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index c9c4f34..163ed99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -88,15 +88,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { /** Flag indicating that old value for 'invoke' operation was non null on primary node. */ private static final int TX_ENTRY_OLD_VAL_ON_PRIMARY = 0x04; - /** Skip store flag bit mask. */ - private static final int TX_ENTRY_SKIP_STORE_FLAG_MASK = 0x01; - - /** Keep binary flag. */ - private static final int TX_ENTRY_KEEP_BINARY_FLAG_MASK = 0x02; - - /** Flag indicating that old value for 'invoke' operation was non null on primary node. */ - private static final int TX_ENTRY_OLD_VAL_ON_PRIMARY = 0x04; - /** Prepared flag updater. */ private static final AtomicIntegerFieldUpdater<IgniteTxEntry> PREPARED_UPD = AtomicIntegerFieldUpdater.newUpdater(IgniteTxEntry.class, "prepared"); http://git-wip-us.apache.org/repos/asf/ignite/blob/89bfbad1/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 fb1770e..0a439dc 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 @@ -629,7 +629,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen * @param name Atomic long name. * @throws IgniteCheckedException If removing failed. */ - public final void removeAtomicLong(final String name) throws IgniteCheckedException { + final void removeAtomicLong(final String name) throws IgniteCheckedException { assert name != null; assert dsCacheCtx != null; @@ -788,7 +788,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen * @param name Atomic reference name. * @throws IgniteCheckedException If removing failed. */ - public final void removeAtomicReference(final String name) throws IgniteCheckedException { + final void removeAtomicReference(final String name) throws IgniteCheckedException { assert name != null; assert dsCacheCtx != null; @@ -890,7 +890,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen * @param name Atomic stamped name. * @throws IgniteCheckedException If removing failed. */ - public final void removeAtomicStamped(final String name) throws IgniteCheckedException { + final void removeAtomicStamped(final String name) throws IgniteCheckedException { assert name != null; assert dsCacheCtx != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/89bfbad1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java index 667fd15..b7dc007 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java @@ -28,7 +28,6 @@ import javax.cache.processor.EntryProcessorResult; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.cache.GridCacheContext; @@ -54,9 +53,6 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef } }; - /** Logger. */ - private IgniteLogger log; - /** Atomic reference name. */ private String name; @@ -103,8 +99,6 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef this.key = key; this.atomicView = atomicView; this.name = name; - - log = ctx.logger(getClass()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/89bfbad1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java index 877b158..3f14942 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java @@ -28,7 +28,6 @@ import javax.cache.processor.EntryProcessorResult; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.cache.GridCacheContext; @@ -54,9 +53,6 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt } }; - /** Logger. */ - private IgniteLogger log; - /** Atomic stamped name. */ private String name; @@ -103,8 +99,6 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt this.key = key; this.atomicView = atomicView; this.name = name; - - log = ctx.logger(getClass()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/89bfbad1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java index 341c59b..e154850 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java @@ -725,9 +725,9 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo // If this lock is fair, remove this node from queue. if (val.isFair() && newVal == 0) { - UUID removedNode = val.getNodes().removeFirst(); + UUID rmvdNode = val.getNodes().removeFirst(); - assert(thisNode.equals(removedNode)); + assert(thisNode.equals(rmvdNode)); } // Get global condition queue. @@ -1127,7 +1127,7 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo return; // Check if update came from this node. - boolean local = sync.isLockedLocally(val.getId()); + boolean loc = sync.isLockedLocally(val.getId()); // Process any incoming signals. boolean incomingSignals = sync.checkIncomingSignals(val); @@ -1142,7 +1142,7 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo sync.setCurrentOwnerThread(val.getThreadId()); // Check if any threads waiting on this node need to be notified. - if ((incomingSignals || sync.getPermits() == 0) && !local) { + if ((incomingSignals || sync.getPermits() == 0) && !loc) { // Try to notify any waiting threads. sync.release(0); } @@ -1160,9 +1160,8 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo if (nodeId.equals(sync.getOwnerNode())) { sync.setBroken(true); - if (!sync.failoverSafe) { + if (!sync.failoverSafe) sync.interruptAll(); - } } // Try to notify any waiting threads. http://git-wip-us.apache.org/repos/asf/ignite/blob/89bfbad1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java index 903423d..edc322e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java @@ -803,7 +803,7 @@ public final class GridCacheSemaphoreImpl implements GridCacheSemaphoreEx, Ignit try { initializeSemaphore(); - boolean result = sync.tryAcquireSharedNanos(1, unit.toNanos(timeout)); + boolean res = sync.tryAcquireSharedNanos(1, unit.toNanos(timeout)); if (isBroken()) { Thread.interrupted(); // Clear interrupt flag. @@ -811,7 +811,7 @@ public final class GridCacheSemaphoreImpl implements GridCacheSemaphoreEx, Ignit throw new InterruptedException(); } - return result; + return res; } catch (IgniteCheckedException e) { throw U.convertException(e);
