Skip to content

Commit ef86ca4

Browse files
Vladsz83Vladsz83
committed
+ master, checkstyle, cleanup
1 parent b3ab436 commit ef86ca4

88 files changed

Lines changed: 183 additions & 205 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/core/src/main/java/org/apache/ignite/internal/managers/CoreMessagesProvider.java renamed to modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java

Lines changed: 48 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,10 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.ignite.internal.managers;
18+
package org.apache.ignite.internal;
1919

2020
import java.lang.reflect.Constructor;
2121
import org.apache.ignite.IgniteException;
22-
import org.apache.ignite.internal.ExchangeInfo;
23-
import org.apache.ignite.internal.GridJobCancelRequest;
24-
import org.apache.ignite.internal.GridJobExecuteRequest;
25-
import org.apache.ignite.internal.GridJobExecuteResponse;
26-
import org.apache.ignite.internal.GridJobSiblingsRequest;
27-
import org.apache.ignite.internal.GridJobSiblingsResponse;
28-
import org.apache.ignite.internal.GridTaskCancelRequest;
29-
import org.apache.ignite.internal.GridTaskSessionRequest;
30-
import org.apache.ignite.internal.IgniteDiagnosticRequest;
31-
import org.apache.ignite.internal.IgniteDiagnosticResponse;
32-
import org.apache.ignite.internal.TxEntriesInfo;
33-
import org.apache.ignite.internal.TxInfo;
3422
import org.apache.ignite.internal.cache.query.index.IndexQueryResultMeta;
3523
import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
3624
import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettings;
@@ -185,6 +173,10 @@
185173
import org.apache.ignite.internal.processors.cluster.NodeMetricsMessage;
186174
import org.apache.ignite.internal.processors.continuous.ContinuousRoutineStartResultMessage;
187175
import org.apache.ignite.internal.processors.continuous.GridContinuousMessage;
176+
import org.apache.ignite.internal.processors.continuous.StartRequestData;
177+
import org.apache.ignite.internal.processors.continuous.StartRoutineAckDiscoveryMessage;
178+
import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessage;
179+
import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessageV2;
188180
import org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessage;
189181
import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage;
190182
import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
@@ -323,12 +315,10 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
323315
// [-44, 0..2, 42, 200..204, 210, 302] - Use in tests.
324316
// [300..307, 350..352] - CalciteMessageFactory.
325317
// [-4..-22, -30..-35, -54..-57] - SQL
326-
// [-42..-37] - former hadoop.
327-
// [64..71] - former IGFS.
328318

329319
// [5000 - 5500]: Utility messages. Most of them originally come from Discovery.
330-
// We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
331320
msgIdx = 5000;
321+
// We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
332322
factory.register(msgIdx++, CompressedMessage::new);
333323
register(factory, ErrorMessage.class);
334324
register(factory, InetSocketAddressMessage.class);
@@ -344,48 +334,35 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
344334
msgIdx = 5500;
345335
register(factory, TcpDiscoveryCollectionMessage.class);
346336

347-
// [5700 - 5800]: Schema operation messages. Most of them originally come from Discovery.
337+
// [5700 - 5900]: Discovery originated messages.
348338
msgIdx = 5700;
349-
register(factory, SchemaAlterTableAddColumnOperation.class);
350-
register(factory, SchemaIndexCreateOperation.class);
351-
register(factory, SchemaIndexDropOperation.class);
352-
register(factory, SchemaAlterTableDropColumnOperation.class);
353-
register(factory, SchemaAddQueryEntityOperation.class);
354-
register(factory, QueryField.class);
355-
register(factory, SchemaOperationStatusMessage.class);
356-
register(factory, SchemaProposeDiscoveryMessage.class);
357-
register(factory, SchemaFinishDiscoveryMessage.class);
358-
359-
// [5900 - 6100]: TcpDiscoveryAbstractMessage.
360-
msgIdx = 5900;
361-
register(factory, TcpDiscoveryCheckFailedMessage.class);
339+
register(factory, TcpDiscoveryHandshakeRequest.class);
340+
register(factory, TcpDiscoveryHandshakeResponse.class);
341+
register(factory, TcpDiscoveryJoinRequestMessage.class);
342+
register(factory, TcpDiscoveryNodeAddedMessage.class);
343+
register(factory, TcpDiscoveryNodeAddFinishedMessage.class);
344+
register(factory, TcpDiscoveryNodeLeftMessage.class);
345+
register(factory, TcpDiscoveryNodeFailedMessage.class);
346+
register(factory, TcpDiscoveryConnectionCheckMessage.class);
362347
register(factory, TcpDiscoveryPingRequest.class);
363348
register(factory, TcpDiscoveryPingResponse.class);
364349
register(factory, TcpDiscoveryClientPingRequest.class);
365350
register(factory, TcpDiscoveryClientPingResponse.class);
351+
register(factory, TcpDiscoveryClientAckResponse.class);
352+
register(factory, TcpDiscoveryClientReconnectMessage.class);
353+
register(factory, TcpDiscoveryDiscardMessage.class);
354+
register(factory, TcpDiscoveryCheckFailedMessage.class);
366355
register(factory, TcpDiscoveryLoopbackProblemMessage.class);
367-
register(factory, TcpDiscoveryConnectionCheckMessage.class);
368356
register(factory, TcpDiscoveryRingLatencyCheckMessage.class);
369-
register(factory, TcpDiscoveryHandshakeRequest.class);
370-
register(factory, TcpDiscoveryDiscardMessage.class);
371-
register(factory, TcpDiscoveryHandshakeResponse.class);
372-
register(factory, TcpDiscoveryAuthFailedMessage.class);
373357
register(factory, TcpDiscoveryDuplicateIdMessage.class);
374-
register(factory, TcpDiscoveryClientMetricsUpdateMessage.class);
375-
register(factory, TcpDiscoveryMetricsUpdateMessage.class);
376-
register(factory, TcpDiscoveryClientAckResponse.class);
377-
register(factory, TcpDiscoveryNodeLeftMessage.class);
378-
register(factory, TcpDiscoveryNodeFailedMessage.class);
379-
register(factory, TcpDiscoveryStatusCheckMessage.class);
380-
register(factory, TcpDiscoveryNodeAddFinishedMessage.class);
381-
register(factory, TcpDiscoveryJoinRequestMessage.class);
382358
register(factory, TcpDiscoveryCustomEventMessage.class);
383359
register(factory, TcpDiscoveryServerOnlyCustomEventMessage.class);
384-
register(factory, TcpDiscoveryNodeAddedMessage.class);
385-
register(factory, TcpDiscoveryClientReconnectMessage.class);
386360

387-
// [6200 - 6300]: Snapshot operation messages. Most of them originally come from Discovery.
388-
msgIdx = 6200;
361+
msgIdx = 5900;
362+
register(factory, TcpDiscoveryStatusCheckMessage.class);
363+
364+
// [6000 - 6200]: Snapshot operation messages. Most of them originally come from Discovery.
365+
msgIdx = 6000;
389366
register(factory, SnapshotStartDiscoveryMessage.class);
390367
register(factory, SnapshotCheckProcessRequest.class);
391368
register(factory, SnapshotOperationRequest.class);
@@ -404,8 +381,8 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
404381
register(factory, IncrementalSnapshotVerifyResult.class);
405382
register(factory, IncrementalSnapshotAwareMessage.class);
406383

407-
// [6400 - 6500]: Services messages. Most of them originally come from Discovery.
408-
msgIdx = 6400;
384+
// [6300 - 6400]: Services messages. Most of them originally come from Discovery.
385+
msgIdx = 6300;
409386
register(factory, ServiceDeploymentProcessId.class);
410387
register(factory, ServiceSingleNodeDeploymentResult.class);
411388
register(factory, ServiceClusterDeploymentResult.class);
@@ -415,12 +392,8 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
415392
register(factory, ServiceChangeBatchRequest.class);
416393
register(factory, ServiceSingleNodeDeploymentResultBatch.class);
417394

418-
// [6600 - 6700]: Originally Discovery's messages.
419-
msgIdx = 6600;
420-
421-
422-
// [6800 - 7000]: DiscoveryCustomMessage
423-
msgIdx = 6800;
395+
// [6500 - 6700]: DiscoveryCustomMessage
396+
msgIdx = 6500;
424397
register(factory, TcpConnectionRequestDiscoveryMessage.class);
425398
register(factory, DistributedMetaStorageUpdateMessage.class);
426399
register(factory, DistributedMetaStorageUpdateAckMessage.class);
@@ -447,7 +420,6 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
447420
register(factory, MappingProposedMessage.class);
448421
register(factory, ExchangeFailureMessage.class);
449422
register(factory, CacheStatisticsClearMessage.class);
450-
register(factory, ChangeGlobalStateMessage.class);
451423
register(factory, ClientCacheChangeDummyDiscoveryMessage.class);
452424
register(factory, DynamicCacheChangeBatch.class);
453425

@@ -518,6 +490,10 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
518490
register(factory, UpdateErrors.class);
519491
register(factory, LatchAckMessage.class);
520492
register(factory, AtomicApplicationAttributesAwareRequest.class);
493+
register(factory, StartRequestData.class);
494+
register(factory, StartRoutineDiscoveryMessage.class);
495+
register(factory, StartRoutineAckDiscoveryMessage.class);
496+
register(factory, StartRoutineDiscoveryMessageV2.class);
521497

522498
// [10600-10800]: Affinity & partition maps.
523499
msgIdx = 10600;
@@ -542,8 +518,17 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
542518
register(factory, GridDhtPartitionsSingleMessage.class);
543519
register(factory, GridDhtPartitionsSingleRequest.class);
544520

545-
// [10900-11100]: Query and SQL related messages.
521+
// [10900-11100]: Query, schema and SQL related messages.
546522
msgIdx = 10900;
523+
register(factory, SchemaAlterTableAddColumnOperation.class);
524+
register(factory, SchemaIndexCreateOperation.class);
525+
register(factory, SchemaIndexDropOperation.class);
526+
register(factory, SchemaAlterTableDropColumnOperation.class);
527+
register(factory, SchemaAddQueryEntityOperation.class);
528+
register(factory, SchemaOperationStatusMessage.class);
529+
register(factory, SchemaProposeDiscoveryMessage.class);
530+
register(factory, SchemaFinishDiscoveryMessage.class);
531+
register(factory, QueryField.class);
547532
register(factory, GridCacheSqlQuery.class);
548533
register(factory, GridCacheQueryRequest.class);
549534
register(factory, GridCacheQueryResponse.class);
@@ -565,7 +550,7 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
565550
register(factory, CacheContinuousQueryBatchAck.class);
566551
register(factory, CacheContinuousQueryEntry.class);
567552

568-
// [11200 - 11300]: Compute and distributed process messages.
553+
// [11200 - 11300]: Compute, distributed process messages.
569554
msgIdx = 11200;
570555
register(factory, GridJobCancelRequest.class);
571556
register(factory, GridJobExecuteRequest.class);
@@ -585,12 +570,12 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
585570
register(factory, HandshakeMessage.class);
586571
register(factory, HandshakeWaitMessage.class);
587572
register(factory, GridIoMessage.class);
573+
factory.register(msgIdx++, IgniteIoTestMessage::new);
588574
register(factory, GridIoUserMessage.class);
589575
register(factory, GridIoSecurityAwareMessage.class);
590576
register(factory, RecoveryLastReceivedMessage.class);
591577
register(factory, TcpInverseConnectionResponseMessage.class);
592578
register(factory, SessionChannelMessage.class);
593-
factory.register(msgIdx++, IgniteIoTestMessage::new);
594579

595580
// [11700 - 11800]: Datastreamer messages.
596581
msgIdx = 11700;
@@ -606,6 +591,8 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
606591
register(factory, NodeFullMetricsMessage.class);
607592
register(factory, ClusterMetricsUpdateMessage.class);
608593
register(factory, TcpDiscoveryClientNodesMetricsMessage.class);
594+
register(factory, TcpDiscoveryMetricsUpdateMessage.class);
595+
register(factory, TcpDiscoveryClientMetricsUpdateMessage.class);
609596

610597
// [12000 - 12100]: Authentication, security messages.
611598
msgIdx = 12000;
@@ -614,6 +601,7 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
614601
register(factory, UserManagementOperationFinishedMessage.class);
615602
register(factory, UserAuthenticateRequestMessage.class);
616603
register(factory, UserAuthenticateResponseMessage.class);
604+
register(factory, TcpDiscoveryAuthFailedMessage.class);
617605

618606
// [12200 - 12300]: Binary, classloading and marshalling messages.
619607
msgIdx = 12200;
@@ -637,6 +625,7 @@ public CoreMessagesProvider(Marshaller marsh, ClassLoader clsLdr) {
637625
// [13000 - 13300]: Control, diagnostincs and other messages.
638626
msgIdx = 13000;
639627
register(factory, GridEventStorageMessage.class);
628+
register(factory, ChangeGlobalStateMessage.class);
640629
register(factory, GridChangeGlobalStateMessageResponse.class);
641630
register(factory, IgniteDiagnosticRequest.class);
642631
register(factory, IgniteDiagnosticResponse.class);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.util.List;
2121
import java.util.Objects;
22-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2322
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
2423
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
2524
import org.apache.ignite.internal.util.typedef.internal.U;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Map;
2525
import java.util.Set;
2626
import java.util.UUID;
27-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2827
import org.apache.ignite.internal.util.typedef.internal.S;
2928
import org.apache.ignite.plugin.extensions.communication.Message;
3029
import org.jetbrains.annotations.Nullable;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.ignite.internal;
1919

20-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2120
import org.apache.ignite.internal.util.typedef.internal.S;
2221
import org.apache.ignite.plugin.extensions.communication.Message;
2322
import org.jetbrains.annotations.Nullable;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
import org.apache.ignite.internal.cluster.IgniteClusterEx;
9595
import org.apache.ignite.internal.maintenance.MaintenanceProcessor;
9696
import org.apache.ignite.internal.management.IgniteCommandRegistry;
97-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
9897
import org.apache.ignite.internal.managers.GridManager;
9998
import org.apache.ignite.internal.managers.IgniteMBeansManager;
10099
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.HashSet;
2222
import java.util.Objects;
2323
import org.apache.ignite.IgniteCheckedException;
24-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2524
import org.apache.ignite.internal.processors.cache.GridCacheContext;
2625
import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
2726
import org.apache.ignite.internal.processors.cache.KeyCacheObject;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.ignite.internal;
1919

2020
import java.util.Objects;
21-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2221
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
2322
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
2423
import org.apache.ignite.internal.util.typedef.internal.U;

‎modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import java.util.UUID;
2121
import org.apache.ignite.IgniteCheckedException;
2222
import org.apache.ignite.internal.Order;
23-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2423
import org.apache.ignite.internal.util.typedef.internal.U;
2524
import org.apache.ignite.marshaller.Marshaller;
2625
import org.apache.ignite.plugin.extensions.communication.MarshallableMessage;
2726
import org.apache.ignite.plugin.extensions.communication.Message;
27+
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
2828
import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
2929
import org.jetbrains.annotations.Nullable;
3030

@@ -50,7 +50,7 @@ public class SecurityAwareCustomMessageWrapper implements DiscoverySpiCustomMess
5050
@Order(2)
5151
byte[] msgBytes;
5252

53-
/** Default constructor for {@link CoreMessagesProvider}. */
53+
/** Default constructor for {@link MessageFactory}. */
5454
public SecurityAwareCustomMessageWrapper() {
5555
// No-op.
5656
}

‎modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/ChangeCacheEncryptionRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import java.util.Objects;
2121
import java.util.UUID;
2222
import org.apache.ignite.internal.Order;
23-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2423
import org.apache.ignite.plugin.extensions.communication.Message;
24+
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
2525

2626
/**
2727
* Change cache group encryption key request.
@@ -48,7 +48,7 @@ public class ChangeCacheEncryptionRequest implements Message {
4848
@Order(4)
4949
byte[] masterKeyDigest;
5050

51-
/** Default constructor for {@link CoreMessagesProvider}. */
51+
/** Default constructor for {@link MessageFactory}. */
5252
public ChangeCacheEncryptionRequest() {
5353
// No-op.
5454
}

‎modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/MasterKeyChangeRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.Objects;
2222
import java.util.UUID;
2323
import org.apache.ignite.internal.Order;
24-
import org.apache.ignite.internal.managers.CoreMessagesProvider;
2524
import org.apache.ignite.internal.util.typedef.internal.S;
2625
import org.apache.ignite.plugin.extensions.communication.Message;
26+
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
2727

2828
/** Master key change request. */
2929
public class MasterKeyChangeRequest implements Message {
@@ -39,7 +39,7 @@ public class MasterKeyChangeRequest implements Message {
3939
@Order(2)
4040
byte[] digest;
4141

42-
/** Default constructor for {@link CoreMessagesProvider}. */
42+
/** Default constructor for {@link MessageFactory}. */
4343
public MasterKeyChangeRequest() {
4444
// No-op.
4545
}

0 commit comments

Comments
 (0)