(ignite) branch master updated: IGNITE-28680 Remove MarshallableMessage implementation from FragmentDescription (#13135)

[shishkovilja]

This is an automated email from the ASF dual-hosted git repository.

shishkovilja 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 83c9a0fce4b IGNITE-28680 Remove MarshallableMessage implementation 
from FragmentDescription (#13135)
83c9a0fce4b is described below

commit 83c9a0fce4b64ee7c44aaddff44d9d1c074c5384
Author: Vladimir Steshin <vlads...@gmail.com>
AuthorDate: Wed May 20 15:50:11 2026 +0300

    IGNITE-28680 Remove MarshallableMessage implementation from 
FragmentDescription (#13135)
---
 .../calcite/metadata/FragmentDescription.java      | 28 +++++++---------------
 .../query/calcite/prepare/ExecutionPlan.java       |  3 ++-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
index 7560be273c1..4cbb2f34faa 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
@@ -20,13 +20,12 @@ package 
org.apache.ignite.internal.processors.query.calcite.metadata;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.MarshallableMessage;
 import org.apache.ignite.internal.Order;
-import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.jetbrains.annotations.Nullable;
 
 /** */
-public class FragmentDescription implements MarshallableMessage {
+public class FragmentDescription implements Message {
     /** */
     @Order(0)
     long fragmentId;
@@ -41,7 +40,7 @@ public class FragmentDescription implements 
MarshallableMessage {
 
     /** */
     @Order(3)
-    ColocationGroup target;
+    @Nullable ColocationGroup target;
 
     /** */
     public FragmentDescription() {
@@ -49,12 +48,14 @@ public class FragmentDescription implements 
MarshallableMessage {
     }
 
     /** */
-    public FragmentDescription(long fragmentId, FragmentMapping mapping, 
ColocationGroup target,
+    public FragmentDescription(long fragmentId, FragmentMapping mapping, 
@Nullable ColocationGroup target,
         Map<Long, List<UUID>> remoteSources) {
         this.fragmentId = fragmentId;
         this.mapping = mapping;
-        this.target = target;
         this.remoteSources = remoteSources;
+
+        if (target != null)
+            this.target = target.explicitMapping();
     }
 
     /** */
@@ -73,7 +74,7 @@ public class FragmentDescription implements 
MarshallableMessage {
     }
 
     /** */
-    public ColocationGroup target() {
+    public @Nullable ColocationGroup target() {
         return target;
     }
 
@@ -96,15 +97,4 @@ public class FragmentDescription implements 
MarshallableMessage {
     public void mapping(FragmentMapping mapping) {
         this.mapping = mapping;
     }
-
-    /** */
-    @Override public void prepareMarshal(Marshaller marsh) throws 
IgniteCheckedException {
-        if (target != null)
-            target = target.explicitMapping();
-    }
-
-    /** */
-    @Override public void finishUnmarshal(Marshaller marsh, ClassLoader 
clsLdr) throws IgniteCheckedException {
-        // No-op.
-    }
 }
diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
index 8a7058d7b09..8338e731e69 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
@@ -30,6 +30,7 @@ import 
org.apache.ignite.internal.processors.query.calcite.rel.IgniteReceiver;
 import org.apache.ignite.internal.processors.query.calcite.rel.IgniteSender;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 /**
  *
@@ -72,7 +73,7 @@ public class ExecutionPlan {
     }
 
     /** */
-    public ColocationGroup target(Fragment fragment) {
+    public @Nullable ColocationGroup target(Fragment fragment) {
         if (fragment.rootFragment())
             return null;