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

optimize: report the tcc fence transaction isolation level #6768

Merged
merged 3 commits into from
Aug 22, 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
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6755](https://github.com/apache/incubator-seata/pull/6755)] optimize namingserver code logic
- [[#6763](https://github.com/apache/incubator-seata/pull/6763)] optimize NacosConfiguration singleton reload
- [[#6761](https://github.com/apache/incubator-seata/pull/6761)] optimize the namingserver code to improve readability
- [[#6768](https://github.com/apache/incubator-seata/pull/6768)] report the tcc fence transaction isolation level


### refactor:
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
- [[#6755](https://github.com/apache/incubator-seata/pull/6755)] 优化namingserver代码逻辑
- [[#6763](https://github.com/apache/incubator-seata/pull/6763)] 优化 NacosConfiguration 单例加载
- [[#6761](https://github.com/apache/incubator-seata/pull/6761)] 提升namingserver manager代码可读性
- [[#6768](https://github.com/apache/incubator-seata/pull/6768)] 上报tcc fence事务隔离级别


### refactor:
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/java/org/apache/seata/common/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ public interface Constants {
*/
String TX_ACTION_CONTEXT = "actionContext";

/**
* isolation
*/
String TX_ISOLATION = "isolation";

/**
* default charset name
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
import org.apache.seata.integration.tx.api.interceptor.TwoPhaseBusinessActionParam;
import org.apache.seata.integration.tx.api.interceptor.handler.AbstractProxyInvocationHandler;
import org.apache.seata.rm.tcc.api.TwoPhaseBusinessAction;
import org.apache.seata.rm.tcc.utils.MethodUtils;
import org.slf4j.MDC;
import org.springframework.transaction.annotation.Transactional;


import static org.apache.seata.common.ConfigurationKeys.TCC_ACTION_INTERCEPTOR_ORDER;
Expand Down Expand Up @@ -82,6 +84,7 @@ protected Object doInvoke(InvocationWrapper invocation) throws Throwable {
}
try {
TwoPhaseBusinessActionParam businessActionParam = createTwoPhaseBusinessActionParam(businessAction);
initTransactionalAnnotationContext(method, targetBean, businessActionParam.getBusinessActionContext());
//Handler the TCC Aspect, and return the business result
return actionInterceptorHandler.proceed(method, invocation.getArguments(), xid, businessActionParam,
invocation::proceed);
Expand All @@ -99,6 +102,19 @@ protected Object doInvoke(InvocationWrapper invocation) throws Throwable {
return invocation.proceed();
}

/**
* Initializes the transaction annotation context
* @param method the method
* @param targetBean the target bean
* @param businessActionContext the business action context
*/
private void initTransactionalAnnotationContext(Method method, Object targetBean, Map<String, Object> businessActionContext) {
Transactional transactionalAnnotation = MethodUtils.getTransactionalAnnotationByMethod(method, targetBean);
if (transactionalAnnotation != null) {
businessActionContext.put(Constants.TX_ISOLATION, transactionalAnnotation.isolation().value());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我想知道哪里使用到了它?
I would like to know where it was used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我想知道哪里使用到了它? I would like to know where it was used.
在pr6769里面用到了,上次你说分成两个pr提交比较方便review

}
}

private Annotation parseAnnotation(Method methodKey) throws NoSuchMethodException {
Annotation result = parseAnnotationCache.computeIfAbsent(methodKey, method -> {
Annotation twoPhaseBusinessAction = method.getAnnotation(getAnnotationClass());
Expand Down
47 changes: 47 additions & 0 deletions tcc/src/main/java/org/apache/seata/rm/tcc/utils/MethodUtils.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* 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.seata.rm.tcc.utils;

import java.lang.reflect.Method;

import org.apache.seata.common.exception.ShouldNeverHappenException;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.transaction.annotation.Transactional;



public class MethodUtils {
/**
* Retrieve the Transactional annotation of a business method
* @param interfaceMethod interface method object
* @param targetTCCBean target tcc bean
* @return the @Transactional annotation
*/
public static Transactional getTransactionalAnnotationByMethod(Method interfaceMethod, Object targetTCCBean) {
String methodName = interfaceMethod.getName();
Class<?>[] parameterTypes = interfaceMethod.getParameterTypes();

Class<?> clazz = targetTCCBean.getClass();
Method implementationMethod;
try {
implementationMethod = clazz.getMethod(methodName, parameterTypes);
} catch (NoSuchMethodException e) {
throw new ShouldNeverHappenException(e);
}
return AnnotatedElementUtils.findMergedAnnotation(implementationMethod, Transactional.class);
}
}
Loading