You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2025/06/27 09:06:25 UTC
(ignite-3) 02/02: IGNITE-25732 wip
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch ignite-25732
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit c92ea28212189202442b2065f87abadcdde51beb
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Fri Jun 27 12:06:06 2025 +0300
IGNITE-25732 wip
---
.../replicator/raft/handlers/FinishTxCommandHandler.java | 8 ++++++--
.../apache/ignite/internal/tx/impl/EnlistedPartitionGroup.java | 2 --
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/handlers/FinishTxCommandHandler.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/handlers/FinishTxCommandHandler.java
index 69b808de47d..16815bc07c9 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/handlers/FinishTxCommandHandler.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/handlers/FinishTxCommandHandler.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.partition.replicator.raft.handlers;
+import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static org.apache.ignite.internal.tx.TxState.ABORTED;
import static org.apache.ignite.internal.tx.TxState.COMMITTED;
@@ -35,6 +36,7 @@ import org.apache.ignite.internal.partition.replicator.raft.CommandResult;
import org.apache.ignite.internal.partition.replicator.raft.RaftTxFinishMarker;
import org.apache.ignite.internal.partition.replicator.raft.UnexpectedTransactionStateException;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
+import org.apache.ignite.internal.replicator.message.TablePartitionIdMessage;
import org.apache.ignite.internal.tx.TransactionResult;
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.tx.TxMeta;
@@ -163,7 +165,9 @@ public class FinishTxCommandHandler extends AbstractCommandHandler<FinishTxComma
}
private static List<EnlistedPartitionGroup> enlistedPartitions(FinishTxCommandV1 command) {
- // TODO: IGNITE-25732 доедалть
- return List.of();
+ return command.partitionIds().stream()
+ .map(TablePartitionIdMessage::asTablePartitionId)
+ .map(EnlistedPartitionGroup::new)
+ .collect(toList());
}
}
diff --git a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/EnlistedPartitionGroup.java b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/EnlistedPartitionGroup.java
index 84bb9cff7b6..f0ebbb5c94b 100644
--- a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/EnlistedPartitionGroup.java
+++ b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/EnlistedPartitionGroup.java
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
-import org.jetbrains.annotations.TestOnly;
/**
* Partition enlistment information together with partition group ID.
@@ -41,7 +40,6 @@ public class EnlistedPartitionGroup {
}
/** Constructor. */
- @TestOnly
public EnlistedPartitionGroup(TablePartitionId groupId) {
this(groupId, Set.of(groupId.tableId()));
}