You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by na...@apache.org on 2026/03/26 08:52:14 UTC
(ignite) branch master updated: IGNITE-28350 Removed unnecessary SnapshotCheckHandlersNodeResponse (#12935)
This is an automated email from the ASF dual-hosted git repository.
namelchev 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 b8e3d65a3ab IGNITE-28350 Removed unnecessary SnapshotCheckHandlersNodeResponse (#12935)
b8e3d65a3ab is described below
commit b8e3d65a3ab1df86a364fa312bd647930c768499
Author: Nikita Amelchev <ns...@gmail.com>
AuthorDate: Thu Mar 26 11:52:07 2026 +0300
IGNITE-28350 Removed unnecessary SnapshotCheckHandlersNodeResponse (#12935)
---
.../communication/GridIoMessageFactory.java | 3 --
.../discovery/DiscoveryMessageFactory.java | 3 --
.../SnapshotCheckHandlersNodeResponse.java | 50 ----------------------
.../snapshot/SnapshotCheckHandlersResponse.java | 7 ++-
4 files changed, 3 insertions(+), 60 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 236763e0949..6cdabdd6b1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -229,8 +229,6 @@ import org.apache.ignite.internal.processors.cache.persistence.snapshot.Incremen
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotAwareMessageSerializer;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerifyResult;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerifyResultMarshallableSerializer;
-import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersNodeResponse;
-import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersNodeResponseSerializer;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersResponse;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersResponseSerializer;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckPartitionHashesResponse;
@@ -588,7 +586,6 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
factory.register((short)527, SnapshotCheckPartitionHashesResponse::new,
new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
factory.register((short)528, SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
- factory.register((short)529, SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
factory.register((short)530, SnapshotPartitionsVerifyHandlerResponse::new,
new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
index fe0a323461a..36c4ae6357f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
@@ -59,8 +59,6 @@ import org.apache.ignite.internal.processors.cache.persistence.snapshot.DataStre
import org.apache.ignite.internal.processors.cache.persistence.snapshot.DataStreamerUpdatesHandlerResultSerializer;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerifyResult;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerifyResultMarshallableSerializer;
-import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersNodeResponse;
-import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersNodeResponseSerializer;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersResponse;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckHandlersResponseSerializer;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotCheckPartitionHashesResponse;
@@ -335,7 +333,6 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
factory.register((short)527, SnapshotCheckPartitionHashesResponse::new,
new SnapshotCheckPartitionHashesResponseMarshallableSerializer(marsh, clsLdr));
factory.register((short)528, SnapshotCheckHandlersResponse::new, new SnapshotCheckHandlersResponseSerializer());
- factory.register((short)529, SnapshotCheckHandlersNodeResponse::new, new SnapshotCheckHandlersNodeResponseSerializer());
factory.register((short)530, SnapshotPartitionsVerifyHandlerResponse::new,
new SnapshotPartitionsVerifyHandlerResponseMarshallableSerializer(marsh, clsLdr));
factory.register((short)531, CacheStatisticsClearMessage::new, new CacheStatisticsClearMessageSerializer());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java
deleted file mode 100644
index eb9e2a585f3..00000000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersNodeResponse.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.persistence.snapshot;
-
-import java.util.Map;
-import org.apache.ignite.internal.Order;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageFactory;
-
-/** */
-public class SnapshotCheckHandlersNodeResponse implements Message {
- /** Check result per handler name. */
- @Order(0)
- Map<String, SnapshotHandlerResult<Message>> hndRes;
-
- /** Default constructor for {@link MessageFactory}. */
- public SnapshotCheckHandlersNodeResponse() {
- // No-op.
- }
-
- /** */
- public SnapshotCheckHandlersNodeResponse(Map<String, SnapshotHandlerResult<Message>> hndRes) {
- this.hndRes = hndRes;
- }
-
- /** */
- public Map<String, SnapshotHandlerResult<Message>> handlerResults() {
- return hndRes;
- }
-
- /** {@inheritDoc} */
- @Override public short directType() {
- return 529;
- }
-}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java
index e35436c5b22..3dcd4268f73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckHandlersResponse.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.persistence.snapshot;
import java.util.Map;
import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
@@ -27,7 +26,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageFactory;
public class SnapshotCheckHandlersResponse implements Message {
/** Per metas result: snapshot part's consistent id -> check result per handler name. */
@Order(0)
- Map<String, SnapshotCheckHandlersNodeResponse> perMetaResults;
+ Map<String, Map<String, SnapshotHandlerResult<Message>>> perMetaResults;
/** Default constructor for {@link MessageFactory}. */
public SnapshotCheckHandlersResponse() {
@@ -36,12 +35,12 @@ public class SnapshotCheckHandlersResponse implements Message {
/** */
public SnapshotCheckHandlersResponse(Map<String, Map<String, SnapshotHandlerResult<Message>>> res) {
- perMetaResults = F.viewReadOnly(res, SnapshotCheckHandlersNodeResponse::new);
+ perMetaResults = res;
}
/** */
public Map<String, Map<String, SnapshotHandlerResult<Message>>> handlerResults() {
- return F.viewReadOnly(perMetaResults, SnapshotCheckHandlersNodeResponse::handlerResults);
+ return perMetaResults;
}
/** {@inheritDoc} */