You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2026/05/07 07:55:53 UTC
(ignite) branch master updated: IGNITE-28644 Remove MarshallableMessage from SnapshotRestoreOperationResponse (#13104)
This is an automated email from the ASF dual-hosted git repository.
anton-vinogradov 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 d7555700bc5 IGNITE-28644 Remove MarshallableMessage from SnapshotRestoreOperationResponse (#13104)
d7555700bc5 is described below
commit d7555700bc5b7e185e0752abb6a8456cb62f52ef
Author: Vladimir Steshin <vl...@gmail.com>
AuthorDate: Thu May 7 10:55:44 2026 +0300
IGNITE-28644 Remove MarshallableMessage from SnapshotRestoreOperationResponse (#13104)
---
.../cache/persistence/snapshot/SnapshotMetadata.java | 9 +++++----
.../snapshot/SnapshotRestoreOperationResponse.java | 12 ++----------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadata.java
index b07650905b9..b09d0d798c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadata.java
@@ -125,18 +125,19 @@ public class SnapshotMetadata implements Message, Serializable {
@Nullable transient Set<Integer> comprGrpIds;
/** */
- private boolean hasComprGrps;
+ @Order(14)
+ boolean hasComprGrps;
/** If {@code true} snapshot only primary copies of partitions. */
- @Order(14)
+ @Order(15)
boolean onlyPrimary;
/** If {@code true} cache group dump stored. */
- @Order(15)
+ @Order(16)
boolean dump;
/** Encryption key. */
- @Order(16)
+ @Order(17)
@Nullable byte[] encKey;
/** Empty constructor for a {@link MessageFactory}. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java
index 223497a8303..e4948be69b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreOperationResponse.java
@@ -38,11 +38,8 @@ public class SnapshotRestoreOperationResponse implements MarshallableMessage {
byte[] ccfgsBytes;
/** Snapshot metadata files on local node. */
- private List<SnapshotMetadata> metas;
-
- /** */
@Order(1)
- byte[] metasBytes;
+ List<SnapshotMetadata> metas;
/** Default constructor for {@link MessageFactory}. */
public SnapshotRestoreOperationResponse() {
@@ -74,15 +71,10 @@ public class SnapshotRestoreOperationResponse implements MarshallableMessage {
/** {@inheritDoc} */
@Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
ccfgsBytes = U.marshal(marsh, ccfgs);
- metasBytes = U.marshal(marsh, metas);
}
/** {@inheritDoc} */
@Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
- if (ccfgsBytes != null)
- ccfgs = U.unmarshal(marsh, ccfgsBytes, clsLdr);
-
- if (metasBytes != null)
- metas = U.unmarshal(marsh, metasBytes, clsLdr);
+ ccfgs = U.unmarshal(marsh, ccfgsBytes, clsLdr);
}
}