IGNITE-27238 Use MessageSerializer for GridCacheQueryResponse (#12563)

Author: Vladsz83

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/IndexScan.java

@@ -210,7 +210,7 @@ protected IndexRow row2indexRow(Row bound) {
             if (key != ectx.unspecifiedValue()) {
                 key = TypeUtils.fromInternal(ectx, key, fieldsStoreTypes[fieldIdx]);
 
-                keys[i] = IndexKeyFactory.wrap(key, idxRowHnd.indexKeyDefinitions().get(i).idxType(),
+                keys[i] = IndexKeyFactory.wrap(key, idxRowHnd.indexKeyDefinitions().get(i).indexKeyType(),
                     cctx.cacheObjectContext(), idxRowHnd.indexKeyTypeSettings());
 
                 nullSearchRow = false;

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java

@@ -42,7 +42,6 @@
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.cache.query.index.SortOrder;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
 import org.apache.ignite.internal.processors.cache.GridCacheContextInfo;
 import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
@@ -325,10 +324,9 @@ private static Object affinityIdentity(CacheConfiguration<?, ?> ccfg) {
 
             assert fieldDesc != null;
 
-            boolean descending = keyDef.getValue().order().sortOrder() == SortOrder.DESC;
             int fieldIdx = fieldDesc.fieldIndex();
 
-            collations.add(TraitUtils.createFieldCollation(fieldIdx, !descending));
+            collations.add(TraitUtils.createFieldCollation(fieldIdx, keyDef.getValue().ascending()));
         }
 
         return RelCollations.of(collations);

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/IndexDdlIntegrationTest.java

@@ -22,7 +22,6 @@
 import java.util.List;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.cache.query.index.Index;
-import org.apache.ignite.internal.cache.query.index.SortOrder;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
 import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndex;
 import org.apache.ignite.internal.processors.query.IgniteSQLException;
@@ -151,11 +150,11 @@ public void createIndexWithColumnsOrdering() {
         List<String> keys = new ArrayList<>(keyDefs.keySet());
 
         assertEquals("ID", keys.get(0));
-        assertEquals(SortOrder.ASC, keyDefs.get(keys.get(0)).order().sortOrder());
+        assertEquals(true, keyDefs.get(keys.get(0)).ascending());
         assertEquals("VAL_INT", keys.get(1));
-        assertEquals(SortOrder.ASC, keyDefs.get(keys.get(1)).order().sortOrder());
+        assertEquals(true, keyDefs.get(keys.get(1)).ascending());
         assertEquals("VAL_STR", keys.get(2));
-        assertEquals(SortOrder.DESC, keyDefs.get(keys.get(2)).order().sortOrder());
+        assertEquals(false, keyDefs.get(keys.get(2)).ascending());
     }
 
     /**

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/TestTable.java

@@ -45,8 +45,6 @@
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.ignite.internal.cache.query.index.IndexDefinition;
 import org.apache.ignite.internal.cache.query.index.IndexName;
-import org.apache.ignite.internal.cache.query.index.Order;
-import org.apache.ignite.internal.cache.query.index.SortOrder;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyType;
 import org.apache.ignite.internal.cache.query.index.sorted.client.ClientIndex;
@@ -257,9 +255,7 @@ public TestTable addIndex(RelCollation collation, String name) {
             IndexKeyType keyType = (fieldType == Character.class || fieldType == char.class) ? IndexKeyType.STRING_FIXED :
                 fieldType instanceof Class ? IndexKeyType.forClass((Class<?>)fieldType) : IndexKeyType.UNKNOWN;
 
-            Order order = new Order(fc.direction.isDescending() ? SortOrder.DESC : SortOrder.ASC, null);
-
-            keyDefs.put(field.getName(), new IndexKeyDefinition(keyType.code(), order, -1));
+            keyDefs.put(field.getName(), new IndexKeyDefinition(keyType.code(), -1, !fc.direction.isDescending()));
         }
 
         IndexDefinition idxDef = new ClientIndexDefinition(

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

@@ -28,7 +28,6 @@
 import org.apache.ignite.cache.query.IndexQueryCriterion;
 import org.apache.ignite.internal.cache.query.InIndexQueryCriterion;
 import org.apache.ignite.internal.cache.query.RangeIndexQueryCriterion;
-import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyType;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettings;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexRowComparator;
@@ -39,7 +38,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.internal.cache.query.index.IndexQueryProcessor.rangeDesc;
-import static org.apache.ignite.internal.cache.query.index.SortOrder.DESC;
 
 /**
  * IndexQuery condition for single indexed key. It accumulates user defined criteria (with Object as parameters)
@@ -343,8 +341,6 @@ private int compare(IndexKey left, IndexKey right) throws IgniteCheckedException
 
     /** */
     boolean desc() {
-        IndexKeyDefinition keyDef = idx.indexDefinition().indexKeyDefinitions().get(fldName);
-
-        return keyDef.order().sortOrder() == DESC;
+        return !idx.indexDefinition().indexKeyDefinitions().get(fldName).ascending();
     }
 }

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

@@ -0,0 +1,97 @@
+/*
+ * 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.cache.query.index;
+
+import org.apache.ignite.internal.Order;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyType;
+import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.jetbrains.annotations.Nullable;
+
+/** Message wrapper for {@link IndexKeyType}. */
+public class IndexKeyTypeMessage implements Message {
+    /** Type code. */
+    public static final short TYPE_CODE = 516;
+
+    /** */
+    public static final byte NULL_VALUE_CODE = Byte.MIN_VALUE;
+
+    /** Index key type. */
+    private @Nullable IndexKeyType val;
+
+    /** Code. */
+    @Order(0)
+    private byte code = NULL_VALUE_CODE;
+
+    /** Empty constructor for {@link GridIoMessageFactory}. */
+    public IndexKeyTypeMessage() {
+        // No-op.
+    }
+
+    /** Constructor. */
+    public IndexKeyTypeMessage(@Nullable IndexKeyType keyType) {
+        val = keyType;
+        code = encode(keyType);
+    }
+
+    /** Constructor. */
+    public IndexKeyTypeMessage(int keyTypeCode) {
+        code((byte)keyTypeCode);
+    }
+
+    /** @return Code. */
+    public byte code() {
+        return code;
+    }
+
+    /**
+     * @param code New code.
+     */
+    public void code(byte code) {
+        this.code = code;
+        val = decode(code);
+    }
+
+    /** @return Index key type. */
+    public @Nullable IndexKeyType value() {
+        return val;
+    }
+
+    /** @param keyType Index key type. */
+    private static byte encode(@Nullable IndexKeyType keyType) {
+        if (keyType == null)
+            return NULL_VALUE_CODE;
+
+        return (byte)keyType.code();
+    }
+
+    /**
+     * @param code Code to decode an inde key type.
+     */
+    private static @Nullable IndexKeyType decode(byte code) {
+        if (code == NULL_VALUE_CODE)
+            return null;
+
+        return IndexKeyType.forCode(code);
+    }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return TYPE_CODE;
+    }
+}

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

@@ -17,31 +17,28 @@
 
 package org.apache.ignite.internal.cache.query.index;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettings;
 import org.apache.ignite.internal.cache.query.index.sorted.MetaPageInfo;
 import org.apache.ignite.internal.cache.query.index.sorted.SortedIndexDefinition;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  * Metadata for IndexQuery response. This information is required to be sent to a node that initiated a query.
  * Thick client nodes may have irrelevant information about index structure, {@link MetaPageInfo}.
  */
-public class IndexQueryResultMeta implements Externalizable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
+public class IndexQueryResultMeta implements Message {
     /** Index key settings. */
+    @Order(0)
     private IndexKeyTypeSettings keyTypeSettings;
 
     /** Index key definitions. */
+    @Order(value = 1, method = "keyDefinitions")
     private LinkedHashMap<String, IndexKeyDefinition> keyDefs;
 
     /** */
@@ -53,7 +50,7 @@ public IndexQueryResultMeta() {
     public IndexQueryResultMeta(SortedIndexDefinition def, int critSize) {
         keyTypeSettings = def.keyTypeSettings();
 
-        keyDefs = new LinkedHashMap<>();
+        keyDefs = U.newLinkedHashMap(critSize);
 
         Iterator<Map.Entry<String, IndexKeyDefinition>> keys = def.indexKeyDefinitions().entrySet().iterator();
 
@@ -64,27 +61,30 @@ public IndexQueryResultMeta(SortedIndexDefinition def, int critSize) {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 18;
+    }
+
     /** */
     public IndexKeyTypeSettings keyTypeSettings() {
         return keyTypeSettings;
     }
 
     /** */
-    public LinkedHashMap<String, IndexKeyDefinition> keyDefinitions() {
-        return keyDefs;
+    public void keyTypeSettings(IndexKeyTypeSettings keyTypeSettings) {
+        this.keyTypeSettings = keyTypeSettings;
     }
 
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject(keyTypeSettings);
-
-        U.writeMap(out, keyDefs);
+    /** */
+    public Map<String, IndexKeyDefinition> keyDefinitions() {
+        return keyDefs;
     }
 
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        keyTypeSettings = (IndexKeyTypeSettings)in.readObject();
-
-        keyDefs = U.readLinkedMap(in);
+    /** */
+    public void keyDefinitions(Map<String, IndexKeyDefinition> keyDefs) {
+        this.keyDefs = keyDefs == null
+            ? null
+            : keyDefs instanceof LinkedHashMap ? (LinkedHashMap)keyDefs : new LinkedHashMap<>(keyDefs);
     }
 }