This is an automated email from the ASF dual-hosted git repository.
timoninmaxim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 61ddd30315c IGNITE-26260 Use MessageSerializer for
GridQueryFailResponse (#12292)
61ddd30315c is described below
commit 61ddd30315c1dffffad160d83056014f959b03d4
Author: Denis <116185428+denisp...@users.noreply.github.com>
AuthorDate: Fri Aug 29 21:49:07 2025 +1000
IGNITE-26260 Use MessageSerializer for GridQueryFailResponse (#12292)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../h2/twostep/messages/GridQueryFailResponse.java | 97 ++++++----------------
2 files changed, 27 insertions(+), 73 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 15554e94f0b..b8f1d3001f9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -37,6 +37,7 @@ import
org.apache.ignite.internal.codegen.GridDhtPartitionExchangeIdSerializer;
import org.apache.ignite.internal.codegen.GridIntListSerializer;
import org.apache.ignite.internal.codegen.GridJobCancelRequestSerializer;
import org.apache.ignite.internal.codegen.GridJobSiblingsRequestSerializer;
+import org.apache.ignite.internal.codegen.GridQueryFailResponseSerializer;
import org.apache.ignite.internal.codegen.GridQueryKillRequestSerializer;
import org.apache.ignite.internal.codegen.GridQueryKillResponseSerializer;
import org.apache.ignite.internal.codegen.GridQueryNextPageRequestSerializer;
@@ -316,7 +317,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)104, GridCacheVersionEx::new, new
GridCacheVersionExSerializer());
factory.register((short)105, CacheObjectByteArrayImpl::new);
factory.register((short)106, GridQueryCancelRequest::new);
- factory.register((short)107, GridQueryFailResponse::new);
+ factory.register((short)107, GridQueryFailResponse::new, new
GridQueryFailResponseSerializer());
factory.register((short)108, GridQueryNextPageRequest::new, new
GridQueryNextPageRequestSerializer());
factory.register((short)109, GridQueryNextPageResponse::new);
factory.register((short)112, GridCacheSqlQuery::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index 82e66662097..d168f1c0c7a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -17,13 +17,11 @@
package org.apache.ignite.internal.processors.query.h2.twostep.messages;
-import java.nio.ByteBuffer;
import org.apache.ignite.cache.query.QueryCancelledException;
import org.apache.ignite.cache.query.QueryRetryException;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* Error message.
@@ -39,12 +37,15 @@ public class GridQueryFailResponse implements Message {
public static final byte RETRY_QUERY = 2;
/** */
+ @Order(value = 0, method = "queryRequestId")
private long qryReqId;
/** */
+ @Order(value = 1, method = "error")
private String errMsg;
/** */
+ @Order(2)
private byte failCode;
/**
@@ -77,6 +78,13 @@ public class GridQueryFailResponse implements Message {
return qryReqId;
}
+ /**
+ * @param qryReqId Query request ID.
+ */
+ public void queryRequestId(long qryReqId) {
+ this.qryReqId = qryReqId;
+ }
+
/**
* @return Error.
*/
@@ -84,6 +92,13 @@ public class GridQueryFailResponse implements Message {
return errMsg;
}
+ /**
+ * @param errMsg Error.
+ */
+ public void error(String errMsg) {
+ this.errMsg = errMsg;
+ }
+
/**
* @return Fail code.
*/
@@ -91,6 +106,13 @@ public class GridQueryFailResponse implements Message {
return failCode;
}
+ /**
+ * @param failCode Fail code.
+ */
+ public void failCode(byte failCode) {
+ this.failCode = failCode;
+ }
+
/** {@inheritDoc} */
@Override public void onAckReceived() {
// No-op.
@@ -101,75 +123,6 @@ public class GridQueryFailResponse implements Message {
return S.toString(GridQueryFailResponse.class, this);
}
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 0:
- if (!writer.writeString(errMsg))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeByte(failCode))
- return false;
-
- writer.incrementState();
-
- case 2:
- if (!writer.writeLong(qryReqId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- errMsg = reader.readString();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- failCode = reader.readByte();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 2:
- qryReqId = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 107;
