IGNITE-28767 Use Message DTO to transfer QueryEntity

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

@@ -219,6 +219,8 @@
 import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse;
 import org.apache.ignite.internal.processors.query.messages.GridQueryKillRequest;
 import org.apache.ignite.internal.processors.query.messages.GridQueryKillResponse;
+import org.apache.ignite.internal.processors.query.schema.message.QueryEntityExMessage;
+import org.apache.ignite.internal.processors.query.schema.message.QueryEntityMessage;
 import org.apache.ignite.internal.processors.query.schema.message.QueryInlineSizesDataBagItem;
 import org.apache.ignite.internal.processors.query.schema.message.QueryProposalsDataBagItem;
 import org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessage;
@@ -589,7 +591,9 @@ public CoreMessagesProvider(Marshaller dfltMarsh, Marshaller schemaAwareMarsh, C
         withNoSchema(GridDhtTxSalvageMessage.class);
         withSchema(CacheContinuousQueryEntry.class);
         withNoSchema(QueryInlineSizesDataBagItem.class);
-        withSchema(QueryProposalsDataBagItem.class);
+        withNoSchema(QueryProposalsDataBagItem.class);
+        withNoSchema(QueryEntityMessage.class);
+        withNoSchema(QueryEntityExMessage.class);
 
         // [11200 - 11300]: Compute, distributed process messages.
         msgIdx = 11200;
@@ -643,7 +647,7 @@ public CoreMessagesProvider(Marshaller dfltMarsh, Marshaller schemaAwareMarsh, C
         withNoSchema(UserAuthenticateRequestMessage.class);
         withNoSchema(UserAuthenticateResponseMessage.class);
         withNoSchema(TcpDiscoveryAuthFailedMessage.class);
-        withSchema(AuthentificationDataBagItem.class);
+        withNoSchema(AuthentificationDataBagItem.class);
 
         // [12200 - 12300]: Binary, classloading and marshalling messages.
         msgIdx = 12200;

modules/core/src/main/java/org/apache/ignite/internal/cache/query/QueryIndexMessage.java

@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.cache.query;
 
-import java.io.Serializable;
 import java.util.LinkedHashMap;
 import org.apache.ignite.cache.QueryIndex;
 import org.apache.ignite.cache.QueryIndexType;
@@ -28,10 +27,7 @@
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 
 /** Message for {@link QueryIndex}. */
-public class QueryIndexMessage implements Serializable, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class QueryIndexMessage implements Message {
     /** Index name. */
     @Order(0)
     public String name;

modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryField.java

@@ -17,18 +17,14 @@
 
 package org.apache.ignite.internal.processors.query;
 
-import java.io.Serializable;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  * Query field metadata.
  */
-public class QueryField implements Serializable, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class QueryField implements Message {
     /** Field name. */
     @Order(0)
     String name;

modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/QueryEntityExMessage.java

@@ -0,0 +1,88 @@
+/*
+ * 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.query.schema.message;
+
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.internal.Order;
+import org.apache.ignite.internal.processors.query.QueryEntityEx;
+
+/** Message for {@link QueryEntityEx} transfer. */
+public class QueryEntityExMessage extends QueryEntityMessage {
+    /** Whether to preserve order specified by 'keyFields' or not. */
+    @Order(0)
+    boolean preserveKeysOrder;
+
+    /** Whether a primary key should be autocreated or not. */
+    @Order(1)
+    boolean implicitPk;
+
+    /** Whether absent PK parts should be filled with defaults or not. */
+    @Order(2)
+    boolean fillAbsentPKsWithDefaults;
+
+    /** INLINE_SIZE for PK index. */
+    @Order(3)
+    int pkInlineSize;
+
+    /** INLINE_SIZE for affinity field index. */
+    @Order(4)
+    int affKeyInlineSize;
+
+    /** Whether query entity was created by SQL. */
+    @Order(5)
+    boolean sql;
+
+    /** */
+    public QueryEntityExMessage() { }
+
+    /**
+     * @param qryEntity Original {@link QueryEntity}.
+     */
+    public QueryEntityExMessage(QueryEntityEx qryEntity) {
+        super(qryEntity);
+
+        preserveKeysOrder = qryEntity.isPreserveKeysOrder();
+        implicitPk = qryEntity.implicitPk();
+        fillAbsentPKsWithDefaults = qryEntity.fillAbsentPKsWithDefaults();
+
+        pkInlineSize = qryEntity.getPrimaryKeyInlineSize() != null ? qryEntity.getPrimaryKeyInlineSize() : -1;
+
+        affKeyInlineSize = qryEntity.getAffinityKeyInlineSize() != null ? qryEntity.getAffinityKeyInlineSize() : -1;
+
+        sql = qryEntity.sql();
+    }
+
+    /** {@inheritDoc} */
+    @Override public QueryEntity toEntity() {
+        QueryEntityEx qryEntity = new QueryEntityEx(entityBase());
+
+        qryEntity.setNotNullFields(notNullFields);
+        qryEntity.setPreserveKeysOrder(preserveKeysOrder);
+        qryEntity.implicitPk(implicitPk);
+        qryEntity.fillAbsentPKsWithDefaults(fillAbsentPKsWithDefaults);
+        qryEntity.sql(sql);
+
+        if (pkInlineSize != -1)
+            qryEntity.setPrimaryKeyInlineSize(pkInlineSize);
+
+        if (affKeyInlineSize != -1)
+            qryEntity.setAffinityKeyInlineSize(affKeyInlineSize);
+
+        return qryEntity;
+    }
+}

modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/QueryEntityMessage.java

@@ -0,0 +1,158 @@
+/*
+ * 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.query.schema.message;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.internal.MarshallableMessage;
+import org.apache.ignite.internal.Order;
+import org.apache.ignite.internal.cache.query.QueryIndexMessage;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.marshaller.Marshaller;
+
+/**
+ * Message for {@link QueryEntity} transfer.
+ */
+public class QueryEntityMessage implements MarshallableMessage {
+    /** Key type. */
+    @Order(0)
+    String keyType;
+
+    /** Value type. */
+    @Order(1)
+    String valType;
+
+    /** Key name. */
+    @Order(2)
+    String keyFieldName;
+
+    /** Value name. */
+    @Order(3)
+    String valFieldName;
+
+    /** Fields available for query. */
+    @Order(4)
+    LinkedHashMap<String, String> fields;
+
+    /** Set of field names that belong to the key. */
+    @Order(5)
+    String[] keyFields;
+
+    /** Aliases. */
+    @Order(6)
+    Map<String, String> aliases;
+
+    /** Collection of query indexes. */
+    @Order(7)
+    Collection<QueryIndexMessage> idxs;
+
+    /** Table name. */
+    @Order(8)
+    String tableName;
+
+    /**
+     * Fields that must have non-null value.
+     * NB: Used in serde of both QueryEntity and QueryEntityEx in order to avoid duplication.
+     */
+    @Order(9)
+    Set<String> notNullFields;
+
+    /** Fields default values. */
+    Map<String, Object> dfltFieldValues;
+
+    /** Serialized form of {@link #dfltFieldValues}. */
+    @Order(10)
+    byte[] dfltFieldValuesBytes;
+
+    /** Precision(Maximum length) for fields. */
+    @Order(11)
+    Map<String, Integer> fieldsPrecision;
+
+    /** Scale for fields. */
+    @Order(12)
+    Map<String, Integer> fieldsScale;
+
+    /** */
+    public QueryEntityMessage() { }
+
+    /** @param qryEntity Original {@link QueryEntity}. */
+    public QueryEntityMessage(QueryEntity qryEntity) {
+        keyType = qryEntity.getKeyType();
+        valType = qryEntity.getValueType();
+
+        keyFieldName = qryEntity.getKeyFieldName();
+        valFieldName = qryEntity.getValueFieldName();
+
+        fields = qryEntity.getFields();
+        aliases = qryEntity.getAliases();
+
+        if (!F.isEmpty(qryEntity.getKeyFields()))
+            keyFields = qryEntity.getKeyFields().toArray(U.EMPTY_STRS);
+
+        if (!F.isEmpty(qryEntity.getIndexes()))
+            idxs = F.viewReadOnly(qryEntity.getIndexes(), QueryIndexMessage::new);
+
+        tableName = qryEntity.getTableName();
+
+        notNullFields = qryEntity.getNotNullFields();
+        dfltFieldValues = qryEntity.getDefaultFieldValues();
+        fieldsPrecision = qryEntity.getFieldsPrecision();
+        fieldsScale = qryEntity.getFieldsScale();
+    }
+
+    /** @return Original {@link QueryEntity}. */
+    public QueryEntity toEntity() {
+        return entityBase().setNotNullFields(notNullFields);
+    }
+
+    /** @return Entity without 'notNullFields.' */
+    protected QueryEntity entityBase() {
+        return new QueryEntity()
+            .setKeyType(keyType)
+            .setValueType(valType)
+            .setKeyFieldName(keyFieldName)
+            .setValueFieldName(valFieldName)
+            .setFields(fields)
+            .setKeyFields(!F.isEmpty(keyFields) ? new LinkedHashSet<>(List.of(keyFields)) : null)
+            .setAliases(aliases)
+            .setIndexes(!F.isEmpty(idxs) ? F.transform(idxs, QueryIndexMessage::queryIndex) : null)
+            .setTableName(tableName)
+            .setDefaultFieldValues(dfltFieldValues)
+            .setFieldsPrecision(fieldsPrecision)
+            .setFieldsScale(fieldsScale);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
+        if (!F.isEmpty(dfltFieldValues))
+            dfltFieldValuesBytes = U.marshal(marsh, dfltFieldValues);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
+        if (!F.isEmpty(dfltFieldValuesBytes))
+            dfltFieldValues = U.unmarshal(marsh, dfltFieldValuesBytes, clsLdr);
+    }
+}

modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/operation/SchemaAbstractOperation.java

@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.processors.query.schema.operation;
 
-import java.io.Serializable;
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -26,10 +25,7 @@
 /**
  * Abstract operation on schema.
  */
-public abstract class SchemaAbstractOperation implements Serializable, Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public abstract class SchemaAbstractOperation implements Message {
     /** Operation ID. */
     @Order(0)
     UUID opId;