From 18b2a7ab0a4424037cf6aef65394366de3fbdc58 Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 14 Apr 2026 18:33:49 +0300 Subject: [PATCH 1/2] impl --- .../ignite/internal/CoreMessagesProvider.java | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java index bf05fd4a12c0f..c078d7370757a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java @@ -435,73 +435,73 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe withNoSchema(ClientCacheChangeDummyDiscoveryMessage.class); withNoSchemaResolvedClassLoader(DynamicCacheChangeBatch.class); - // [10000 - 10200]: Transaction and lock related messages. Most of the originally comes from Communication. + // [10000 - 10200]: Transaction and lock related messages. Most of them originally comes from Communication. msgIdx = 10000; withNoSchema(TxInfo.class); - withNoSchema(TxEntriesInfo.class); + withSchema(TxEntriesInfo.class); withNoSchema(TxLock.class); - withNoSchema(TxLocksRequest.class); - withNoSchema(TxLocksResponse.class); - withNoSchema(IgniteTxKey.class); - withNoSchema(IgniteTxEntry.class); - withNoSchema(TxEntryValueHolder.class); + withSchema(TxLocksRequest.class); + withSchema(TxLocksResponse.class); + withSchema(IgniteTxKey.class); + withSchema(IgniteTxEntry.class); + withSchema(TxEntryValueHolder.class); withNoSchema(GridCacheTxRecoveryRequest.class); withNoSchema(GridCacheTxRecoveryResponse.class); withNoSchema(GridDistributedTxFinishRequest.class); withNoSchema(GridDistributedTxFinishResponse.class); - withNoSchema(GridDistributedTxPrepareRequest.class); + withSchema(GridDistributedTxPrepareRequest.class); withNoSchema(GridDistributedTxPrepareResponse.class); withNoSchema(GridDhtTxFinishRequest.class); - withNoSchema(GridDhtTxFinishResponse.class); - withNoSchema(GridDhtTxPrepareRequest.class); - withNoSchema(GridDhtTxPrepareResponse.class); + withSchema(GridDhtTxFinishResponse.class); + withSchema(GridDhtTxPrepareRequest.class); + withSchema(GridDhtTxPrepareResponse.class); withNoSchema(GridNearTxFinishRequest.class); withNoSchema(GridNearTxFinishResponse.class); withNoSchema(GridNearTxPrepareRequest.class); - withNoSchema(GridNearTxPrepareResponse.class); - withNoSchema(GridDhtLockRequest.class); - withNoSchema(GridDhtLockResponse.class); - withNoSchema(GridDhtUnlockRequest.class); + withSchema(GridNearTxPrepareResponse.class); + withSchema(GridDhtLockRequest.class); + withSchema(GridDhtLockResponse.class); + withSchema(GridDhtUnlockRequest.class); withNoSchema(GridNearLockRequest.class); withNoSchema(GridNearLockResponse.class); - withNoSchema(GridNearUnlockRequest.class); - withNoSchema(GridDistributedLockRequest.class); - withNoSchema(GridDistributedLockResponse.class); + withSchema(GridNearUnlockRequest.class); + withSchema(GridDistributedLockRequest.class); + withSchema(GridDistributedLockResponse.class); withNoSchema(GridDhtTxOnePhaseCommitAckRequest.class); - withNoSchema(TransactionAttributesAwareRequest.class); + withSchema(TransactionAttributesAwareRequest.class); // [10300 - 10500]: Cache, DHT messages. msgIdx = 10300; - withNoSchema(GridDhtForceKeysRequest.class); - withNoSchema(GridDhtForceKeysResponse.class); + withSchema(GridDhtForceKeysRequest.class); + withSchema(GridDhtForceKeysResponse.class); withNoSchema(GridDhtAtomicDeferredUpdateResponse.class); - withNoSchema(GridDhtAtomicUpdateRequest.class); - withNoSchema(GridDhtAtomicUpdateResponse.class); - withNoSchema(GridNearAtomicFullUpdateRequest.class); - withNoSchema(GridDhtAtomicSingleUpdateRequest.class); - withNoSchema(GridNearAtomicUpdateResponse.class); - withNoSchema(GridNearAtomicSingleUpdateRequest.class); - withNoSchema(GridNearAtomicSingleUpdateInvokeRequest.class); - withNoSchema(GridNearAtomicSingleUpdateFilterRequest.class); + withSchema(GridDhtAtomicUpdateRequest.class); + withSchema(GridDhtAtomicUpdateResponse.class); + withSchema(GridNearAtomicFullUpdateRequest.class); + withSchema(GridDhtAtomicSingleUpdateRequest.class); + withSchema(GridNearAtomicUpdateResponse.class); + withSchema(GridNearAtomicSingleUpdateRequest.class); + withSchema(GridNearAtomicSingleUpdateInvokeRequest.class); + withSchema(GridNearAtomicSingleUpdateFilterRequest.class); withNoSchema(GridNearAtomicCheckUpdateRequest.class); - withNoSchema(NearCacheUpdates.class); - withNoSchema(GridNearGetRequest.class); - withNoSchema(GridNearGetResponse.class); - withNoSchema(GridNearSingleGetRequest.class); - withNoSchema(GridNearSingleGetResponse.class); + withSchema(NearCacheUpdates.class); + withSchema(GridNearGetRequest.class); + withSchema(GridNearGetResponse.class); + withSchema(GridNearSingleGetRequest.class); + withSchema(GridNearSingleGetResponse.class); withNoSchema(GridDhtAtomicNearResponse.class); - withNoSchema(GridCacheTtlUpdateRequest.class); - withNoSchema(GridCacheReturn.class); - withNoSchema(GridCacheEntryInfo.class); - withNoSchema(CacheInvokeDirectResult.class); + withSchema(GridCacheTtlUpdateRequest.class); + withSchema(GridCacheReturn.class); + withSchema(GridCacheEntryInfo.class); + withSchema(CacheInvokeDirectResult.class); withNoSchema(GridCacheRawVersionedEntry.class); - withNoSchema(CacheEvictionEntry.class); - withNoSchema(CacheEntryPredicateAdapter.class); + withSchema(CacheEvictionEntry.class); + withSchema(CacheEntryPredicateAdapter.class); withNoSchema(GridContinuousMessage.class); withNoSchema(ContinuousRoutineStartResultMessage.class); - withNoSchema(UpdateErrors.class); + withSchema(UpdateErrors.class); withNoSchema(LatchAckMessage.class); - withNoSchema(AtomicApplicationAttributesAwareRequest.class); + withSchema(AtomicApplicationAttributesAwareRequest.class); withNoSchema(StartRequestData.class); withNoSchema(StartRoutineDiscoveryMessage.class); withNoSchema(StartRoutineAckDiscoveryMessage.class); @@ -524,7 +524,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe withNoSchema(GridDhtPartitionExchangeId.class); withNoSchema(GridCheckpointRequest.class); withNoSchema(GridDhtPartitionDemandMessage.class); - withNoSchema(GridDhtPartitionSupplyMessage.class); + withSchema(GridDhtPartitionSupplyMessage.class); withNoSchema(GridDhtPartitionsFullMessage.class); withNoSchema(GridDhtPartitionsSingleMessage.class); withNoSchema(GridDhtPartitionsSingleRequest.class); @@ -541,8 +541,8 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe withNoSchema(SchemaFinishDiscoveryMessage.class); withNoSchema(QueryField.class); withNoSchema(GridCacheSqlQuery.class); - withNoSchema(GridCacheQueryRequest.class); - withNoSchema(GridCacheQueryResponse.class); + withSchema(GridCacheQueryRequest.class); + withSchema(GridCacheQueryResponse.class); withNoSchema(GridQueryCancelRequest.class); withNoSchema(GridQueryFailResponse.class); withNoSchema(GridQueryNextPageRequest.class); @@ -559,7 +559,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe withNoSchema(StatisticsRequest.class); withNoSchema(StatisticsResponse.class); withNoSchema(CacheContinuousQueryBatchAck.class); - withNoSchema(CacheContinuousQueryEntry.class); + withSchema(CacheContinuousQueryEntry.class); // [11200 - 11300]: Compute, distributed process messages. msgIdx = 11200; @@ -580,10 +580,10 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe withNoSchema(NodeIdMessage.class); withNoSchema(HandshakeMessage.class); withNoSchema(HandshakeWaitMessage.class); - withNoSchema(GridIoMessage.class); + withSchema(GridIoMessage.class); withNoSchema(IgniteIoTestMessage.class); - withNoSchema(GridIoUserMessage.class); - withNoSchema(GridIoSecurityAwareMessage.class); + withSchema(GridIoUserMessage.class); + withSchema(GridIoSecurityAwareMessage.class); withNoSchema(RecoveryLastReceivedMessage.class); withNoSchema(TcpInverseConnectionResponseMessage.class); withNoSchema(SessionChannelMessage.class); @@ -591,7 +591,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe // [11700 - 11800]: Datastreamer messages. msgIdx = 11700; withNoSchema(DataStreamerUpdatesHandlerResult.class); - withNoSchema(DataStreamerEntry.class); + withSchema(DataStreamerEntry.class); withNoSchema(DataStreamerRequest.class); withNoSchema(DataStreamerResponse.class); @@ -638,7 +638,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe withSchema(GridEventStorageMessage.class); withNoSchema(ChangeGlobalStateMessage.class); withNoSchema(GridChangeGlobalStateMessageResponse.class); - withNoSchema(IgniteDiagnosticRequest.class); + withSchema(IgniteDiagnosticRequest.class); withNoSchema(IgniteDiagnosticResponse.class); withNoSchema(WalStateAckMessage.class); From 67d5ed41c8a414894a9ac28c0d93cb2d4407ff57 Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 14 Apr 2026 18:45:01 +0300 Subject: [PATCH 2/2] minor --- .../java/org/apache/ignite/internal/CoreMessagesProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java index c078d7370757a..fd23a912eeb49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java @@ -317,7 +317,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe this.resolvedClsLdr = resolvedClsLdr; } - /** {@inheritDoc} */ + /** The order is important. If wish to remove a message, put 'msgIdx++' on its place. */ @Override public void registerAll(MessageFactory factory) { assert this.factory == null;