针对7种事务机制的，优化调整

Author: xlorne

tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionInfo.java

@@ -2,7 +2,6 @@
 
 import com.codingapi.tx.annotation.TxTransaction;
 import com.codingapi.tx.model.TransactionInvocation;
-import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -14,24 +13,29 @@ public class TxTransactionInfo {
 
     private TxTransaction transaction;
 
-   // private Transactional transactional;
 
     private TxTransactionLocal txTransactionLocal;
 
+    /**
+     * 事务组Id
+     */
     private String txGroupId;
 
+    /**
+     * 最大超时时间（发起方模块的）
+     */
     private int maxTimeOut;
 
+
     private TransactionInvocation invocation;
 
 
-    public TxTransactionInfo(TxTransaction transaction, TxTransactionLocal txTransactionLocal,TransactionInvocation invocation, String txGroupId, int maxTimeOut) {
+    public TxTransactionInfo(TxTransaction transaction, TxTransactionLocal txTransactionLocal, TransactionInvocation invocation, String txGroupId, int maxTimeOut) {
         this.transaction = transaction;
         this.txTransactionLocal = txTransactionLocal;
         this.txGroupId = txGroupId;
         this.maxTimeOut = maxTimeOut;
         this.invocation = invocation;
-       // this.transactional = transactional;
     }
 
     public int getMaxTimeOut() {
@@ -56,7 +60,4 @@ public TransactionInvocation getInvocation() {
         return invocation;
     }
 
-   // public Transactional getTransactional() {
-//        return transactional;
-//    }
 }

tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionLocal.java

@@ -12,10 +12,21 @@ public class TxTransactionLocal {
 
     private int maxTimeOut;
 
+    /**
+     * 是否同一个模块被多次请求
+     */
     private boolean hasIsGroup = false;
 
+    /**
+     * 是否是发起方模块
+     */
     private boolean hasStart = false;
 
+    /**
+     * 是否单模块下多次业务调用
+     */
+    private boolean hasMoreService = false;
+
     private String kid;
 
     private String type;
@@ -54,6 +65,13 @@ public void setGroupId(String groupId) {
         this.groupId = groupId;
     }
 
+    public boolean isHasMoreService() {
+        return hasMoreService;
+    }
+
+    public void setHasMoreService(boolean hasMoreService) {
+        this.hasMoreService = hasMoreService;
+    }
 
     public TxTransactionLocal() {
 

tx-client/src/main/java/com/codingapi/tx/aop/service/impl/AspectBeforeServiceImpl.java

@@ -9,6 +9,8 @@
 import com.codingapi.tx.model.TransactionInvocation;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +26,9 @@ public class AspectBeforeServiceImpl implements AspectBeforeService {
     private TransactionServerFactoryService transactionServerFactoryService;
 
 
+    private Logger logger = LoggerFactory.getLogger(AspectBeforeServiceImpl.class);
+
+
     public Object around(String groupId,int maxTimeOut, ProceedingJoinPoint point) throws Throwable {
 
         MethodSignature signature = (MethodSignature) point.getSignature();
@@ -36,6 +41,14 @@ public Object around(String groupId,int maxTimeOut, ProceedingJoinPoint point) t
 
         TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
 
+
+        if(txTransactionLocal!=null){
+            //在同一次事务下，调用多个业务模块。
+            txTransactionLocal.setHasMoreService(true);
+        }
+
+        logger.info("around--> groupId-> " +groupId+",txTransactionLocal->"+txTransactionLocal);
+
         TransactionInvocation invocation = new TransactionInvocation(clazz, thisMethod.getName(), thisMethod.toString(), args, method.getParameterTypes());
 
         TxTransactionInfo info = new TxTransactionInfo(transaction,txTransactionLocal,invocation,groupId,maxTimeOut);

tx-client/src/main/java/com/codingapi/tx/datasource/AbstractResourceProxy.java

@@ -70,7 +70,9 @@ public void close(T connection) {
     protected T loadConnection(){
         TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
 
-        if(txTransactionLocal==null){
+        logger.info("loadConnection !");
+
+        if(txTransactionLocal==null||txTransactionLocal.isHasMoreService()){
             return null;
         }
         T old = pools.get(txTransactionLocal.getGroupId());
@@ -117,18 +119,14 @@ private C createConnection(TxTransactionLocal txTransactionLocal, C connection){
 
 
     protected C initLCNConnection(C connection) {
+        logger.info("initLCNConnection");
         C lcnConnection = connection;
         TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
 
-        if (txTransactionLocal != null) {
+        if (txTransactionLocal != null&&!txTransactionLocal.isHasMoreService()) {
 
             logger.info("lcn datasource transaction control ");
 
-            //只读操作，直接返回connection
-//            if(txTransactionLocal.isReadOnly()){
-//                logger.info("readonly transaction ");
-//                return connection;
-//            }
 
             //补偿的情况的
             if (TxCompensateLocal.current() != null) {
@@ -145,6 +143,7 @@ protected C initLCNConnection(C connection) {
 
 
         }
+        logger.info("load default connection !");
         return lcnConnection;
     }
 

tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNDBConnection.java

@@ -28,7 +28,7 @@ public class LCNDBConnection implements Connection,ILCNResource<Connection> {
 
     private Logger logger = LoggerFactory.getLogger(LCNDBConnection.class);
 
-    private volatile int state = 0;
+    private volatile int state = 1;
 
     private Connection connection;
 
@@ -46,6 +46,7 @@ public class LCNDBConnection implements Connection,ILCNResource<Connection> {
 
 
     public LCNDBConnection(Connection connection, DataSourceService dataSourceService, TxTransactionLocal transactionLocal, ICallClose<LCNDBConnection> runnable) {
+        logger.info("init lcn connection ! ");
         this.connection = connection;
         this.runnable = runnable;
         this.dataSourceService = dataSourceService;
@@ -102,6 +103,10 @@ protected void closeConnection() throws SQLException {
     @Override
     public void close() throws SQLException {
 
+        if(connection==null||connection.isClosed()){
+            return;
+        }
+
         if(hasClose){
             hasClose = false;
             return;
@@ -136,6 +141,7 @@ public void close() throws SQLException {
             if (state == 1) {
                 if (hasGroup) {
                     //加入队列的连接，仅操作连接对象，不处理事务
+                    logger.info("connection hasGroup -> "+hasGroup);
                     return;
                 }
 
@@ -215,14 +221,13 @@ public TxTask getWaitTask() {
     @Override
     public void setAutoCommit(boolean autoCommit) throws SQLException {
 
-        if(!autoCommit){
-            logger.info("setAutoCommit - >" +autoCommit);
+        if(!autoCommit) {
+            logger.info("setAutoCommit - >" + autoCommit);
             connection.setAutoCommit(autoCommit);
 
             TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
             txTransactionLocal.setAutoCommit(autoCommit);
         }
-
     }