Skip to content

Commit 898d7be

Browse files
authored
IGNITE-26773 Use MessageSerializer for GridDhtAtomicSingleUpdateRequest (#12436)
1 parent aefdcc7 commit 898d7be

File tree

8 files changed

+182
-240
lines changed

8 files changed

+182
-240
lines changed

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.apache.ignite.internal.codegen.GridDhtAffinityAssignmentRequestSerializer;
5656
import org.apache.ignite.internal.codegen.GridDhtAtomicDeferredUpdateResponseSerializer;
5757
import org.apache.ignite.internal.codegen.GridDhtAtomicNearResponseSerializer;
58+
import org.apache.ignite.internal.codegen.GridDhtAtomicSingleUpdateRequestSerializer;
5859
import org.apache.ignite.internal.codegen.GridDhtAtomicUpdateResponseSerializer;
5960
import org.apache.ignite.internal.codegen.GridDhtForceKeysRequestSerializer;
6061
import org.apache.ignite.internal.codegen.GridDhtForceKeysResponseSerializer;
@@ -307,7 +308,7 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
307308
factory.register((short)-48, GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer());
308309
factory.register((short)-45, GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer());
309310
factory.register((short)-43, IgniteIoTestMessage::new);
310-
factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new);
311+
factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
311312
factory.register((short)-27, GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
312313
factory.register((short)-26, TxLockList::new, new TxLockListSerializer());
313314
factory.register((short)-25, TxLock::new, new TxLockSerializer());

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import javax.cache.processor.EntryProcessor;
2727
import org.apache.ignite.IgniteCheckedException;
2828
import org.apache.ignite.IgniteLogger;
29-
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
3029
import org.apache.ignite.cluster.ClusterNode;
3130
import org.apache.ignite.internal.IgniteInternalFuture;
3231
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
@@ -171,8 +170,6 @@ final void addWriteEntry(
171170
if (log.isDebugEnabled())
172171
log.debug("Mapping entry to DHT nodes [nodes=" + nodeIds(dhtNodes) + ", entry=" + entry + ']');
173172

174-
CacheWriteSynchronizationMode syncMode = updateReq.writeSynchronizationMode();
175-
176173
addDhtKey(entry.key(), dhtNodes);
177174

178175
for (int i = 0; i < dhtNodes.size(); i++) {
@@ -188,7 +185,6 @@ final void addWriteEntry(
188185
node.id(),
189186
futId,
190187
writeVer,
191-
syncMode,
192188
topVer,
193189
ttl,
194190
conflictExpireTime,
@@ -245,8 +241,6 @@ final void addNearWriteEntries(
245241
boolean readRepairRecovery) {
246242
assert readers != null;
247243

248-
CacheWriteSynchronizationMode syncMode = updateReq.writeSynchronizationMode();
249-
250244
addNearKey(entry.key(), readers);
251245

252246
AffinityTopologyVersion topVer = updateReq.topologyVersion();
@@ -278,7 +272,6 @@ final void addNearWriteEntries(
278272
node.id(),
279273
futId,
280274
writeVer,
281-
syncMode,
282275
topVer,
283276
ttl,
284277
expireTime,
@@ -435,7 +428,7 @@ private void initMapping(GridNearAtomicUpdateResponse updateRes) {
435428

436429
/**
437430
* @param nearNode Near node.
438-
* @param sndRes {@code True} if allow to send result from DHT nodes.
431+
* @param sndRes {@code True} if allow sending result from DHT nodes.
439432
* @param ret Return value.
440433
*/
441434
private void sendDhtRequests(ClusterNode nearNode, GridCacheReturn ret, boolean sndRes) {
@@ -513,7 +506,6 @@ final void onDhtResponse(UUID nodeId, GridDhtAtomicUpdateResponse res) {
513506
* @param nodeId Node ID.
514507
* @param futId Future ID.
515508
* @param writeVer Update version.
516-
* @param syncMode Write synchronization mode.
517509
* @param topVer Topology version.
518510
* @param ttl TTL.
519511
* @param conflictExpireTime Conflict expire time.
@@ -525,7 +517,6 @@ protected abstract GridDhtAtomicAbstractUpdateRequest createRequest(
525517
UUID nodeId,
526518
long futId,
527519
GridCacheVersion writeVer,
528-
CacheWriteSynchronizationMode syncMode,
529520
@NotNull AffinityTopologyVersion topVer,
530521
long ttl,
531522
long conflictExpireTime,

0 commit comments

Comments
 (0)