Skip to content

Commit 8bbf413

Browse files
Vladsz83Vladsz83
authored
IGNITE-28540 : Cleanup schema-aware message serialization (#12996)
1 parent 6c46480 commit 8bbf413

1 file changed

Lines changed: 98 additions & 98 deletions

File tree

‎modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -437,97 +437,97 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
437437

438438
// [10000 - 10200]: Transaction and lock related messages. Most of the originally comes from Communication.
439439
msgIdx = 10000;
440-
withSchema(TxInfo.class);
441-
withSchema(TxEntriesInfo.class);
442-
withSchema(TxLock.class);
443-
withSchema(TxLocksRequest.class);
444-
withSchema(TxLocksResponse.class);
445-
withSchema(IgniteTxKey.class);
446-
withSchema(IgniteTxEntry.class);
447-
withSchema(TxEntryValueHolder.class);
448-
withSchema(GridCacheTxRecoveryRequest.class);
449-
withSchema(GridCacheTxRecoveryResponse.class);
450-
withSchema(GridDistributedTxFinishRequest.class);
451-
withSchema(GridDistributedTxFinishResponse.class);
452-
withSchema(GridDistributedTxPrepareRequest.class);
453-
withSchema(GridDistributedTxPrepareResponse.class);
454-
withSchema(GridDhtTxFinishRequest.class);
455-
withSchema(GridDhtTxFinishResponse.class);
456-
withSchema(GridDhtTxPrepareRequest.class);
457-
withSchema(GridDhtTxPrepareResponse.class);
458-
withSchema(GridNearTxFinishRequest.class);
459-
withSchema(GridNearTxFinishResponse.class);
460-
withSchema(GridNearTxPrepareRequest.class);
461-
withSchema(GridNearTxPrepareResponse.class);
462-
withSchema(GridDhtLockRequest.class);
463-
withSchema(GridDhtLockResponse.class);
464-
withSchema(GridDhtUnlockRequest.class);
465-
withSchema(GridNearLockRequest.class);
466-
withSchema(GridNearLockResponse.class);
467-
withSchema(GridNearUnlockRequest.class);
468-
withSchema(GridDistributedLockRequest.class);
469-
withSchema(GridDistributedLockResponse.class);
470-
withSchema(GridDhtTxOnePhaseCommitAckRequest.class);
471-
withSchema(TransactionAttributesAwareRequest.class);
440+
withNoSchema(TxInfo.class);
441+
withNoSchema(TxEntriesInfo.class);
442+
withNoSchema(TxLock.class);
443+
withNoSchema(TxLocksRequest.class);
444+
withNoSchema(TxLocksResponse.class);
445+
withNoSchema(IgniteTxKey.class);
446+
withNoSchema(IgniteTxEntry.class);
447+
withNoSchema(TxEntryValueHolder.class);
448+
withNoSchema(GridCacheTxRecoveryRequest.class);
449+
withNoSchema(GridCacheTxRecoveryResponse.class);
450+
withNoSchema(GridDistributedTxFinishRequest.class);
451+
withNoSchema(GridDistributedTxFinishResponse.class);
452+
withNoSchema(GridDistributedTxPrepareRequest.class);
453+
withNoSchema(GridDistributedTxPrepareResponse.class);
454+
withNoSchema(GridDhtTxFinishRequest.class);
455+
withNoSchema(GridDhtTxFinishResponse.class);
456+
withNoSchema(GridDhtTxPrepareRequest.class);
457+
withNoSchema(GridDhtTxPrepareResponse.class);
458+
withNoSchema(GridNearTxFinishRequest.class);
459+
withNoSchema(GridNearTxFinishResponse.class);
460+
withNoSchema(GridNearTxPrepareRequest.class);
461+
withNoSchema(GridNearTxPrepareResponse.class);
462+
withNoSchema(GridDhtLockRequest.class);
463+
withNoSchema(GridDhtLockResponse.class);
464+
withNoSchema(GridDhtUnlockRequest.class);
465+
withNoSchema(GridNearLockRequest.class);
466+
withNoSchema(GridNearLockResponse.class);
467+
withNoSchema(GridNearUnlockRequest.class);
468+
withNoSchema(GridDistributedLockRequest.class);
469+
withNoSchema(GridDistributedLockResponse.class);
470+
withNoSchema(GridDhtTxOnePhaseCommitAckRequest.class);
471+
withNoSchema(TransactionAttributesAwareRequest.class);
472472

473473
// [10300 - 10500]: Cache, DHT messages.
474474
msgIdx = 10300;
475-
withSchema(GridDhtForceKeysRequest.class);
476-
withSchema(GridDhtForceKeysResponse.class);
477-
withSchema(GridDhtAtomicDeferredUpdateResponse.class);
478-
withSchema(GridDhtAtomicUpdateRequest.class);
479-
withSchema(GridDhtAtomicUpdateResponse.class);
480-
withSchema(GridNearAtomicFullUpdateRequest.class);
481-
withSchema(GridDhtAtomicSingleUpdateRequest.class);
482-
withSchema(GridNearAtomicUpdateResponse.class);
483-
withSchema(GridNearAtomicSingleUpdateRequest.class);
484-
withSchema(GridNearAtomicSingleUpdateInvokeRequest.class);
485-
withSchema(GridNearAtomicSingleUpdateFilterRequest.class);
486-
withSchema(GridNearAtomicCheckUpdateRequest.class);
487-
withSchema(NearCacheUpdates.class);
488-
withSchema(GridNearGetRequest.class);
489-
withSchema(GridNearGetResponse.class);
490-
withSchema(GridNearSingleGetRequest.class);
491-
withSchema(GridNearSingleGetResponse.class);
492-
withSchema(GridDhtAtomicNearResponse.class);
493-
withSchema(GridCacheTtlUpdateRequest.class);
494-
withSchema(GridCacheReturn.class);
495-
withSchema(GridCacheEntryInfo.class);
496-
withSchema(CacheInvokeDirectResult.class);
497-
withSchema(GridCacheRawVersionedEntry.class);
498-
withSchema(CacheEvictionEntry.class);
499-
withSchema(CacheEntryPredicateAdapter.class);
500-
withSchema(GridContinuousMessage.class);
501-
withSchema(ContinuousRoutineStartResultMessage.class);
502-
withSchema(UpdateErrors.class);
503-
withSchema(LatchAckMessage.class);
504-
withSchema(AtomicApplicationAttributesAwareRequest.class);
475+
withNoSchema(GridDhtForceKeysRequest.class);
476+
withNoSchema(GridDhtForceKeysResponse.class);
477+
withNoSchema(GridDhtAtomicDeferredUpdateResponse.class);
478+
withNoSchema(GridDhtAtomicUpdateRequest.class);
479+
withNoSchema(GridDhtAtomicUpdateResponse.class);
480+
withNoSchema(GridNearAtomicFullUpdateRequest.class);
481+
withNoSchema(GridDhtAtomicSingleUpdateRequest.class);
482+
withNoSchema(GridNearAtomicUpdateResponse.class);
483+
withNoSchema(GridNearAtomicSingleUpdateRequest.class);
484+
withNoSchema(GridNearAtomicSingleUpdateInvokeRequest.class);
485+
withNoSchema(GridNearAtomicSingleUpdateFilterRequest.class);
486+
withNoSchema(GridNearAtomicCheckUpdateRequest.class);
487+
withNoSchema(NearCacheUpdates.class);
488+
withNoSchema(GridNearGetRequest.class);
489+
withNoSchema(GridNearGetResponse.class);
490+
withNoSchema(GridNearSingleGetRequest.class);
491+
withNoSchema(GridNearSingleGetResponse.class);
492+
withNoSchema(GridDhtAtomicNearResponse.class);
493+
withNoSchema(GridCacheTtlUpdateRequest.class);
494+
withNoSchema(GridCacheReturn.class);
495+
withNoSchema(GridCacheEntryInfo.class);
496+
withNoSchema(CacheInvokeDirectResult.class);
497+
withNoSchema(GridCacheRawVersionedEntry.class);
498+
withNoSchema(CacheEvictionEntry.class);
499+
withNoSchema(CacheEntryPredicateAdapter.class);
500+
withNoSchema(GridContinuousMessage.class);
501+
withNoSchema(ContinuousRoutineStartResultMessage.class);
502+
withNoSchema(UpdateErrors.class);
503+
withNoSchema(LatchAckMessage.class);
504+
withNoSchema(AtomicApplicationAttributesAwareRequest.class);
505505
withNoSchema(StartRequestData.class);
506506
withNoSchema(StartRoutineDiscoveryMessage.class);
507507
withNoSchema(StartRoutineAckDiscoveryMessage.class);
508508
withNoSchema(StartRoutineDiscoveryMessageV2.class);
509509

510510
// [10600-10800]: Affinity & partition maps.
511511
msgIdx = 10600;
512-
withSchema(GridDhtAffinityAssignmentRequest.class);
513-
withSchema(GridDhtAffinityAssignmentResponse.class);
514-
withSchema(CacheGroupAffinityMessage.class);
515-
withSchema(ExchangeInfo.class);
516-
withSchema(PartitionUpdateCountersMessage.class);
517-
withSchema(CachePartitionPartialCountersMap.class);
518-
withSchema(IgniteDhtDemandedPartitionsMap.class);
519-
withSchema(CachePartitionFullCountersMap.class);
520-
withSchema(GroupPartitionIdPair.class);
521-
withSchema(GridPartitionStateMap.class);
522-
withSchema(GridDhtPartitionMap.class);
523-
withSchema(GridDhtPartitionFullMap.class);
512+
withNoSchema(GridDhtAffinityAssignmentRequest.class);
513+
withNoSchema(GridDhtAffinityAssignmentResponse.class);
514+
withNoSchema(CacheGroupAffinityMessage.class);
515+
withNoSchema(ExchangeInfo.class);
516+
withNoSchema(PartitionUpdateCountersMessage.class);
517+
withNoSchema(CachePartitionPartialCountersMap.class);
518+
withNoSchema(IgniteDhtDemandedPartitionsMap.class);
519+
withNoSchema(CachePartitionFullCountersMap.class);
520+
withNoSchema(GroupPartitionIdPair.class);
521+
withNoSchema(GridPartitionStateMap.class);
522+
withNoSchema(GridDhtPartitionMap.class);
523+
withNoSchema(GridDhtPartitionFullMap.class);
524524
withNoSchema(GridDhtPartitionExchangeId.class);
525525
withNoSchema(GridCheckpointRequest.class);
526-
withSchema(GridDhtPartitionDemandMessage.class);
527-
withSchema(GridDhtPartitionSupplyMessage.class);
528-
withSchema(GridDhtPartitionsFullMessage.class);
529-
withSchema(GridDhtPartitionsSingleMessage.class);
530-
withSchema(GridDhtPartitionsSingleRequest.class);
526+
withNoSchema(GridDhtPartitionDemandMessage.class);
527+
withNoSchema(GridDhtPartitionSupplyMessage.class);
528+
withNoSchema(GridDhtPartitionsFullMessage.class);
529+
withNoSchema(GridDhtPartitionsSingleMessage.class);
530+
withNoSchema(GridDhtPartitionsSingleRequest.class);
531531

532532
// [10900-11100]: Query, schema and SQL related messages.
533533
msgIdx = 10900;
@@ -540,26 +540,26 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
540540
withNoSchema(SchemaProposeDiscoveryMessage.class);
541541
withNoSchema(SchemaFinishDiscoveryMessage.class);
542542
withNoSchema(QueryField.class);
543-
withSchema(GridCacheSqlQuery.class);
544-
withSchema(GridCacheQueryRequest.class);
545-
withSchema(GridCacheQueryResponse.class);
546-
withSchema(GridQueryCancelRequest.class);
547-
withSchema(GridQueryFailResponse.class);
548-
withSchema(GridQueryNextPageRequest.class);
549-
withSchema(GridQueryNextPageResponse.class);
550-
withSchema(GridQueryKillRequest.class);
551-
withSchema(GridQueryKillResponse.class);
552-
withSchema(IndexKeyDefinition.class);
553-
withSchema(IndexKeyTypeSettings.class);
554-
withSchema(IndexQueryResultMeta.class);
543+
withNoSchema(GridCacheSqlQuery.class);
544+
withNoSchema(GridCacheQueryRequest.class);
545+
withNoSchema(GridCacheQueryResponse.class);
546+
withNoSchema(GridQueryCancelRequest.class);
547+
withNoSchema(GridQueryFailResponse.class);
548+
withNoSchema(GridQueryNextPageRequest.class);
549+
withNoSchema(GridQueryNextPageResponse.class);
550+
withNoSchema(GridQueryKillRequest.class);
551+
withNoSchema(GridQueryKillResponse.class);
552+
withNoSchema(IndexKeyDefinition.class);
553+
withNoSchema(IndexKeyTypeSettings.class);
554+
withNoSchema(IndexQueryResultMeta.class);
555555
withNoSchema(StatisticsKeyMessage.class);
556556
withNoSchema(StatisticsDecimalMessage.class);
557557
withNoSchema(StatisticsObjectData.class);
558558
withNoSchema(StatisticsColumnData.class);
559559
withNoSchema(StatisticsRequest.class);
560560
withNoSchema(StatisticsResponse.class);
561561
withNoSchema(CacheContinuousQueryBatchAck.class);
562-
withSchema(CacheContinuousQueryEntry.class);
562+
withNoSchema(CacheContinuousQueryEntry.class);
563563

564564
// [11200 - 11300]: Compute, distributed process messages.
565565
msgIdx = 11200;
@@ -580,18 +580,18 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
580580
withNoSchema(NodeIdMessage.class);
581581
withNoSchema(HandshakeMessage.class);
582582
withNoSchema(HandshakeWaitMessage.class);
583-
withSchema(GridIoMessage.class);
583+
withNoSchema(GridIoMessage.class);
584584
withNoSchema(IgniteIoTestMessage.class);
585-
withSchema(GridIoUserMessage.class);
586-
withSchema(GridIoSecurityAwareMessage.class);
585+
withNoSchema(GridIoUserMessage.class);
586+
withNoSchema(GridIoSecurityAwareMessage.class);
587587
withNoSchema(RecoveryLastReceivedMessage.class);
588588
withNoSchema(TcpInverseConnectionResponseMessage.class);
589589
withNoSchema(SessionChannelMessage.class);
590590

591591
// [11700 - 11800]: Datastreamer messages.
592592
msgIdx = 11700;
593593
withNoSchema(DataStreamerUpdatesHandlerResult.class);
594-
withSchema(DataStreamerEntry.class);
594+
withNoSchema(DataStreamerEntry.class);
595595
withNoSchema(DataStreamerRequest.class);
596596
withNoSchema(DataStreamerResponse.class);
597597

@@ -638,8 +638,8 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
638638
withSchema(GridEventStorageMessage.class);
639639
withNoSchema(ChangeGlobalStateMessage.class);
640640
withNoSchema(GridChangeGlobalStateMessageResponse.class);
641-
withSchema(IgniteDiagnosticRequest.class);
642-
withSchema(IgniteDiagnosticResponse.class);
641+
withNoSchema(IgniteDiagnosticRequest.class);
642+
withNoSchema(IgniteDiagnosticResponse.class);
643643
withNoSchema(WalStateAckMessage.class);
644644

645645
assert msgIdx <= MAX_MESSAGE_ID;

0 commit comments

Comments
 (0)