Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ILock, ICondition and their implementations #15625

Merged
merged 1 commit into from Oct 2, 2019

Conversation

@mdogan
Copy link
Member

mdogan commented Sep 27, 2019

Old LockService is moved to internal locksupport package.
It's still provides locking support to IMap and MultiMap.

Client protocol PR: hazelcast/hazelcast-client-protocol#233
EE: hazelcast/hazelcast-enterprise#3186

@mdogan mdogan added this to the 4.0 milestone Sep 27, 2019
@mdogan mdogan requested a review from hazelcast/clients as a code owner Sep 27, 2019
@mdogan mdogan force-pushed the mdogan:remove-legacy-lock branch from ac9e72d to 2cb0776 Sep 27, 2019
@sancar
sancar approved these changes Sep 30, 2019
@mdogan mdogan force-pushed the mdogan:remove-legacy-lock branch from 2cb0776 to 7f0af9e Sep 30, 2019
@vojtechtoman vojtechtoman self-requested a review Sep 30, 2019
Old LockService is moved to internal `locksupport` package.
It's still provides locking support to `IMap` and `MultiMap`.
@metanet
metanet approved these changes Oct 2, 2019
@mdogan mdogan force-pushed the mdogan:remove-legacy-lock branch from 7f0af9e to 5954576 Oct 2, 2019
@mdogan

This comment has been minimized.

Copy link
Member Author

mdogan commented Oct 2, 2019

run-lab-run

@mdogan mdogan merged commit e159655 into hazelcast:master Oct 2, 2019
1 check passed
1 check passed
default Test PASSed.
Details
@mdogan mdogan deleted the mdogan:remove-legacy-lock branch Oct 2, 2019
@@ -19,5 +19,5 @@
*
* @since 1
*/
package com.hazelcast.cp.internal.datastructures.unsafe.lock.operations;
package com.hazelcast.internal.locksupport.operations;

This comment has been minimized.

Copy link
@vojtechtoman

vojtechtoman Oct 2, 2019

Contributor

Javadoc still mentions ILock. Actually, there are more places that refer to ILock or ICondition if I search in the workspace:

./hazelcast/src/main/java/com/hazelcast/internal/locksupport/LockStoreImpl.java:50:    // warning: the namespace field is unreliable if this LockStoreImpl was created for ILock proxy
./hazelcast/src/main/java/com/hazelcast/internal/locksupport/LockStoreImpl.java:52:    // are shared for ILock proxies. see InternalLockNamespace for details.
./hazelcast/src/main/java/com/hazelcast/internal/locksupport/operations/package-info.java:18: * <p>This package contains the operations on the ILock.<br>
./hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/Operation.java:533:     * <li>in case of ILock.tryLock(10, ms), the wait timeout is 10 ms</li>
./hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/Operation.java:534:     * <li>in case of ILock.lock(), the wait timeout is -1</li>
./hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/Operation.java:535:     * <li>in case of ILock.tryLock(), the wait timeout is 0.</li>
./hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/BlockingOperation.java:20: * An interface that can be implemented by an operation that can block. For example an ILock.acquire.
./hazelcast/src/main/java/com/hazelcast/spi/properties/GroupProperty.java:863:     * - certain methods like those from the IExecutor or ILock are also invocations and they can be very long running.
./hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/lock/operation/package-info.java:19: * {@link com.hazelcast.cp.lock.ILock} implementation
./hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/lock/proxy/package-info.java:18: * Contains {@link com.hazelcast.cp.lock.ILock} functionality
./hazelcast/src/main/java/com/hazelcast/cp/internal/datastructures/lock/package-info.java:18: * Contains service classes for the Raft-based {@link com.hazelcast.cp.lock.ILock}
./hazelcast-spring/src/main/resources/hazelcast-spring-4.0.xsd:1793:                Retrieve a Hazelcast ILock instance
./hazelcast-spring/src/main/resources/hazelcast-spring-4.0.xsd:1797:                    <tool:exports type="com.hazelcast.cp.lock.ILock"/>
./hazelcast/src/main/java/com/hazelcast/spi/impl/operationservice/WaitNotifyKey.java:20: * A key for a wait notify object e.g. an ICondition.

This comment has been minimized.

Copy link
@mdogan

mdogan Oct 2, 2019

Author Member

Removed these mentions in #15661

@@ -196,6 +197,9 @@ public void run(Operation op) {

ensureNoPartitionProblems(op);

if (op instanceof IsLockedOperation) {

This comment has been minimized.

Copy link
@vojtechtoman

vojtechtoman Oct 2, 2019

Contributor

A leftover?

This comment has been minimized.

Copy link
@mdogan

mdogan Oct 2, 2019

Author Member

🤦‍♂

This comment has been minimized.

Copy link
@mdogan

mdogan Oct 2, 2019

Author Member

Removed in #15661

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.