Skip to content

IGNITE-25515 Remove obsolete code from MessageReader/Writer #12110

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
merged 5 commits into from
Jun 3, 2025
Merged

IGNITE-25515 Remove obsolete code from MessageReader/Writer #12110

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86c1fb7
WIP
timoninmaxim May 29, 2025
500800e
Merge branch 'master' of github.com:apache/ignite into IGNITE-25515__…
timoninmaxim May 29, 2025
57c1ea9
IGNITE-25515 Remove obsolete code from MessageReader/Writer
timoninmaxim May 29, 2025
dc43c16
Fix test
timoninmaxim Jun 2, 2025
4b92656
Review fixes
timoninmaxim Jun 2, 2025
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
17 changes: 7 additions & 10 deletions ...c/main/java/org/apache/ignite/internal/processors/query/calcite/message/ErrorMessage.java
View file
Original file line number Diff line number Diff line change
@@ -93,19 +93,19 @@ public Throwable error() {

switch (writer.state()) {
case 0:
if (!writer.writeByteArray("errBytes", errBytes))
if (!writer.writeByteArray(errBytes))
return false;

writer.incrementState();

case 1:
if (!writer.writeLong("fragmentId", fragmentId))
if (!writer.writeLong(fragmentId))
return false;

writer.incrementState();

case 2:
if (!writer.writeUuid("queryId", queryId))
if (!writer.writeUuid(queryId))
return false;

writer.incrementState();
@@ -119,28 +119,25 @@ public Throwable error() {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

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

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

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

reader.incrementState();

case 1:
fragmentId = reader.readLong("fragmentId");
fragmentId = reader.readLong();

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

reader.incrementState();

case 2:
queryId = reader.readUuid("queryId");
queryId = reader.readUuid();

if (!reader.isLastRead())
return false;
@@ -149,7 +146,7 @@ public Throwable error() {

}

return reader.afterMessageRead(ErrorMessage.class);
return true;
}

/** {@inheritDoc} */
9 changes: 3 additions & 6 deletions ...java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java
View file
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ public GenericValueMessage(Object val) {

switch (writer.state()) {
case 0:
if (!writer.writeByteArray("serialized", serialized))
if (!writer.writeByteArray(serialized))
return false;

writer.incrementState();
@@ -91,12 +91,9 @@ public GenericValueMessage(Object val) {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

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

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

if (!reader.isLastRead())
return false;
@@ -105,7 +102,7 @@ public GenericValueMessage(Object val) {

}

return reader.afterMessageRead(GenericValueMessage.class);
return true;
}

/** {@inheritDoc} */
17 changes: 7 additions & 10 deletions ...n/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java
View file
Original file line number Diff line number Diff line change
@@ -82,19 +82,19 @@ public long exchangeId() {

switch (writer.state()) {
case 0:
if (!writer.writeLong("exchangeId", exchangeId))
if (!writer.writeLong(exchangeId))
return false;

writer.incrementState();

case 1:
if (!writer.writeLong("fragmentId", fragmentId))
if (!writer.writeLong(fragmentId))
return false;

writer.incrementState();

case 2:
if (!writer.writeUuid("queryId", queryId))
if (!writer.writeUuid(queryId))
return false;

writer.incrementState();
@@ -108,28 +108,25 @@ public long exchangeId() {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

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

switch (reader.state()) {
case 0:
exchangeId = reader.readLong("exchangeId");
exchangeId = reader.readLong();

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

reader.incrementState();

case 1:
fragmentId = reader.readLong("fragmentId");
fragmentId = reader.readLong();

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

reader.incrementState();

case 2:
queryId = reader.readUuid("queryId");
queryId = reader.readUuid();

if (!reader.isLastRead())
return false;
@@ -138,7 +135,7 @@ public long exchangeId() {

}

return reader.afterMessageRead(InboxCloseMessage.class);
return true;
}

/** {@inheritDoc} */
21 changes: 9 additions & 12 deletions ...apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java
View file
Original file line number Diff line number Diff line change
@@ -89,25 +89,25 @@ public int batchId() {

switch (writer.state()) {
case 0:
if (!writer.writeInt("batchId", batchId))
if (!writer.writeInt(batchId))
return false;

writer.incrementState();

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

writer.incrementState();

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

writer.incrementState();

case 3:
if (!writer.writeUuid("queryId", queryId))
if (!writer.writeUuid(queryId))
return false;

writer.incrementState();
@@ -121,36 +121,33 @@ public int batchId() {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

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

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

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

reader.incrementState();

case 1:
exchangeId = reader.readLong("exchangeId");
exchangeId = reader.readLong();

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

reader.incrementState();

case 2:
fragmentId = reader.readLong("fragmentId");
fragmentId = reader.readLong();

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

reader.incrementState();

case 3:
queryId = reader.readUuid("queryId");
queryId = reader.readUuid();

if (!reader.isLastRead())
return false;
@@ -159,7 +156,7 @@ public int batchId() {

}

return reader.afterMessageRead(QueryBatchAcknowledgeMessage.class);
return true;
}

/** {@inheritDoc} */
29 changes: 13 additions & 16 deletions ...n/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java
View file
Original file line number Diff line number Diff line change
@@ -155,37 +155,37 @@ public List<Object> rows() {

switch (writer.state()) {
case 0:
if (!writer.writeInt("batchId", batchId))
if (!writer.writeInt(batchId))
return false;

writer.incrementState();

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

writer.incrementState();

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

writer.incrementState();

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

writer.incrementState();

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

writer.incrementState();

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

writer.incrementState();
@@ -199,52 +199,49 @@ public List<Object> rows() {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

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

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

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

reader.incrementState();

case 1:
exchangeId = reader.readLong("exchangeId");
exchangeId = reader.readLong();

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

reader.incrementState();

case 2:
fragmentId = reader.readLong("fragmentId");
fragmentId = reader.readLong();

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

reader.incrementState();

case 3:
last = reader.readBoolean("last");
last = reader.readBoolean();

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

reader.incrementState();

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

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

reader.incrementState();

case 5:
qryId = reader.readUuid("queryId");
qryId = reader.readUuid();

if (!reader.isLastRead())
return false;
@@ -253,7 +250,7 @@ public List<Object> rows() {

}

return reader.afterMessageRead(QueryBatchMessage.class);
return true;
}

/** {@inheritDoc} */
9 changes: 3 additions & 6 deletions ...n/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ public UUID queryId() {

switch (writer.state()) {
case 0:
if (!writer.writeUuid("queryId", qryId))
if (!writer.writeUuid(qryId))
return false;

writer.incrementState();
@@ -72,12 +72,9 @@ public UUID queryId() {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

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

switch (reader.state()) {
case 0:
qryId = reader.readUuid("queryId");
qryId = reader.readUuid();

if (!reader.isLastRead())
return false;
@@ -86,7 +83,7 @@ public UUID queryId() {

}

return reader.afterMessageRead(QueryCloseMessage.class);
return true;
}

/** {@inheritDoc} */
Loading
Oops, something went wrong.