IGNITE-28520 Auto-generate prepareMarshalCacheObjects to replace hand-written CO traversal in GridCacheMessage subclasses

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageServiceImpl.java

@@ -39,6 +39,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageSerializer;
 
 /**
  *
@@ -184,8 +185,14 @@ public FailureProcessor failureProcessor() {
     /** */
     protected void prepareMarshal(Message msg) throws IgniteCheckedException {
         try {
-            if (msg instanceof CalciteContextMarshallableMessage)
+            if (msg instanceof CalciteContextMarshallableMessage) {
                 ((CalciteContextMarshallableMessage)msg).prepareMarshal(ctx);
+
+                MessageSerializer ser = ctx.gridIO().messageFactory().serializer(msg.directType());
+
+                if (ser != null)
+                    ser.prepareMarshal(msg, ctx, null);
+            }
         }
         catch (Exception e) {
             failureProcessor().process(new FailureContext(FailureType.CRITICAL_ERROR, e));

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java

@@ -29,6 +29,7 @@
 import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.processors.query.calcite.exec.ExecutionContext;
+import org.apache.ignite.plugin.extensions.communication.CacheIdAware;
 
 /**
  * Class to pass to remote nodes transaction changes.
@@ -38,7 +39,7 @@
  * @see ExecutionContext#transactionChanges(int, int[], Function, Comparator)
  * @see QueryStartRequest#queryTransactionEntries()
  */
-public class QueryTxEntry implements CalciteContextMarshallableMessage {
+public class QueryTxEntry implements CalciteContextMarshallableMessage, CacheIdAware {
     /** Cache id. */
     @Order(0)
     int cacheId;
@@ -75,8 +76,8 @@ public QueryTxEntry(int cacheId, KeyCacheObject key, CacheObject val, GridCacheV
         this.ver = ver;
     }
 
-    /** @return Cache id. */
-    public int cacheId() {
+    /** {@inheritDoc}  */
+    @Override public int cacheId() {
         return cacheId;
     }
 
@@ -97,12 +98,6 @@ public GridCacheVersion version() {
 
     /** {@inheritDoc} */
     @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
-        CacheObjectContext coctx = ctx.cacheContext(cacheId).cacheObjectContext();
-
-        key.prepareMarshal(coctx);
-
-        if (val != null)
-            val.prepareMarshal(coctx);
     }
 
     /** {@inheritDoc}  */