IGNITE-28356 Use @Order for GridDhtLockRequest#owned, TxLocksRequest#txKeys, GridNearGetRequest#keyMap

modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java

@@ -193,6 +193,9 @@ public BinaryObjectImpl(BinaryContext ctx, byte[] arr, int start) {
 
     /** {@inheritDoc} */
     @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException {
+        if (valBytes == null)            
+            valBytes = valueBytesFromArray(ctx);
+
         return valBytes;
     }
 

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

@@ -220,11 +220,6 @@ public long timeout() {
             params = U.unmarshal(ctx, paramsBytes, ldr);
 
         fragmentDesc.prepareUnmarshal(ctx);
-
-        if (qryTxEntries != null) {
-            for (QueryTxEntry e : qryTxEntries)
-                e.prepareUnmarshal(ctx, ldr);
-        }
     }
 
     /** {@inheritDoc} */

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

@@ -20,12 +20,10 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.function.Function;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.configuration.TransactionConfiguration;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.processors.cache.CacheObject;
-import org.apache.ignite.internal.processors.cache.CacheObjectContext;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
 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;
@@ -38,21 +36,17 @@
  * @see ExecutionContext#transactionChanges(int, int[], Function, Comparator)
  * @see QueryStartRequest#queryTransactionEntries()
  */
-public class QueryTxEntry implements CalciteMessage {
-    /** Cache id. */
-    @Order(0)
-    int cacheId;
-
+public class QueryTxEntry extends GridCacheIdMessage implements CalciteMessage {
     /** Entry key. */
-    @Order(1)
+    @Order(0)
     KeyCacheObject key;
 
     /** Entry value. */
-    @Order(2)
+    @Order(1)
     CacheObject val;
 
     /** Entry version. */
-    @Order(3)
+    @Order(2)
     GridCacheVersion ver;
 
     /**
@@ -75,11 +69,6 @@ public QueryTxEntry(int cacheId, KeyCacheObject key, CacheObject val, GridCacheV
         this.ver = ver;
     }
 
-    /** @return Cache id. */
-    public int cacheId() {
-        return cacheId;
-    }
-
     /** @return Entry key. */
     public KeyCacheObject key() {
         return key;
@@ -95,24 +84,9 @@ public GridCacheVersion version() {
         return ver;
     }
 
-    /** */
-    public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
-        CacheObjectContext coctx = ctx.cacheContext(cacheId).cacheObjectContext();
-
-        key.prepareMarshal(coctx);
-
-        if (val != null)
-            val.prepareMarshal(coctx);
-    }
-
-    /** */
-    public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader ldr) throws IgniteCheckedException {
-        CacheObjectContext coctx = ctx.cacheContext(cacheId).cacheObjectContext();
-
-        key.finishUnmarshal(coctx, ldr);
-
-        if (val != null)
-            val.finishUnmarshal(coctx, ldr);
+    /** {@inheritDoc} */
+    @Override public boolean addDeploymentInfo() {
+        return false;
     }
 
     /** {@inheritDoc} */

modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java

@@ -417,7 +417,8 @@ private void returnFalseIfWriteFailed(VariableElement field) throws Exception {
                 return;
             }
 
-            returnFalseIfWriteFailed(write, field, "writer.writeObjectArray", getExpr, messageCollectionItemTypes(field, type));
+            returnFalseIfWriteFailed(
+                write, field, "writer.writeObjectArray", getExpr, messageCollectionItemTypes(field, type), "msg");
 
             return;
         }
@@ -443,6 +444,7 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) {
 
                 args.add(getExpr);
                 args.add(messageCollectionItemTypes(field, type));
+                args.add("msg");
 
                 if (compress)
                     args.add("true"); // the value of the compress argument in the MessageWriter#writeMap method
@@ -451,10 +453,10 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) {
             }
 
             else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.KeyCacheObject")))
-                returnFalseIfWriteFailed(write, field, "writer.writeKeyCacheObject", getExpr);
+                returnFalseIfWriteFailed(write, field, "writer.writeKeyCacheObject", getExpr, "msg");
 
             else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.CacheObject")))
-                returnFalseIfWriteFailed(write, field, "writer.writeCacheObject", getExpr);
+                returnFalseIfWriteFailed(write, field, "writer.writeCacheObject", getExpr, "msg");
 
             else if (assignableFrom(type, type("org.apache.ignite.internal.util.GridLongList")))
                 returnFalseIfWriteFailed(write, field, "writer.writeGridLongList", getExpr);
@@ -470,7 +472,8 @@ else if (assignableFrom(type, type(MESSAGE_INTERFACE))) {
             }
 
             else if (assignableFrom(erasedType(type), type(Collection.class.getName())))
-                returnFalseIfWriteFailed(write, field, "writer.writeCollection", getExpr, messageCollectionItemTypes(field, type));
+                returnFalseIfWriteFailed(
+                    write, field, "writer.writeCollection", getExpr, messageCollectionItemTypes(field, type), "msg");
 
             else if (enumType(env, type)) {
                 Element element = env.getTypeUtils().asElement(type);
@@ -625,15 +628,15 @@ private void returnFalseIfReadFailed(VariableElement field) throws Exception {
             }
 
             if (componentType.getKind() == TypeKind.ARRAY) {
-                returnFalseIfReadFailed(field, "reader.readObjectArray", messageCollectionItemTypes(field, type));
+                returnFalseIfReadFailed(field, "reader.readObjectArray", messageCollectionItemTypes(field, type), "msg");
 
                 return;
             }
 
             if (componentType.getKind() == TypeKind.DECLARED) {
                 Element componentElement = ((DeclaredType)componentType).asElement();
 
-                returnFalseIfReadFailed(field, "reader.readObjectArray", messageCollectionItemTypes(field, type));
+                returnFalseIfReadFailed(field, "reader.readObjectArray", messageCollectionItemTypes(field, type), "msg");
 
                 if (!"java.lang".equals(env.getElementUtils().getPackageOf(componentElement).getQualifiedName().toString())) {
                     String importCls = ((QualifiedNameable)componentElement).getQualifiedName().toString();
@@ -669,6 +672,7 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) {
                 List<String> args = new ArrayList<>();
 
                 args.add(messageCollectionItemTypes(field, type));
+                args.add("msg");
 
                 if (compress)
                     args.add("true"); // the value of the compress argument in the MessageReader#readMap method
@@ -677,10 +681,10 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) {
             }
 
             else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.KeyCacheObject")))
-                returnFalseIfReadFailed(field, "reader.readKeyCacheObject");
+                returnFalseIfReadFailed(field, "reader.readKeyCacheObject", "msg");
 
             else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.CacheObject")))
-                returnFalseIfReadFailed(field, "reader.readCacheObject");
+                returnFalseIfReadFailed(field, "reader.readCacheObject", "msg");
 
             else if (assignableFrom(type, type("org.apache.ignite.internal.util.GridLongList")))
                 returnFalseIfReadFailed(field, "reader.readGridLongList");
@@ -690,13 +694,13 @@ else if (assignableFrom(type, type(MESSAGE_INTERFACE))) {
                     throw new IllegalArgumentException(COMPRESSED_MSG_ERROR);
 
                 if (compress)
-                    returnFalseIfReadFailed(field, "reader.readMessage", "true");
+                    returnFalseIfReadFailed(field, "reader.readMessage", "msg", "true");
                 else
-                    returnFalseIfReadFailed(field, "reader.readMessage");
+                    returnFalseIfReadFailed(field, "reader.readMessage", "msg");
             }
 
             else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) {
-                returnFalseIfReadFailed(field, "reader.readCollection", messageCollectionItemTypes(field, type));
+                returnFalseIfReadFailed(field, "reader.readCollection", messageCollectionItemTypes(field, type), "msg");
             }
             else if (enumType(env, type)) {
                 String fieldPrefix = typeNameToFieldName(env.getTypeUtils().asElement(type).getSimpleName().toString());

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

@@ -25,7 +25,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 /** */
-public final class ExchangeInfo extends IgniteDiagnosticRequest.DiagnosticBaseInfo {
+public final class ExchangeInfo implements IgniteDiagnosticRequest.DiagnosticBaseInfo {
     /** */
     @Order(0)
     AffinityTopologyVersion topVer;

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

@@ -143,18 +143,18 @@ public long futureId() {
     }
 
     /** */
-    public abstract static class DiagnosticBaseInfo implements Message {
+    public interface DiagnosticBaseInfo extends Message {
         /**
          * @param other Another info of the same type.
          */
-        public void merge(DiagnosticBaseInfo other) {
+        default void merge(DiagnosticBaseInfo other) {
             // No-op.
         }
 
         /**
          * @param sb String builder.
          * @param ctx Grid context.
          */
-        public abstract void appendInfo(StringBuilder sb, GridKernalContext ctx);
+        void appendInfo(StringBuilder sb, GridKernalContext ctx);
     }
 }

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

@@ -20,21 +20,17 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Objects;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
 import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
 import org.apache.ignite.internal.processors.cache.KeyCacheObject;
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 /** */
-public final class TxEntriesInfo extends IgniteDiagnosticRequest.DiagnosticBaseInfo {
+public final class TxEntriesInfo extends GridCacheIdMessage implements IgniteDiagnosticRequest.DiagnosticBaseInfo {
     /** */
     @Order(0)
-    int cacheId;
-
-    /** */
-    @Order(1)
     Collection<KeyCacheObject> keys;
 
     /**
@@ -66,16 +62,6 @@ public TxEntriesInfo() {
             return;
         }
 
-        try {
-            for (KeyCacheObject key : keys)
-                key.finishUnmarshal(cctx.cacheObjectContext(), null);
-        }
-        catch (IgniteCheckedException e) {
-            ctx.cluster().diagnosticLog().error("Failed to unmarshal key: " + e, e);
-
-            sb.append("Failed to unmarshal key: ").append(e).append(U.nl());
-        }
-
         sb.append("Cache entries [cacheId=").append(cacheId)
             .append(", cacheName=").append(cctx.name()).append("]: ");
 
@@ -112,4 +98,9 @@ public TxEntriesInfo() {
     @Override public int hashCode() {
         return Objects.hash(getClass(), cacheId);
     }
+
+    /** {@inheritDoc} */
+    @Override public boolean addDeploymentInfo() {
+        return false;
+    }
 }

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

@@ -24,7 +24,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 /** */
-public final class TxInfo extends IgniteDiagnosticRequest.DiagnosticBaseInfo {
+public final class TxInfo implements IgniteDiagnosticRequest.DiagnosticBaseInfo {
     /** */
     @Order(0)
     GridCacheVersion dhtVer;