ignite-2333 : Reverted changes in index calculation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46f3f6c0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46f3f6c0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46f3f6c0 Branch: refs/heads/ignite-2333 Commit: 46f3f6c068ff7815c3cb0305a5ba3b7e4191b4e0 Parents: 13b3f4b Author: Ilya Lantukh <[email protected]> Authored: Wed Feb 24 12:15:19 2016 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Wed Feb 24 12:15:19 2016 +0300 ---------------------------------------------------------------------- .../internal/util/StripedCompositeReadWriteLock.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/46f3f6c0/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java index 1a8ce2e..c1e32f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.util; import org.jetbrains.annotations.NotNull; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; @@ -45,18 +44,6 @@ public class StripedCompositeReadWriteLock implements ReadWriteLock { private final CompositeWriteLock compositeWriteLock; /** - * Atomic field updated for {@link #counter}. - */ - private static final AtomicIntegerFieldUpdater<StripedCompositeReadWriteLock> COUNTER_UPD = - AtomicIntegerFieldUpdater.newUpdater(StripedCompositeReadWriteLock.class, "counter"); - - /** - * Counter of {@link #readLock()} calls. - */ - @SuppressWarnings("UnusedDeclaration") - private volatile int counter = 0; - - /** * Creates a new instance with given concurrency level. * * @param concurrencyLvl Number of internal read locks. @@ -72,7 +59,7 @@ public class StripedCompositeReadWriteLock implements ReadWriteLock { /** {@inheritDoc} */ @NotNull @Override public Lock readLock() { - int idx = Math.abs(COUNTER_UPD.getAndIncrement(this) % locks.length); + int idx = (int) Thread.currentThread().getId() % locks.length; return locks[idx].readLock(); }
