Skip to content

IGNITE-26956 Use MessageSerializer for GenericValueMessage and QueryBatchMessage #12500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shishkovilja merged 1 commit into from
Nov 7, 2025
Merged

IGNITE-26956 Use MessageSerializer for GenericValueMessage and QueryBatchMessage #12500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 17 additions & 48 deletions ...java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,20 @@

package org.apache.ignite.internal.processors.query.calcite.message;

import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;

/**
*
*/
public final class GenericValueMessage implements ValueMessage {
/** */
@GridDirectTransient
private Object val;

/** */
@Order(0)
private byte[] serialized;

/** */
Expand All @@ -51,6 +48,20 @@ public GenericValueMessage(Object val) {
return val;
}

/**
* @return Serialized value.
*/
public byte[] serialized() {
return serialized;
}

/**
* @param serialized Serialized value.
*/
public void serialized(byte[] serialized) {
this.serialized = serialized;
}

/** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
if (val != null && serialized == null)
Expand All @@ -59,50 +70,8 @@ public GenericValueMessage(Object val) {

/** {@inheritDoc} */
@Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
if (serialized != null && val == null) {
if (serialized != null && val == null)
val = U.unmarshal(ctx, serialized, U.resolveClassLoader(ctx.gridConfig()));
}
}

/** {@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.writeByteArray(serialized))
return false;

writer.incrementState();

}

return true;
}

/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

switch (reader.state()) {
case 0:
serialized = reader.readByteArray();

if (!reader.isLastRead())
return false;

reader.incrementState();

}

return true;
}

/** {@inheritDoc} */
Expand Down
6 changes: 4 additions & 2 deletions ...rc/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import org.apache.ignite.internal.codegen.ColocationGroupSerializer;
import org.apache.ignite.internal.codegen.FragmentDescriptionSerializer;
import org.apache.ignite.internal.codegen.FragmentMappingSerializer;
import org.apache.ignite.internal.codegen.GenericValueMessageSerializer;
import org.apache.ignite.internal.codegen.InboxCloseMessageSerializer;
import org.apache.ignite.internal.codegen.QueryBatchAcknowledgeMessageSerializer;
import org.apache.ignite.internal.codegen.QueryBatchMessageSerializer;
import org.apache.ignite.internal.codegen.QueryCloseMessageSerializer;
import org.apache.ignite.internal.codegen.QueryStartResponseSerializer;
import org.apache.ignite.internal.codegen.QueryTxEntrySerializer;
Expand All @@ -46,7 +48,7 @@ public enum MessageType {
QUERY_ERROR_MESSAGE(302, CalciteErrorMessage::new, new CalciteErrorMessageSerializer()),

/** */
QUERY_BATCH_MESSAGE(303, QueryBatchMessage::new),
QUERY_BATCH_MESSAGE(303, QueryBatchMessage::new, new QueryBatchMessageSerializer()),

/** */
QUERY_ACKNOWLEDGE_MESSAGE(304, QueryBatchAcknowledgeMessage::new, new QueryBatchAcknowledgeMessageSerializer()),
Expand All @@ -58,7 +60,7 @@ public enum MessageType {
QUERY_CLOSE_MESSAGE(306, QueryCloseMessage::new, new QueryCloseMessageSerializer()),

/** */
GENERIC_VALUE_MESSAGE(307, GenericValueMessage::new),
GENERIC_VALUE_MESSAGE(307, GenericValueMessage::new, new GenericValueMessageSerializer()),

/** */
FRAGMENT_MAPPING(350, FragmentMapping::new, new FragmentMappingSerializer()),
Expand Down
175 changes: 56 additions & 119 deletions ...n/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,42 @@

package org.apache.ignite.internal.processors.query.calcite.message;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;

/**
*
*/
public class QueryBatchMessage implements MarshalableMessage, ExecutionContextAware {
/** */
@Order(value = 0, method = "queryId")
private UUID qryId;

/** */
@Order(1)
private long fragmentId;

/** */
@Order(2)
private long exchangeId;

/** */
@Order(3)
private int batchId;

/** */
@Order(4)
private boolean last;

/** */
@GridDirectTransient
private List<Object> rows;

/** */
@GridDirectCollection(ValueMessage.class)
@Order(value = 5, method = "messageRows")
private List<ValueMessage> mRows;

/** */
Expand All @@ -75,39 +74,88 @@ public QueryBatchMessage(UUID qryId, long fragmentId, long exchangeId, int batch
return qryId;
}

/**
* @param qryId Query ID.
*/
public void queryId(UUID qryId) {
this.qryId = qryId;
}

/** {@inheritDoc} */
@Override public long fragmentId() {
return fragmentId;
}

/**
* @param fragmentId Fragment ID.
*/
public void fragmentId(long fragmentId) {
this.fragmentId = fragmentId;
}

/**
* @return Exchange ID.
*/
public long exchangeId() {
return exchangeId;
}

/**
* @param exchangeId Exchange ID.
*/
public void exchangeId(long exchangeId) {
this.exchangeId = exchangeId;
}

/**
* @return Batch ID.
*/
public int batchId() {
return batchId;
}

/**
* @param batchId Batch ID.
*/
public void batchId(int batchId) {
this.batchId = batchId;
}

/**
* @return Last batch flag.
*/
public boolean last() {
return last;
}

/**
* @param last Last batch flag.
*/
public void last(boolean last) {
this.last = last;
}

/**
* @return Rows.
*/
public List<Object> rows() {
return rows;
}

/**
* @return Message rows.
*/
public List<ValueMessage> messageRows() {
return mRows;
}

/**
* @param mRows Message rows.
*/
public void messageRows(List<ValueMessage> mRows) {
this.mRows = mRows;
}

/** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws IgniteCheckedException {
if (mRows != null || rows == null)
Expand Down Expand Up @@ -142,117 +190,6 @@ public List<Object> rows() {
}
}

/** {@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.writeInt(batchId))
return false;

writer.incrementState();

case 1:
if (!writer.writeLong(exchangeId))
return false;

writer.incrementState();

case 2:
if (!writer.writeLong(fragmentId))
return false;

writer.incrementState();

case 3:
if (!writer.writeBoolean(last))
return false;

writer.incrementState();

case 4:
if (!writer.writeCollection(mRows, MessageCollectionItemType.MSG))
return false;

writer.incrementState();

case 5:
if (!writer.writeUuid(qryId))
return false;

writer.incrementState();

}

return true;
}

/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

switch (reader.state()) {
case 0:
batchId = reader.readInt();

if (!reader.isLastRead())
return false;

reader.incrementState();

case 1:
exchangeId = reader.readLong();

if (!reader.isLastRead())
return false;

reader.incrementState();

case 2:
fragmentId = reader.readLong();

if (!reader.isLastRead())
return false;

reader.incrementState();

case 3:
last = reader.readBoolean();

if (!reader.isLastRead())
return false;

reader.incrementState();

case 4:
mRows = reader.readCollection(MessageCollectionItemType.MSG);

if (!reader.isLastRead())
return false;

reader.incrementState();

case 5:
qryId = reader.readUuid();

if (!reader.isLastRead())
return false;

reader.incrementState();

}

return true;
}

/** {@inheritDoc} */
@Override public MessageType type() {
return MessageType.QUERY_BATCH_MESSAGE;
Expand Down
Loading