针对不同的事务类型做优化

Author: xlorne

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

@@ -14,7 +14,7 @@ public class TxTransactionInfo {
 
     private TxTransaction transaction;
 
-    private Transactional transactional;
+   // private Transactional transactional;
 
     private TxTransactionLocal txTransactionLocal;
 
@@ -25,13 +25,13 @@ public class TxTransactionInfo {
     private TransactionInvocation invocation;
 
 
-    public TxTransactionInfo(TxTransaction transaction,Transactional transactional, 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;
+       // this.transactional = transactional;
     }
 
     public int getMaxTimeOut() {
@@ -56,7 +56,7 @@ public TransactionInvocation getInvocation() {
         return invocation;
     }
 
-    public Transactional getTransactional() {
-        return transactional;
-    }
+   // public Transactional getTransactional() {
+//        return transactional;
+//    }
 }

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

@@ -1,7 +1,5 @@
 package com.codingapi.tx.aop.bean;
 
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * 分布式事务远程调用控制对象
  * Created by lorne on 2017/6/5.
@@ -22,10 +20,7 @@ public class TxTransactionLocal {
 
     private String type;
 
-    private boolean readOnly;
-
-    private Transactional transactional;
-
+    private boolean autoCommit = true;
 
     public boolean isHasIsGroup() {
         return hasIsGroup;
@@ -90,25 +85,11 @@ public String getType() {
         return type;
     }
 
-
-
-    public boolean isReadOnly() {
-        return readOnly;
-    }
-
-    public Transactional getTransactional() {
-        return transactional;
+    public boolean isAutoCommit() {
+        return autoCommit;
     }
 
-    public void setTransactional(Transactional transactional) {
-        this.transactional = transactional;
-
-        //set readOnly
-        if(transactional==null){
-            //没有配置事务注解的时候当做只读来处理
-            readOnly = true;
-        }else{
-            readOnly = transactional.readOnly();
-        }
+    public void setAutoCommit(boolean autoCommit) {
+        this.autoCommit = autoCommit;
     }
 }

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

@@ -11,7 +11,6 @@
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.Method;
 
@@ -35,16 +34,11 @@ public Object around(String groupId,int maxTimeOut, ProceedingJoinPoint point) t
 
         TxTransaction transaction = thisMethod.getAnnotation(TxTransaction.class);
 
-        Transactional transactional = thisMethod.getAnnotation(Transactional.class);
-        if (transactional == null) {
-            transactional = clazz.getAnnotation(Transactional.class);
-        }
-
         TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
 
         TransactionInvocation invocation = new TransactionInvocation(clazz, thisMethod.getName(), thisMethod.toString(), args, method.getParameterTypes());
 
-        TxTransactionInfo info = new TxTransactionInfo(transaction,transactional,txTransactionLocal,invocation,groupId,maxTimeOut);
+        TxTransactionInfo info = new TxTransactionInfo(transaction,txTransactionLocal,invocation,groupId,maxTimeOut);
 
         TransactionServer server = transactionServerFactoryService.createTransactionServer(info);
 

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

@@ -32,7 +32,6 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
         txTransactionLocal.setGroupId(txGroupId);
         txTransactionLocal.setHasStart(false);
         txTransactionLocal.setKid(kid);
-        txTransactionLocal.setTransactional(info.getTransactional());
         txTransactionLocal.setMaxTimeOut(info.getMaxTimeOut());
         TxTransactionLocal.setCurrent(txTransactionLocal);
 

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

@@ -51,7 +51,6 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
         txTransactionLocal.setGroupId(txGroupId);
         txTransactionLocal.setHasStart(false);
         txTransactionLocal.setKid(kid);
-        txTransactionLocal.setTransactional(info.getTransactional());
         txTransactionLocal.setMaxTimeOut(info.getMaxTimeOut());
         TxTransactionLocal.setCurrent(txTransactionLocal);
 
@@ -61,7 +60,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
             Object res = point.proceed();
 
             //写操作 处理
-            if(!txTransactionLocal.isReadOnly()) {
+            if(!txTransactionLocal.isAutoCommit()) {
 
                 String methodStr = info.getInvocation().getMethodStr();
 

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

@@ -50,7 +50,6 @@ public Object execute(ProceedingJoinPoint point, final TxTransactionInfo info) t
             TxTransactionLocal txTransactionLocal = new TxTransactionLocal();
             txTransactionLocal.setGroupId(groupId);
             txTransactionLocal.setHasStart(true);
-            txTransactionLocal.setTransactional(info.getTransactional());
             txTransactionLocal.setMaxTimeOut(Constants.maxOutTime);
             TxTransactionLocal.setCurrent(txTransactionLocal);
             Object obj = point.proceed();
@@ -72,7 +71,6 @@ public Object execute(ProceedingJoinPoint point, final TxTransactionInfo info) t
                         public void run0() {
                             //记录补偿日志
                             txManagerService.sendCompensateMsg(groupId, time, info);
-
                         }
                     }).start();
 

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

@@ -125,10 +125,10 @@ protected C initLCNConnection(C connection) {
             logger.info("lcn datasource transaction control ");
 
             //只读操作，直接返回connection
-            if(txTransactionLocal.isReadOnly()){
-                logger.info("readonly transaction ");
-                return connection;
-            }
+//            if(txTransactionLocal.isReadOnly()){
+//                logger.info("readonly transaction ");
+//                return connection;
+//            }
 
             //补偿的情况的
             if (TxCompensateLocal.current() != null) {

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

@@ -42,8 +42,6 @@ public class LCNDBConnection implements Connection,ILCNResource<Connection> {
 
     private String groupId;
 
-    private boolean readOnly;
-
     private TxTask waitTask;
 
 
@@ -77,13 +75,8 @@ public Connection get() {
 
     @Override
     public void commit() throws SQLException {
-        if(readOnly){
-            connection.commit();
-            return;
-        }
-
-
         logger.info("commit label");
+
         state = 1;
 
         close();
@@ -92,11 +85,6 @@ public void commit() throws SQLException {
 
     @Override
     public void rollback() throws SQLException {
-        if(readOnly){
-            connection.rollback();
-            return;
-        }
-
         logger.info("rollback label");
 
         state = 0;
@@ -113,60 +101,68 @@ protected void closeConnection() throws SQLException {
 
     @Override
     public void close() throws SQLException {
-        if(readOnly){
-            connection.close();
-            return;
-        }
 
         if(hasClose){
             hasClose = false;
             return;
         }
-        logger.info("now transaction state is" + state + ", (1:commit,0:rollback) groupId:" + groupId);
-
-        if (state == 0) {
-            //再嵌套时，第一次成功后面出现回滚。
-            if(waitTask!=null&&waitTask.isAwait()&&!waitTask.isRemove()) {
-                //通知第一个连接回滚事务。
-                waitTask.setState(0);
-                waitTask.signalTask();
-            }else {
-                connection.rollback();
-                closeConnection();
-            }
 
-            logger.info("rollback transaction ,groupId:" +groupId);
-        }
-        if (state == 1) {
-            if (hasGroup) {
-                //加入队列的连接，仅操作连接对象，不处理事务
-                return;
+        if(connection.getAutoCommit()){
+
+            closeConnection();
+
+            //没有开启事务控制
+
+            logger.info("now transaction over ! ");
+
+            return;
+        }else {
+
+            logger.info("now transaction state is " + state + ", (1:commit,0:rollback) groupId:" + groupId);
+
+            if (state == 0) {
+                //再嵌套时，第一次成功后面出现回滚。
+                if (waitTask != null && waitTask.isAwait() && !waitTask.isRemove()) {
+                    //通知第一个连接回滚事务。
+                    waitTask.setState(0);
+                    waitTask.signalTask();
+                } else {
+                    connection.rollback();
+                    closeConnection();
+                }
+
+                logger.info("rollback transaction ,groupId:" + groupId);
             }
+            if (state == 1) {
+                if (hasGroup) {
+                    //加入队列的连接，仅操作连接对象，不处理事务
+                    return;
+                }
 
-            Runnable runnable = new HookRunnable() {
-                @Override
-                public void run0() {
-                    try {
-                        transaction();
-                    } catch (Exception e) {
-                        try {
-                            connection.rollback();
-                        } catch (SQLException e1) {
-                            e1.printStackTrace();
-                        }
-                    } finally {
+                Runnable runnable = new HookRunnable() {
+                    @Override
+                    public void run0() {
                         try {
-                            closeConnection();
-                        } catch (SQLException e) {
-                            e.printStackTrace();
+                            transaction();
+                        } catch (Exception e) {
+                            try {
+                                connection.rollback();
+                            } catch (SQLException e1) {
+                                e1.printStackTrace();
+                            }
+                        } finally {
+                            try {
+                                closeConnection();
+                            } catch (SQLException e) {
+                                e.printStackTrace();
+                            }
                         }
                     }
-                }
-            };
-            Thread thread = new Thread(runnable);
-            thread.start();
+                };
+                Thread thread = new Thread(runnable);
+                thread.start();
+            }
         }
-
     }
 
 
@@ -218,7 +214,15 @@ public TxTask getWaitTask() {
 
     @Override
     public void setAutoCommit(boolean autoCommit) throws SQLException {
-        connection.setAutoCommit(false);
+
+        if(!autoCommit){
+            logger.info("setAutoCommit - >" +autoCommit);
+            connection.setAutoCommit(autoCommit);
+
+            TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
+            txTransactionLocal.setAutoCommit(autoCommit);
+        }
+
     }
 
 
@@ -265,7 +269,6 @@ public DatabaseMetaData getMetaData() throws SQLException {
 
     @Override
     public void setReadOnly(boolean readOnly) throws SQLException {
-        this.readOnly = readOnly;
         connection.setReadOnly(readOnly);
     }