ascherbakoff commented on code in PR #4540:
URL: https://github.com/apache/ignite-3/pull/4540#discussion_r1812133969
##########
modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/HeapLockManager.java:
##########
@@ -328,10 +357,359 @@ private LockState adjustLockState(LockState state,
LockState v) {
}
}
+ private void track(UUID txId, Releasable val) {
+ txMap.compute(txId, (k, v) -> {
+ if (v == null) {
+ v = new ConcurrentLinkedQueue<>();
+ }
+
+ v.add(val);
+
+ return v;
+ });
+ }
+
+ /**
+ * Create lock exception with given parameters.
+ *
+ * @param locker Locker.
+ * @param holder Lock holder.
+ * @return Lock exception.
+ */
+ private static LockException lockException(UUID locker, UUID holder) {
+ return new LockException(ACQUIRE_LOCK_ERR,
+ "Failed to acquire a lock due to a possible deadlock [locker="
+ locker + ", holder=" + holder + ']');
+ }
+
+ /**
+ * Create lock exception when lock holder is believed to be missing.
+ *
+ * @param locker Locker.
+ * @param holder Lock holder.
+ * @return Lock exception.
+ */
+ private static LockException abandonedLockException(UUID locker, UUID
holder) {
+ return new LockException(ACQUIRE_LOCK_ERR,
+ "Failed to acquire an abandoned lock due to a possible
deadlock [locker=" + locker + ", holder=" + holder + ']');
+ }
+
+ /**
+ * Common interface for releasing transaction locks.
+ */
+ interface Releasable {
+ /**
+ * Tries to release a lock.
+ *
+ * @param txId Tx id.
+ * @return {@code True} if lock state requires cleanup after release.
+ */
+ boolean tryRelease(UUID txId);
+
+ /**
+ * Gets associated lock key.
+ *
+ * @return Lock key.
+ */
+ LockKey key();
+
+ /**
+ * Returns the lock which is requested by given tx.
+ *
+ * @param txId Tx id.
+ * @return The lock or null if no lock exist.
+ */
+ @Nullable Lock lock(UUID txId);
+
+ /**
+ * Returns lock type.
+ *
+ * @return The type.
+ */
+ boolean coarse();
+ }
+
+ /**
+ * Coarse lock.
+ */
+ public class CoarseLockState implements Releasable {
+ private final IgniteStripedReadWriteLock stripedLock = new
IgniteStripedReadWriteLock(CONCURRENCY);
+
+ private final ConcurrentHashMap<UUID, Lock> ixlockOwners = new
ConcurrentHashMap<>();
+ private final Map<UUID, IgniteBiTuple<Lock, CompletableFuture<Lock>>>
slockWaiters = new HashMap<>();
+ private final ConcurrentHashMap<UUID, Lock> slockOwners = new
ConcurrentHashMap<>();
+
+ private final LockKey lockKey;
+
+ CoarseLockState(LockKey lockKey) {
+ this.lockKey = lockKey;
+ }
+
+ @Override
+ public boolean tryRelease(UUID txId) {
+ Lock lock = lock(txId);
+
+ release(lock);
+
+ return false;
+ }
+
+ @Override
+ public LockKey key() {
+ return lockKey;
+ }
+
+ @Override
+ public Lock lock(UUID txId) {
+ Lock lock = ixlockOwners.get(txId);
+
+ if (lock != null) {
+ return lock;
+ }
+
+ int idx = Math.floorMod(spread(txId.hashCode()), CONCURRENCY);
Review Comment:
Because txId.hashCode() % CONCURRENCY is incorrect and can produce overflow.
##########
modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/HeapLockManager.java:
##########
@@ -328,10 +357,359 @@ private LockState adjustLockState(LockState state,
LockState v) {
}
}
+ private void track(UUID txId, Releasable val) {
+ txMap.compute(txId, (k, v) -> {
+ if (v == null) {
+ v = new ConcurrentLinkedQueue<>();
+ }
+
+ v.add(val);
+
+ return v;
+ });
+ }
+
+ /**
+ * Create lock exception with given parameters.
+ *
+ * @param locker Locker.
+ * @param holder Lock holder.
+ * @return Lock exception.
+ */
+ private static LockException lockException(UUID locker, UUID holder) {
+ return new LockException(ACQUIRE_LOCK_ERR,
+ "Failed to acquire a lock due to a possible deadlock [locker="
+ locker + ", holder=" + holder + ']');
+ }
+
+ /**
+ * Create lock exception when lock holder is believed to be missing.
+ *
+ * @param locker Locker.
+ * @param holder Lock holder.
+ * @return Lock exception.
+ */
+ private static LockException abandonedLockException(UUID locker, UUID
holder) {
+ return new LockException(ACQUIRE_LOCK_ERR,
+ "Failed to acquire an abandoned lock due to a possible
deadlock [locker=" + locker + ", holder=" + holder + ']');
+ }
+
+ /**
+ * Common interface for releasing transaction locks.
+ */
+ interface Releasable {
+ /**
+ * Tries to release a lock.
+ *
+ * @param txId Tx id.
+ * @return {@code True} if lock state requires cleanup after release.
+ */
+ boolean tryRelease(UUID txId);
+
+ /**
+ * Gets associated lock key.
+ *
+ * @return Lock key.
+ */
+ LockKey key();
+
+ /**
+ * Returns the lock which is requested by given tx.
+ *
+ * @param txId Tx id.
+ * @return The lock or null if no lock exist.
+ */
+ @Nullable Lock lock(UUID txId);
+
+ /**
+ * Returns lock type.
+ *
+ * @return The type.
+ */
+ boolean coarse();
+ }
+
+ /**
+ * Coarse lock.
+ */
+ public class CoarseLockState implements Releasable {
+ private final IgniteStripedReadWriteLock stripedLock = new
IgniteStripedReadWriteLock(CONCURRENCY);
+
+ private final ConcurrentHashMap<UUID, Lock> ixlockOwners = new
ConcurrentHashMap<>();
+ private final Map<UUID, IgniteBiTuple<Lock, CompletableFuture<Lock>>>
slockWaiters = new HashMap<>();
+ private final ConcurrentHashMap<UUID, Lock> slockOwners = new
ConcurrentHashMap<>();
+
+ private final LockKey lockKey;
+
+ CoarseLockState(LockKey lockKey) {
+ this.lockKey = lockKey;
+ }
+
+ @Override
+ public boolean tryRelease(UUID txId) {
+ Lock lock = lock(txId);
+
+ release(lock);
+
+ return false;
+ }
+
+ @Override
+ public LockKey key() {
+ return lockKey;
+ }
+
+ @Override
+ public Lock lock(UUID txId) {
+ Lock lock = ixlockOwners.get(txId);
+
+ if (lock != null) {
+ return lock;
+ }
+
+ int idx = Math.floorMod(spread(txId.hashCode()), CONCURRENCY);
Review Comment:
Because txId.hashCode() % CONCURRENCY is incorrect and can produce negative
index.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
