This is an automated email from the ASF dual-hosted git repository.
vpyatkov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 1a540e0921 IGNITE-19457 Review nullability of network messages' fields
(#2153)
1a540e0921 is described below
commit 1a540e0921cfd91e3fe59df4cc72a51950b7ad4e
Author: Vladislav Pyatkov <[email protected]>
AuthorDate: Wed Jun 7 18:11:08 2023 +0400
IGNITE-19457 Review nullability of network messages' fields (#2153)
---
.../message/LeaseGrantedMessageResponse.java | 2 +-
.../message/PlacementDriverActorMessage.java | 2 +-
...DriverMessage.java => PlacementDriverGroupMessage.java} | 8 ++------
.../placementdriver/message/PlacementDriverMessage.java | 12 ------------
.../message/PlacementDriverReplicaMessage.java | 2 +-
.../placementdriver/MultiActorPlacementDriverTest.java | 1 -
.../placementdriver/PlacementDriverManagerTest.java | 1 -
.../ignite/internal/replicator/message/ReplicaRequest.java | 3 ---
.../replicator/PlacementDriverReplicaSideTest.java | 8 +-------
.../apache/ignite/distributed/ReplicaUnavailableTest.java | 5 +++++
.../raft/snapshot/message/SnapshotRequestMessage.java | 3 ---
.../request/ReadWriteMultiRowReplicaRequest.java | 3 ---
.../replication/request/ReadWriteReplicaRequest.java | 2 --
.../request/ReadWriteSingleRowReplicaRequest.java | 3 ---
.../table/distributed/storage/InternalTableImpl.java | 4 +++-
.../outgoing/OutgoingSnapshotMvDataStreamingTest.java | 1 +
.../outgoing/OutgoingSnapshotTxDataStreamingTest.java | 1 +
.../replication/PartitionReplicaListenerTest.java | 14 ++++++++++++++
.../ignite/internal/tx/message/TxFinishResponse.java | 4 +---
19 files changed, 31 insertions(+), 48 deletions(-)
diff --git
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/LeaseGrantedMessageResponse.java
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/LeaseGrantedMessageResponse.java
index efd972828e..096e3b970c 100644
---
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/LeaseGrantedMessageResponse.java
+++
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/LeaseGrantedMessageResponse.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
* Response for lease granted message.
*/
@Transferable(PlacementDriverMessageGroup.LEASE_GRANTED_MESSAGE_RESPONSE)
-public interface LeaseGrantedMessageResponse extends
PlacementDriverReplicaMessage {
+public interface LeaseGrantedMessageResponse extends PlacementDriverMessage {
boolean accepted();
@Nullable
diff --git
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverActorMessage.java
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverActorMessage.java
index cda041a283..50d0823328 100644
---
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverActorMessage.java
+++
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverActorMessage.java
@@ -20,5 +20,5 @@ package org.apache.ignite.internal.placementdriver.message;
/**
* This is a marker interface. It marks a massage type that is sent from a
replica to placement driver actor.
*/
-public interface PlacementDriverActorMessage extends PlacementDriverMessage {
+public interface PlacementDriverActorMessage extends
PlacementDriverGroupMessage {
}
diff --git
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverGroupMessage.java
similarity index 80%
copy from
modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
copy to
modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverGroupMessage.java
index a88bf5c5b0..c778044c2a 100644
---
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
+++
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverGroupMessage.java
@@ -18,21 +18,17 @@
package org.apache.ignite.internal.placementdriver.message;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
-import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.annotations.Marshallable;
-import org.jetbrains.annotations.Nullable;
/**
- * A base message for placement driver network messages.
+ * A base message for placement driver request to a replication group.
*/
-public interface PlacementDriverMessage extends NetworkMessage {
+public interface PlacementDriverGroupMessage extends PlacementDriverMessage {
/**
* Gets a replication group id.
*
* @return Replication group id.
*/
- // TODO: IGNITE-19457 Maybe not nullable.
- @Nullable
@Marshallable
ReplicationGroupId groupId();
}
diff --git
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
index a88bf5c5b0..d83bdd1ef9 100644
---
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
+++
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverMessage.java
@@ -17,22 +17,10 @@
package org.apache.ignite.internal.placementdriver.message;
-import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.annotations.Marshallable;
-import org.jetbrains.annotations.Nullable;
/**
* A base message for placement driver network messages.
*/
public interface PlacementDriverMessage extends NetworkMessage {
- /**
- * Gets a replication group id.
- *
- * @return Replication group id.
- */
- // TODO: IGNITE-19457 Maybe not nullable.
- @Nullable
- @Marshallable
- ReplicationGroupId groupId();
}
diff --git
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverReplicaMessage.java
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverReplicaMessage.java
index 95a9df3600..d01cebc22a 100644
---
a/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverReplicaMessage.java
+++
b/modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/message/PlacementDriverReplicaMessage.java
@@ -20,5 +20,5 @@ package org.apache.ignite.internal.placementdriver.message;
/**
* This is a marker interface. It marks a massage type that is sent from
placement driver actor to a replica.
*/
-public interface PlacementDriverReplicaMessage extends PlacementDriverMessage {
+public interface PlacementDriverReplicaMessage extends
PlacementDriverGroupMessage {
}
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
index 4e55a93e7e..006cfcd436 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
@@ -191,7 +191,6 @@ public class MultiActorPlacementDriverTest extends
IgniteAbstractTest {
if (resp == null) {
resp =
PLACEMENT_DRIVER_MESSAGES_FACTORY.leaseGrantedMessageResponse()
- .groupId(((LeaseGrantedMessage) msg).groupId())
.accepted(true)
.build();
}
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
index f99488df96..6cceabe662 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
@@ -245,7 +245,6 @@ public class PlacementDriverManagerTest extends
IgniteAbstractTest {
if (resp == null) {
resp =
PLACEMENT_DRIVER_MESSAGES_FACTORY.leaseGrantedMessageResponse()
- .groupId(((LeaseGrantedMessage) msg).groupId())
.accepted(true)
.build();
}
diff --git
a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/ReplicaRequest.java
b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/ReplicaRequest.java
index 77a319e883..bcc6932e5f 100644
---
a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/ReplicaRequest.java
+++
b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/ReplicaRequest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.replicator.message;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.annotations.Marshallable;
-import org.jetbrains.annotations.Nullable;
/**
* Replica request.
@@ -31,8 +30,6 @@ public interface ReplicaRequest extends NetworkMessage {
*
* @return Replication group id.
*/
- // TODO: IGNITE-19457 Maybe not nullable.
- @Nullable
@Marshallable
ReplicationGroupId groupId();
}
diff --git
a/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java
b/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java
index cca2e06ba2..5fcc8602ff 100644
---
a/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java
+++
b/modules/replicator/src/test/java/org/apache/ignite/internal/replicator/PlacementDriverReplicaSideTest.java
@@ -144,6 +144,7 @@ public class PlacementDriverReplicaSideTest {
boolean force
) {
PlacementDriverReplicaMessage msg = MSG_FACTORY.leaseGrantedMessage()
+ .groupId(GRP_ID)
.leaseStartTime(leaseStartTime)
.leaseExpirationTime(leaseExpirationTime)
.force(force)
@@ -320,13 +321,6 @@ public class PlacementDriverReplicaSideTest {
assertNull(resp1.redirectProposal());
}
- @Test
- public void testIncorrectMessageToReplica() {
- CompletableFuture<?> future =
replica.processPlacementDriverMessage(MSG_FACTORY.leaseGrantedMessageResponse().build());
- assertTrue(future.isDone());
- assertTrue(future.isCompletedExceptionally());
- }
-
@Test
public void testLongReadIndexWait() {
countOfTimeoutExceptionsOnReadIndexToThrow = 100;
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java
index fe4b881974..6c85625e8e 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java
@@ -55,6 +55,7 @@ import
org.apache.ignite.internal.table.distributed.replication.request.ReadWrit
import
org.apache.ignite.internal.table.distributed.replicator.action.RequestType;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.apache.ignite.internal.tx.message.TxMessageGroup;
+import org.apache.ignite.internal.tx.test.TestTransactionIds;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.lang.NodeStoppingException;
import org.apache.ignite.network.ClusterNode;
@@ -135,6 +136,8 @@ public class ReplicaUnavailableTest extends
IgniteAbstractTest {
ReadWriteSingleRowReplicaRequest request =
tableMessagesFactory.readWriteSingleRowReplicaRequest()
.groupId(tablePartitionId)
+ .transactionId(TestTransactionIds.newTransactionId())
+ .commitPartitionId(tablePartitionId)
.timestampLong(clock.nowLong())
.binaryRow(createKeyValueRow(1L, 1L))
.requestType(RequestType.RW_GET)
@@ -175,6 +178,8 @@ public class ReplicaUnavailableTest extends
IgniteAbstractTest {
ReadWriteSingleRowReplicaRequest request =
tableMessagesFactory.readWriteSingleRowReplicaRequest()
.groupId(tablePartitionId)
+ .transactionId(TestTransactionIds.newTransactionId())
+ .commitPartitionId(tablePartitionId)
.timestampLong(clock.nowLong())
.binaryRow(createKeyValueRow(1L, 1L))
.requestType(RequestType.RW_GET)
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/message/SnapshotRequestMessage.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/message/SnapshotRequestMessage.java
index 92462b6f16..39bb46137e 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/message/SnapshotRequestMessage.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/message/SnapshotRequestMessage.java
@@ -19,14 +19,11 @@ package
org.apache.ignite.internal.table.distributed.raft.snapshot.message;
import java.util.UUID;
import org.apache.ignite.network.NetworkMessage;
-import org.jetbrains.annotations.Nullable;
/**
* Base interface for snapshot request messages.
*/
public interface SnapshotRequestMessage extends NetworkMessage {
/** Snapshot id. */
- // TODO: IGNITE-19457 Maybe not nullable.
- @Nullable
UUID id();
}
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteMultiRowReplicaRequest.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteMultiRowReplicaRequest.java
index 1739ded91c..f2330dbdc3 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteMultiRowReplicaRequest.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteMultiRowReplicaRequest.java
@@ -21,7 +21,6 @@ import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.table.distributed.TableMessageGroup;
import org.apache.ignite.network.annotations.Marshallable;
import org.apache.ignite.network.annotations.Transferable;
-import org.jetbrains.annotations.Nullable;
/**
* Read-write multi-row replica request.
@@ -33,8 +32,6 @@ public interface ReadWriteMultiRowReplicaRequest extends
MultipleRowReplicaReque
*
* @return Table partition id.
*/
- // TODO: IGNITE-19457 Maybe not nullable.
- @Nullable
@Marshallable
TablePartitionId commitPartitionId();
}
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteReplicaRequest.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteReplicaRequest.java
index cec5215c47..abc0e3250a 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteReplicaRequest.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteReplicaRequest.java
@@ -26,7 +26,6 @@ import org.jetbrains.annotations.Nullable;
* Read-write replica request.
*/
public interface ReadWriteReplicaRequest extends PrimaryReplicaRequest,
TimestampAware {
- @Nullable
UUID transactionId();
/**
@@ -35,7 +34,6 @@ public interface ReadWriteReplicaRequest extends
PrimaryReplicaRequest, Timestam
*
* @return Raft term.
*/
- // TODO: IGNITE-19457 Maybe not nullable.
@Deprecated
@Nullable
Long term();
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteSingleRowReplicaRequest.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteSingleRowReplicaRequest.java
index 81527dd3f7..bd8b1344fd 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteSingleRowReplicaRequest.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadWriteSingleRowReplicaRequest.java
@@ -21,7 +21,6 @@ import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.table.distributed.TableMessageGroup;
import org.apache.ignite.network.annotations.Marshallable;
import org.apache.ignite.network.annotations.Transferable;
-import org.jetbrains.annotations.Nullable;
/**
* Read-write single-row replica request.
@@ -33,8 +32,6 @@ public interface ReadWriteSingleRowReplicaRequest extends
SingleRowReplicaReques
*
* @return Table partition id.
*/
- // TODO: IGNITE-19457 Maybe not nullable.
- @Nullable
@Marshallable
TablePartitionId commitPartitionId();
}
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
index 444799efd9..2c1720379c 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
@@ -514,6 +514,7 @@ public class InternalTableImpl implements InternalTable {
(commitPart, txo, groupId, term) ->
tableMessagesFactory.readWriteSingleRowReplicaRequest()
.groupId(groupId)
.binaryRow(keyRow)
+ .commitPartitionId(commitPart)
.transactionId(txo.id())
.term(term)
.requestType(RequestType.RW_GET)
@@ -548,7 +549,7 @@ public class InternalTableImpl implements InternalTable {
BinaryRowEx firstRow = keyRows.iterator().next();
if (firstRow == null) {
- return
CompletableFuture.completedFuture(Collections.emptyList());
+ return completedFuture(Collections.emptyList());
} else {
return evaluateReadOnlyRecipientNode(partitionId(firstRow))
.thenCompose(recipientNode -> getAll(keyRows,
tx.readTimestamp(), recipientNode));
@@ -560,6 +561,7 @@ public class InternalTableImpl implements InternalTable {
(commitPart, keyRows0, txo, groupId, term) ->
tableMessagesFactory.readWriteMultiRowReplicaRequest()
.groupId(groupId)
.binaryRows(keyRows0)
+ .commitPartitionId(commitPart)
.transactionId(txo.id())
.term(term)
.requestType(RequestType.RW_GET_ALL)
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
index 3fd8cbcef8..05f5199784 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotMvDataStreamingTest.java
@@ -139,6 +139,7 @@ class OutgoingSnapshotMvDataStreamingTest {
@Nullable
private SnapshotMvDataResponse getNullableMvDataResponse(long
batchSizeHint) {
SnapshotMvDataRequest request = messagesFactory.snapshotMvDataRequest()
+ .id(snapshot.id())
.batchSizeHint(batchSizeHint)
.build();
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
index 5b5871076b..744f358491 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/outgoing/OutgoingSnapshotTxDataStreamingTest.java
@@ -122,6 +122,7 @@ class OutgoingSnapshotTxDataStreamingTest {
@Nullable
private SnapshotTxDataResponse getNullableTxDataResponse(int
maxTxsInBatch) {
SnapshotTxDataRequest request = messagesFactory.snapshotTxDataRequest()
+ .id(snapshot.id())
.maxTransactionsInBatch(maxTxsInBatch)
.build();
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
index bd91a24042..bc0e545ee8 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
@@ -987,6 +987,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private CompletableFuture<?> doSingleRowRequest(UUID txId, BinaryRow
binaryRow, RequestType requestType) {
return
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteSingleRowReplicaRequest()
+ .groupId(grpId)
.transactionId(txId)
.requestType(requestType)
.binaryRow(binaryRow)
@@ -1002,6 +1003,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private CompletableFuture<?> doMultiRowRequest(UUID txId,
Collection<BinaryRow> binaryRows, RequestType requestType) {
return
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteMultiRowReplicaRequest()
+ .groupId(grpId)
.transactionId(txId)
.requestType(requestType)
.binaryRows(binaryRows)
@@ -1022,6 +1024,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
BinaryRow binaryRow = binaryRow(counter.getAndIncrement());
return
TABLE_MESSAGES_FACTORY.readWriteSingleRowReplicaRequest()
+ .groupId(grpId)
.transactionId(txId)
.requestType(RequestType.RW_INSERT)
.binaryRow(binaryRow)
@@ -1048,6 +1051,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
BinaryRow binaryRow1 = binaryRow(cntr * 2 + 1);
return
TABLE_MESSAGES_FACTORY.readWriteMultiRowReplicaRequest()
+ .groupId(grpId)
.transactionId(txId)
.requestType(RequestType.RW_UPSERT_ALL)
.binaryRows(asList(binaryRow0, binaryRow1))
@@ -1120,6 +1124,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
txStateStorage.put(txId, new TxMeta(TxState.COMMITED, new
ArrayList<>(), now));
CompletableFuture<?> replicaCleanupFut =
partitionReplicaListener.invoke(TX_MESSAGES_FACTORY.txCleanupReplicaRequest()
+ .groupId(grpId)
.txId(txId)
.commit(true)
.commitTimestampLong(now.longValue())
@@ -1462,6 +1467,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
public void failsWhenReplacingOnTupleWithIncompatibleSchemaFromFuture() {
testFailsWhenReadingFromFutureIncompatibleSchema(
(targetTxId, key) ->
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteSwapRowReplicaRequest()
+ .groupId(grpId)
.transactionId(targetTxId)
.requestType(RequestType.RW_REPLACE)
.oldBinaryRow(binaryRow(key, new TestValue(1, "v1"),
kvMarshaller))
@@ -1477,6 +1483,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
public void
failsWhenScanByExactMatchReadsTupleWithIncompatibleSchemaFromFuture() {
testFailsWhenReadingFromFutureIncompatibleSchema(
(targetTxId, key) ->
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteScanRetrieveBatchReplicaRequest()
+ .groupId(grpId)
.transactionId(targetTxId)
.indexToUse(sortedIndexStorage.id())
.exactKey(toIndexKey(FUTURE_SCHEMA_ROW_INDEXED_VALUE))
@@ -1492,6 +1499,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
public void
failsWhenScanByIndexReadsTupleWithIncompatibleSchemaFromFuture() {
testFailsWhenReadingFromFutureIncompatibleSchema(
(targetTxId, key) ->
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteScanRetrieveBatchReplicaRequest()
+ .groupId(grpId)
.transactionId(targetTxId)
.indexToUse(sortedIndexStorage.id())
.term(1L)
@@ -1506,6 +1514,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
public void failsWhenFullScanReadsTupleWithIncompatibleSchemaFromFuture() {
testFailsWhenReadingFromFutureIncompatibleSchema(
(targetTxId, key) ->
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteScanRetrieveBatchReplicaRequest()
+ .groupId(grpId)
.transactionId(targetTxId)
.term(1L)
.scanId(1)
@@ -1521,6 +1530,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private void upsert(UUID txId, BinaryRow row) {
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteSingleRowReplicaRequest()
+ .groupId(grpId)
.requestType(RequestType.RW_UPSERT)
.transactionId(txId)
.binaryRow(row)
@@ -1532,6 +1542,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private void delete(UUID txId, BinaryRow row) {
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readWriteSingleRowReplicaRequest()
+ .groupId(grpId)
.requestType(RequestType.RW_DELETE)
.transactionId(txId)
.binaryRow(row)
@@ -1543,6 +1554,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private BinaryRow roGet(BinaryRow row, HybridTimestamp readTimestamp) {
CompletableFuture<?> future =
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readOnlySingleRowReplicaRequest()
+ .groupId(grpId)
.requestType(RequestType.RO_GET)
.readTimestamp(readTimestamp)
.binaryRow(row)
@@ -1554,6 +1566,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private List<BinaryRow> roGetAll(Collection<BinaryRow> rows,
HybridTimestamp readTimestamp) {
CompletableFuture<?> future =
partitionReplicaListener.invoke(TABLE_MESSAGES_FACTORY.readOnlyMultiRowReplicaRequest()
+ .groupId(grpId)
.requestType(RequestType.RO_GET_ALL)
.readTimestamp(readTimestamp)
.binaryRows(rows)
@@ -1565,6 +1578,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
private void cleanup(UUID txId) {
partitionReplicaListener.invoke(TX_MESSAGES_FACTORY.txCleanupReplicaRequest()
+ .groupId(grpId)
.txId(txId)
.commit(true)
.commitTimestampLong(clock.nowLong())
diff --git
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/message/TxFinishResponse.java
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/message/TxFinishResponse.java
index 732e3c4206..05bc59347e 100644
---
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/message/TxFinishResponse.java
+++
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/message/TxFinishResponse.java
@@ -17,9 +17,7 @@
package org.apache.ignite.internal.tx.message;
-import java.io.Serializable;
import org.apache.ignite.internal.replicator.message.TimestampAware;
-import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.annotations.Transferable;
import org.jetbrains.annotations.Nullable;
@@ -27,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
* The result of an action.
*/
@Transferable(value = TxMessageGroup.TX_FINISH_RESPONSE)
-public interface TxFinishResponse extends NetworkMessage, TimestampAware,
Serializable {
+public interface TxFinishResponse extends TimestampAware {
/**
* Returns the error message.
*
