shishkovilja commented on code in PR #12563:
URL: https://github.com/apache/ignite/pull/12563#discussion_r2606733431
##########
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java:
##########
@@ -17,28 +17,23 @@
package org.apache.ignite.internal.cache.query.index.sorted;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import org.apache.ignite.internal.cache.query.index.Order;
-import org.apache.ignite.internal.cache.query.index.SortOrder;
-import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.cache.query.index.IndexKeyTypeMessage;
+import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Defines a signle index key.
*/
-public class IndexKeyDefinition implements Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Index key type. {@link IndexKeyType}. */
- private IndexKeyType idxType;
+public class IndexKeyDefinition implements Message {
+ /** A message for {@link IndexKeyType}. */
+ @org.apache.ignite.internal.Order(value = 0, method =
"indexKeyTypeMessage")
+ private IndexKeyTypeMessage idxTypeMsg;
/** Order. */
- private Order order;
+ @org.apache.ignite.internal.Order(value = 1, method = "ascending")
Review Comment:
```suggestion
@Order(value = 1, method = "ascending")
```
##########
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java:
##########
@@ -17,28 +17,23 @@
package org.apache.ignite.internal.cache.query.index.sorted;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import org.apache.ignite.internal.cache.query.index.Order;
-import org.apache.ignite.internal.cache.query.index.SortOrder;
-import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.cache.query.index.IndexKeyTypeMessage;
+import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Defines a signle index key.
*/
-public class IndexKeyDefinition implements Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Index key type. {@link IndexKeyType}. */
- private IndexKeyType idxType;
+public class IndexKeyDefinition implements Message {
+ /** A message for {@link IndexKeyType}. */
+ @org.apache.ignite.internal.Order(value = 0, method =
"indexKeyTypeMessage")
+ private IndexKeyTypeMessage idxTypeMsg;
/** Order. */
- private Order order;
+ @org.apache.ignite.internal.Order(value = 1, method = "ascending")
+ private boolean asc;
/** Precision for variable length key types. */
+ @org.apache.ignite.internal.Order(2)
Review Comment:
```suggestion
@Order(2)
```
##########
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java:
##########
@@ -17,31 +17,27 @@
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;
Review Comment:
We should use `Map` here.
##########
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java:
##########
@@ -17,28 +17,23 @@
package org.apache.ignite.internal.cache.query.index.sorted;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import org.apache.ignite.internal.cache.query.index.Order;
-import org.apache.ignite.internal.cache.query.index.SortOrder;
-import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.cache.query.index.IndexKeyTypeMessage;
+import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Defines a signle index key.
*/
-public class IndexKeyDefinition implements Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Index key type. {@link IndexKeyType}. */
- private IndexKeyType idxType;
+public class IndexKeyDefinition implements Message {
+ /** A message for {@link IndexKeyType}. */
+ @org.apache.ignite.internal.Order(value = 0, method =
"indexKeyTypeMessage")
Review Comment:
```suggestion
@Order(value = 0, method = "indexKeyTypeMessage")
```
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java:
##########
@@ -897,14 +896,6 @@ protected void runFieldsQuery(final GridCacheQueryInfo
qryInfo) {
recipient(qryInfo.senderId(), qryInfo.requestId())) :
fieldsQueryResult(qryInfo, taskName);
- // If metadata needs to be returned to user and cleaned from
internal fields - copy it.
- List<GridQueryFieldMetadata> meta = qryInfo.includeMetaData() ?
Review Comment:
`GridQueryFieldMetadata#includeMetaData` is unused after this changes and
can be removed.
##########
modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java:
##########
@@ -58,31 +54,43 @@ public IndexKeyDefinition(int idxTypeCode, Order order,
long precision) {
this.precision = (int)precision;
}
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 113;
+ }
+
+ /** */
+ public boolean ascending() {
+ return asc;
+ }
+
/** */
- public Order order() {
- return order;
+ public void ascending(boolean asc) {
+ this.asc = asc;
}
/** */
public IndexKeyType idxType() {
Review Comment:
```suggestion
public IndexKeyType indexType() {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
