ascherbakoff commented on code in PR #5383:
URL: https://github.com/apache/ignite-3/pull/5383#discussion_r2022355162
##########
modules/client/src/main/java/org/apache/ignite/internal/client/tx/ClientTransaction.java:
##########
@@ -98,15 +208,37 @@ public void commit() throws TransactionException {
/** {@inheritDoc} */
@Override
public CompletableFuture<Void> commitAsync() {
- if (!finishFut.compareAndSet(null, new CompletableFuture<>())) {
- return finishFut.get();
+ enlistPartitionLock.writeLock().lock();
+
+ try {
+ if (!finishFut.compareAndSet(null, new CompletableFuture<>())) {
+ return finishFut.get();
+ }
+ } finally {
+ enlistPartitionLock.writeLock().unlock();
}
- setState(STATE_COMMITTED);
+ CompletableFuture<Void> mainFinishFut =
ch.serviceAsync(ClientOp.TX_COMMIT, w -> {
+ w.out().packLong(id);
+ if (!isReadOnly) {
Review Comment:
I believed this is not supported scenario. But it seems I was wrong. Weird
decision imo.
Added forward compatibility code.
##########
modules/client/src/main/java/org/apache/ignite/internal/client/tx/ClientTransactions.java:
##########
@@ -73,19 +78,35 @@ static CompletableFuture<ClientTransaction> beginAsync(
w -> {
w.out().packBoolean(readOnly);
w.out().packLong(timeout);
- w.out().packLong(observableTimestamp);
+ w.out().packLong(observableTimestamp.get().longValue());
+ if (!readOnly) {
+ w.out().packInt(pm == null ? -1 : pm.tableId());
+ w.out().packInt(pm == null ? -1 : pm.partition());
+ }
},
- r -> readTx(r, readOnly),
- preferredNodeName,
+ r -> readTx(r, readOnly, pm, observableTimestamp, timeout),
+ pm == null ? null : pm.nodeConsistentId(),
+ null,
null,
false);
}
- private static ClientTransaction readTx(PayloadInputChannel r, boolean
isReadOnly) {
+ private static ClientTransaction readTx(
+ PayloadInputChannel r,
+ boolean isReadOnly,
+ @Nullable PartitionMapping pm,
+ HybridTimestampTracker tracker,
+ long timeout
+ ) {
ClientMessageUnpacker in = r.in();
long id = in.unpackLong();
-
- return new ClientTransaction(r.clientChannel(), id, isReadOnly);
+ if (isReadOnly) { // TODO we can split to client read/write txns.
Review Comment:
🆗
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
