This is an automated email from the ASF dual-hosted git repository.
shishkovilja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d1a2e134a1e IGNITE-26437 Remove GridCacheMessage#handlerId and
#cacheGroupMessage (#12385)
d1a2e134a1e is described below
commit d1a2e134a1e31a0e4675364ff647589762c47b62
Author: Vladimir Steshin <[email protected]>
AuthorDate: Tue Oct 7 14:25:50 2025 +0300
IGNITE-26437 Remove GridCacheMessage#handlerId and #cacheGroupMessage
(#12385)
---
.../processors/cache/GridCacheGroupIdMessage.java | 10 ------
.../processors/cache/GridCacheIdMessage.java | 10 ------
.../processors/cache/GridCacheIoManager.java | 22 ++++++------
.../processors/cache/GridCacheMessage.java | 10 ------
.../GridChangeGlobalStateMessageResponse.java | 10 ------
.../GridDistributedTxFinishResponse.java | 10 ------
.../dht/GridDhtTxOnePhaseCommitAckRequest.java | 10 ------
.../dht/TransactionAttributesAwareRequest.java | 10 ------
.../GridDhtPartitionsAbstractMessage.java | 5 ---
.../preloader/GridDhtPartitionsFullMessage.java | 5 ---
.../preloader/GridDhtPartitionsSingleMessage.java | 5 ---
.../preloader/GridDhtPartitionsSingleRequest.java | 5 ---
.../snapshot/IncrementalSnapshotAwareMessage.java | 10 ------
.../cache/transactions/TxLocksRequest.java | 10 ------
.../cache/transactions/TxLocksResponse.java | 10 ------
.../GridCacheConditionalDeploymentSelfTest.java | 10 ------
.../communication/GridCacheMessageSelfTest.java | 40 ----------------------
17 files changed, 10 insertions(+), 182 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
index 114b1982e5e..c8b20778c43 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
@@ -47,16 +47,6 @@ public abstract class GridCacheGroupIdMessage extends
GridCacheMessage {
this.grpId = grpId;
}
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public final int handlerId() {
- return grpId;
- }
-
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
// TODO: Safe to remove only after all inheritors have migrated to the
new ser/der scheme (IGNITE-25490).
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
index 8a9c8a4da58..deed796f84f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
@@ -40,11 +40,6 @@ public abstract class GridCacheIdMessage extends
GridCacheMessage {
return cacheId;
}
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/**
* @param cacheId Cache ID.
*/
@@ -101,11 +96,6 @@ public abstract class GridCacheIdMessage extends
GridCacheMessage {
return true;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return cacheId;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridCacheIdMessage.class, this, "super",
super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 201bd14f698..6bd6c5cf443 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -313,17 +313,8 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
* @param plc Message policy.
*/
private void handleMessage(UUID nodeId, GridCacheMessage cacheMsg, byte
plc) {
- handleMessage(nodeId, cacheMsg, cacheMsg.cacheGroupMessage() ?
grpHandlers : cacheHandlers, plc);
- }
+ MessageHandlers msgHandlers = cacheMsg instanceof
GridCacheGroupIdMessage ? grpHandlers : cacheHandlers;
- /**
- * @param nodeId Sender node ID.
- * @param cacheMsg Message.
- * @param msgHandlers Message handlers.
- * @param plc Message policy.
- */
- @SuppressWarnings("unchecked")
- private void handleMessage(UUID nodeId, GridCacheMessage cacheMsg,
MessageHandlers msgHandlers, byte plc) {
Lock lock = rw.readLock();
lock.lock();
@@ -335,10 +326,17 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
IgniteBiInClosure<UUID, GridCacheMessage> c = null;
+ int cacheOrGrpId = 0;
+
+ if (cacheMsg instanceof GridCacheIdMessage)
+ cacheOrGrpId = ((GridCacheIdMessage)cacheMsg).cacheId();
+ else if (cacheMsg instanceof GridCacheGroupIdMessage)
+ cacheOrGrpId = ((GridCacheGroupIdMessage)cacheMsg).groupId();
+
if (msgIdx >= 0) {
Map<Integer, IndexedClassHandler> idxClsHandlers0 =
msgHandlers.idxClsHandlers;
- IndexedClassHandler cacheClsHandlers =
idxClsHandlers0.get(cacheMsg.handlerId());
+ IndexedClassHandler cacheClsHandlers =
idxClsHandlers0.get(cacheOrGrpId);
if (cacheClsHandlers != null &&
(NONE.equals(msgTopVer) ||
!msgTopVer.before(cacheClsHandlers.startTopVer)))
@@ -347,7 +345,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
if (c == null) {
RegularClassHandler rHnd = msgHandlers.clsHandlers.get(
- new ListenerKey(cacheMsg.handlerId(),
cacheMsg.getClass()));
+ new ListenerKey(cacheOrGrpId, cacheMsg.getClass()));
if (rHnd != null && (NONE.equals(msgTopVer) ||
!msgTopVer.before(rHnd.startTopVer)))
c = rHnd.hnd;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index d5566f5917b..c17fa7ac9fb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -84,16 +84,6 @@ public abstract class GridCacheMessage implements Message {
/** */
private boolean skipPrepare;
- /**
- * @return ID to distinguish message handlers for the same messages but
for different caches/cache groups.
- */
- public abstract int handlerId();
-
- /**
- * @return {@code True} if cache group message.
- */
- public abstract boolean cacheGroupMessage();
-
/**
* @return Error, if any.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
index 8533185cf5a..ed45705fe40 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
@@ -56,16 +56,6 @@ public class GridChangeGlobalStateMessageResponse extends
GridCacheMessage {
this.err = err;
}
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
/**
*
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 822eb295415..825745808c8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -67,16 +67,6 @@ public class GridDistributedTxFinishResponse extends
GridCacheMessage {
this.futId = futId;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public final int partition() {
return part;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
index 5db3b918fd5..c0e6801376f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
@@ -40,16 +40,6 @@ public class GridDhtTxOnePhaseCommitAckRequest extends
GridCacheMessage {
// No-op.
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/**
*
* @param vers Near Tx xid Versions.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
index 7515f38d7d5..f7ac69f85ea 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
@@ -80,16 +80,6 @@ public class TransactionAttributesAwareRequest extends
GridCacheMessage {
payload.finishUnmarshal(ctx, ldr);
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
return false;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index 30f901fe3ff..15a015d1114 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -74,11 +74,6 @@ public abstract class GridDhtPartitionsAbstractMessage
extends GridCacheMessage
msg.flags = flags;
}
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public int partition() {
return GridIoMessage.STRIPE_DISABLED_PART;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index f18087359f0..926a77c7644 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -255,11 +255,6 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
this.idealAffDiff = idealAffDiff;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
/**
* @return Local partitions.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index d47f0f3312a..868867a2316 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -157,11 +157,6 @@ public class GridDhtPartitionsSingleMessage extends
GridDhtPartitionsAbstractMes
return grpsAffRequest;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
/**
* @return {@code True} if sent from client node.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index 48411cdaf7c..2e3159ad80f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -72,11 +72,6 @@ public class GridDhtPartitionsSingleRequest extends
GridDhtPartitionsAbstractMes
this.restoreExchId = restoreExchId;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 48;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
index 19ea08945bf..fdf55154b41 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
@@ -131,14 +131,4 @@ public class IncrementalSnapshotAwareMessage extends
GridCacheMessage {
@Override public boolean addDeploymentInfo() {
return false;
}
-
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
index a5198d78c25..afaedd8adef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
@@ -64,16 +64,6 @@ public class TxLocksRequest extends GridCacheMessage {
this.txKeys = txKeys;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/**
* @return Future ID.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
index bf471c0532b..7d7adc66ce2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
@@ -68,16 +68,6 @@ public class TxLocksResponse extends GridCacheMessage {
// No-op.
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/**
* @return Future ID.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index e851589f813..ce8d2064f78 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -131,16 +131,6 @@ public class GridCacheConditionalDeploymentSelfTest
extends GridCommonAbstractTe
/** */
public static final short DIRECT_TYPE = 302;
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return DIRECT_TYPE;
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
index 7cd3e937938..1699b90a872 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
@@ -235,16 +235,6 @@ public class GridCacheMessageSelfTest extends
GridCommonAbstractTest {
entries.add(entry);
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
return false;
@@ -332,16 +322,6 @@ public class GridCacheMessageSelfTest extends
GridCommonAbstractTest {
this.body = body;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
return false;
@@ -457,16 +437,6 @@ public class GridCacheMessageSelfTest extends
GridCommonAbstractTest {
this.body = body;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
return false;
@@ -623,16 +593,6 @@ public class GridCacheMessageSelfTest extends
GridCommonAbstractTest {
this.body = body;
}
- /** {@inheritDoc} */
- @Override public int handlerId() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override public boolean cacheGroupMessage() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
return false;
