Skip to content
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.

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

Use same transaction manager in one transaction #34181

Merged
merged 7 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,18 @@ public final class TransactionConnectionContext implements AutoCloseable {
@Setter
private volatile String readWriteSplitReplicaRoute;

private volatile TransactionManager transactionManager;

/**
* Begin transaction.
*
* @param transactionType transaction type
* @param transactionType transaction type
* @param transactionManager transaction manager
*/
public void beginTransaction(final String transactionType) {
public void beginTransaction(final String transactionType, final TransactionManager transactionManager) {
this.transactionType = transactionType;
inTransaction = true;
this.transactionManager = transactionManager;
}

/**
Expand Down Expand Up @@ -78,12 +82,22 @@ public Optional<String> getReadWriteSplitReplicaRoute() {
return Optional.ofNullable(readWriteSplitReplicaRoute);
}

/**
* Get transaction manager.
*
* @return transaction manager
*/
public Optional<TransactionManager> getTransactionManager() {
return Optional.ofNullable(transactionManager);
}

@Override
public void close() {
transactionType = null;
inTransaction = false;
beginMills = 0L;
exceptionOccur = false;
readWriteSplitReplicaRoute = null;
transactionManager = null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.shardingsphere.infra.session.connection.transaction;

/**
* Transaction manager.
*/
public interface TransactionManager {
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;

class TransactionConnectionContextTest {

private final TransactionConnectionContext transactionConnectionContext = new TransactionConnectionContext();

@Test
void assertBeginTransaction() {
transactionConnectionContext.beginTransaction("XA");
transactionConnectionContext.beginTransaction("XA", mock(TransactionManager.class));
assertThat(transactionConnectionContext.getTransactionType(), is(Optional.of("XA")));
assertTrue(transactionConnectionContext.isInTransaction());
}
Expand All @@ -44,19 +45,19 @@ void assertIsNotInDistributedTransactionWhenNotBegin() {

@Test
void assertIsNotInDistributedTransactionWithLocal() {
transactionConnectionContext.beginTransaction("LOCAL");
transactionConnectionContext.beginTransaction("LOCAL", mock(TransactionManager.class));
assertFalse(transactionConnectionContext.isInDistributedTransaction());
}

@Test
void assertIsInDistributedTransactionWithXA() {
transactionConnectionContext.beginTransaction("XA");
transactionConnectionContext.beginTransaction("XA", mock(TransactionManager.class));
assertTrue(transactionConnectionContext.isInDistributedTransaction());
}

@Test
void assertIsInDistributedTransactionWithBASE() {
transactionConnectionContext.beginTransaction("BASE");
transactionConnectionContext.beginTransaction("BASE", mock(TransactionManager.class));
assertTrue(transactionConnectionContext.isInDistributedTransaction());
}

Expand All @@ -68,7 +69,7 @@ void assertGetReadWriteSplitReplicaRoute() {

@Test
void assertClose() {
transactionConnectionContext.beginTransaction("XA");
transactionConnectionContext.beginTransaction("XA", mock(TransactionManager.class));
transactionConnectionContext.close();
assertFalse(transactionConnectionContext.getTransactionType().isPresent());
assertFalse(transactionConnectionContext.isInTransaction());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void begin() throws SQLException {
close();
connectionTransaction.begin();
}
connectionContext.getTransactionContext().beginTransaction(String.valueOf(connectionTransaction.getTransactionType()));
connectionContext.getTransactionContext().beginTransaction(String.valueOf(connectionTransaction.getTransactionType()), connectionTransaction.getDistributedTransactionManager());
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ private void processLocalTransaction() throws SQLException {
return;
}
if (!autoCommit && !transactionContext.isInTransaction()) {
transactionContext.beginTransaction(String.valueOf(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType()));
transactionContext.beginTransaction(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getDefaultType().name(),
databaseConnectionManager.getConnectionTransaction().getDistributedTransactionManager());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.shardingsphere.transaction.spi;

import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.session.connection.transaction.TransactionManager;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import org.apache.shardingsphere.transaction.api.TransactionType;

Expand All @@ -29,7 +30,7 @@
/**
* ShardingSphere distributed transaction manager.
*/
public interface ShardingSphereDistributedTransactionManager extends TypedSPI, AutoCloseable {
public interface ShardingSphereDistributedTransactionManager extends TypedSPI, AutoCloseable, TransactionManager {

/**
* Initialize distributed transaction manager.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,19 @@ public final class ConnectionTransaction {
@Getter
private final TransactionType transactionType;

@Getter
private final ShardingSphereDistributedTransactionManager distributedTransactionManager;

private final TransactionConnectionContext transactionContext;

public ConnectionTransaction(final TransactionRule rule, final TransactionConnectionContext transactionContext) {
transactionType = transactionContext.getTransactionType().isPresent() ? TransactionType.valueOf(transactionContext.getTransactionType().get()) : rule.getDefaultType();
this.transactionContext = transactionContext;
distributedTransactionManager = TransactionType.LOCAL == transactionType ? null : rule.getResource().getTransactionManager(rule.getDefaultType());
if (transactionContext.getTransactionManager().isPresent()) {
distributedTransactionManager = (ShardingSphereDistributedTransactionManager) transactionContext.getTransactionManager().get();
} else {
distributedTransactionManager = TransactionType.LOCAL == this.transactionType ? null : rule.getResource().getTransactionManager(rule.getDefaultType());
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,23 @@ void assertIsNotInDistributedTransactionWhenTransactionIsNotBegin() {
@Test
void assertIsNotInDistributedTransactionWhenIsNotDistributedTransaction() {
TransactionConnectionContext context = new TransactionConnectionContext();
context.beginTransaction("LOCAL");
context.beginTransaction("LOCAL", mock(ShardingSphereDistributedTransactionManager.class));
assertFalse(new ConnectionTransaction(mock(TransactionRule.class), context).isInDistributedTransaction(context));
}

@Test
void assertIsNotInDistributedTransactionWhenDistributedTransactionIsNotBegin() {
TransactionConnectionContext context = new TransactionConnectionContext();
context.beginTransaction("XA");
context.beginTransaction("XA", mock(ShardingSphereDistributedTransactionManager.class));
assertFalse(new ConnectionTransaction(mock(TransactionRule.class, RETURNS_DEEP_STUBS), context).isInDistributedTransaction(context));
}

@Test
void assertIsInDistributedTransaction() {
TransactionConnectionContext context = new TransactionConnectionContext();
context.beginTransaction("XA");
ShardingSphereDistributedTransactionManager distributedTransactionManager = mock(ShardingSphereDistributedTransactionManager.class);
when(distributedTransactionManager.isInTransaction()).thenReturn(true);
context.beginTransaction("XA", distributedTransactionManager);
TransactionRule rule = mock(TransactionRule.class, RETURNS_DEEP_STUBS);
when(rule.getResource().getTransactionManager(rule.getDefaultType()).isInTransaction()).thenReturn(true);
assertTrue(new ConnectionTransaction(rule, context).isInDistributedTransaction(context));
Expand Down Expand Up @@ -95,7 +97,9 @@ void assertIsHoldTransactionWithXAAndAutoCommit() {
when(rule.getDefaultType()).thenReturn(TransactionType.XA);
when(rule.getResource().getTransactionManager(TransactionType.XA).isInTransaction()).thenReturn(true);
TransactionConnectionContext context = new TransactionConnectionContext();
context.beginTransaction("XA");
ShardingSphereDistributedTransactionManager distributedTransactionManager = mock(ShardingSphereDistributedTransactionManager.class);
when(distributedTransactionManager.isInTransaction()).thenReturn(true);
context.beginTransaction("XA", distributedTransactionManager);
assertTrue(new ConnectionTransaction(rule, context).isHoldTransaction(true));
}

Expand Down Expand Up @@ -144,7 +148,10 @@ void assertGetConnectionWithoutInDistributeTransaction() throws SQLException {
@Test
void assertGetConnectionWithInDistributeTransaction() throws SQLException {
TransactionConnectionContext context = new TransactionConnectionContext();
context.beginTransaction("XA");
ShardingSphereDistributedTransactionManager distributedTransactionManager = mock(ShardingSphereDistributedTransactionManager.class);
when(distributedTransactionManager.isInTransaction()).thenReturn(true);
when(distributedTransactionManager.getConnection("foo_db", "foo_ds")).thenReturn(mock(Connection.class));
context.beginTransaction("XA", distributedTransactionManager);
TransactionRule rule = mock(TransactionRule.class, RETURNS_DEEP_STUBS);
when(rule.getResource().getTransactionManager(rule.getDefaultType()).isInTransaction()).thenReturn(true);
when(rule.getResource().getTransactionManager(rule.getDefaultType()).getConnection("foo_db", "foo_ds")).thenReturn(mock(Connection.class));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public BackendTransactionManager(final ProxyDatabaseConnectionManager databaseCo
public void begin() {
if (!connection.getConnectionSession().getTransactionStatus().isInTransaction()) {
connection.getConnectionSession().getTransactionStatus().setInTransaction(true);
getTransactionContext().beginTransaction(String.valueOf(transactionType));
getTransactionContext().beginTransaction(transactionType.name(), distributedTransactionManager);
connection.closeHandlers(true);
connection.closeConnections(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.TransactionUtils;
import org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.xa.XABeginStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.xa.XACommitStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.xa.XARecoveryStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.xa.XARollbackStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.xa.XAStatement;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.apache.shardingsphere.transaction.xa.jta.exception.XATransactionNestedBeginException;

import java.sql.SQLException;
Expand Down Expand Up @@ -88,8 +88,9 @@ public ResponseHeader execute() throws SQLException {
private ResponseHeader begin() throws SQLException {
ShardingSpherePreconditions.checkState(!connectionSession.getTransactionStatus().isInTransaction(), XATransactionNestedBeginException::new);
ResponseHeader result = backendHandler.execute();
TransactionType transactionType = TransactionUtils.getTransactionType(connectionSession.getConnectionContext().getTransactionContext());
connectionSession.getConnectionContext().getTransactionContext().beginTransaction(String.valueOf(transactionType));
TransactionRule transactionRule = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
ShardingSphereTransactionManagerEngine engine = transactionRule.getResource();
connectionSession.getConnectionContext().getTransactionContext().beginTransaction(transactionRule.getDefaultType().name(), engine.getTransactionManager(transactionRule.getDefaultType()));
return result;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.TCLStatement;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -58,7 +59,9 @@ void assertExecute() throws SQLException {

private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(mock(TransactionRule.class))));
TransactionRule transactionRule = mock(TransactionRule.class);
when(transactionRule.getDefaultType()).thenReturn(TransactionType.LOCAL);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(transactionRule)));
return result;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -82,7 +83,9 @@ void assertSwitchSchemaWhileBegin() {

private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(mock(TransactionRule.class))));
TransactionRule transactionRule = mock(TransactionRule.class);
when(transactionRule.getDefaultType()).thenReturn(TransactionType.LOCAL);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(transactionRule)));
return result;
}

Expand Down
Loading