Merge branch '5.0.0-dev' of https://github.com/codingapi/tx-lcn into 5.0.0-dev

Author: meetzy

example/spring-demo-client/src/main/java/com/codingapi/example/client/TransactionConfiguration.java

@@ -19,9 +19,9 @@
  *
  * @author ujued
  */
-@Configuration
-@EnableTransactionManagement
-@EnableConfigurationProperties(TransactionProperties.class)
+//@Configuration
+//@EnableTransactionManagement
+//@EnableConfigurationProperties(TransactionProperties.class)
 public class TransactionConfiguration {
 
     @Bean

example/spring-demo-client/src/main/java/com/codingapi/example/client/service/DemoServiceImpl.java

@@ -5,6 +5,7 @@
 import com.codingapi.example.common.spring.DDemoClient;
 import com.codingapi.example.common.spring.EDemoClient;
 import com.codingapi.tx.client.bean.DTXLocal;
+import com.codingapi.tx.commons.annotation.LcnTransaction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.annotation.Order;
@@ -35,6 +36,7 @@ public class DemoServiceImpl implements DemoService {
     private String appName;
 
     @Override
+    @LcnTransaction
     public String execute(String value) {
         String dResp = dDemoClient.rpc(value);
         String eResp = eDemoClient.rpc(value);

example/spring-demo-client/src/main/resources/application-ujued.properties

@@ -3,4 +3,4 @@ spring.datasource.password=123456
 tx-lcn.logger.enabled=true
 
 #spring.cloud.consul.discovery.health-check-url=http://127.0.0.1:${server.port}/actuator/health
-logging.level.com.codingapi.tx.client=DEBUG
+#logging.level.com.codingapi.tx.client=DEBUG

tx-client/src/main/java/com/codingapi/tx/client/TxClientConfiguration.java

@@ -2,7 +2,11 @@
 
 import com.codingapi.tx.client.spi.transaction.txc.resource.init.DefaultTxcSettingFactory;
 import com.codingapi.tx.client.spi.transaction.txc.resource.init.TxcSettingFactory;
+import com.codingapi.tx.client.support.checking.DTXChecking;
+import com.codingapi.tx.client.support.checking.SimpleDTXChecking;
+import com.codingapi.tx.client.support.common.template.TransactionCleanTemplate;
 import org.apache.commons.dbutils.QueryRunner;
+import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -34,4 +38,14 @@ public QueryRunner queryRunner(DataSource dataSource) {
     public TxcSettingFactory txcSettingFactory() {
         return new DefaultTxcSettingFactory();
     }
+
+    @Bean
+    public SmartInitializingSingleton dtxCheckingTransactionCleanTemplateAdapter(DTXChecking dtxChecking,
+                                                                                 TransactionCleanTemplate transactionCleanTemplate) {
+        if (dtxChecking instanceof SimpleDTXChecking) {
+            return () -> ((SimpleDTXChecking) dtxChecking).setTransactionCleanTemplate(transactionCleanTemplate);
+        }
+        return () -> {
+        };
+    }
 }

tx-client/src/main/java/com/codingapi/tx/client/aspect/weave/DTXLogicWeaver.java

@@ -68,6 +68,9 @@ public Object runTransaction(DTXInfo dtxInfo, BusinessCallback business) throws
         try {
             return transactionServiceExecutor.transactionRunning(info);
         } finally {
+            synchronized (DTXLocal.cur()) {
+                DTXLocal.cur().notify();
+            }
             DTXLocal.makeNeverAppeared();
             log.info("tx-unit end------>");
         }

tx-client/src/main/java/com/codingapi/tx/client/bean/DTXLocal.java

@@ -31,6 +31,11 @@ public class DTXLocal {
      */
     private String unitId;
 
+    /**
+     * 业务相关资源
+     */
+    private Object resource;
+
 
     ////////////////////////// volatile ///////////////////////////////
 

tx-client/src/main/java/com/codingapi/tx/client/spi/message/txc/TxcTransactionCleanService.java

@@ -3,6 +3,7 @@
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.TxcService;
 import com.codingapi.tx.commons.exception.TransactionClearException;
 import com.codingapi.tx.client.support.common.TransactionCleanService;
+import com.codingapi.tx.commons.exception.TxcLogicException;
 import com.codingapi.tx.logger.TxLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +41,7 @@ public void clear(String groupId, int state, String unitId, String unitType) thr
 
             // 清理TXC
             txcService.cleanTxc(groupId, unitId);
-        } catch (SQLException e) {
+        } catch (TxcLogicException e) {
             log.error("txc > clean transaction error. {}", e.getMessage());
             throw new TransactionClearException(e.getMessage());
         }

tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcRunningTransaction.java

@@ -9,6 +9,7 @@
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.bean.RollbackInfo;
 import com.codingapi.tx.commons.exception.TransactionClearException;
 import com.codingapi.tx.commons.exception.TxClientException;
+import com.codingapi.tx.commons.exception.TxcLogicException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -51,10 +52,6 @@ public void preBusinessCode(TxTransactionInfo info) {
 
     @Override
     public void onBusinessCodeError(TxTransactionInfo info, Throwable throwable) {
-        // 写Undo log 早于 clean
-        txcService.writeUndoLog(
-                info.getGroupId(), info.getUnitId(), (RollbackInfo) DTXLocal.cur().getAttachment());
-
         try {
             log.info("txc > running > clean transaction.");
             transactionCleanTemplate.clean(
@@ -70,8 +67,12 @@ public void onBusinessCodeError(TxTransactionInfo info, Throwable throwable) {
     @Override
     public void onBusinessCodeSuccess(TxTransactionInfo info, Object result) throws TxClientException {
         // 写Undo log
-        txcService.writeUndoLog(
-                info.getGroupId(), info.getUnitId(), (RollbackInfo) DTXLocal.cur().getAttachment());
+        try {
+            txcService.writeUndoLog(
+                    info.getGroupId(), info.getUnitId(), (RollbackInfo) DTXLocal.cur().getAttachment());
+        } catch (TxcLogicException e) {
+            throw new TxClientException(e);
+        }
         // 加入事务组
         transactionControlTemplate.joinGroup(info.getGroupId(), info.getUnitId(), info.getTransactionType(),
                 info.getTransactionInfo());

tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcStartingTransaction.java

@@ -1,11 +1,10 @@
 package com.codingapi.tx.client.spi.transaction.txc.control;
 
-import com.codingapi.tx.client.bean.TxTransactionInfo;
 import com.codingapi.tx.client.bean.DTXLocal;
-import com.codingapi.tx.client.spi.transaction.txc.resource.def.TxcService;
+import com.codingapi.tx.client.bean.TxTransactionInfo;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.bean.RollbackInfo;
-import com.codingapi.tx.client.support.separate.TXLCNTransactionControl;
 import com.codingapi.tx.client.support.common.template.TransactionControlTemplate;
+import com.codingapi.tx.client.support.separate.TXLCNTransactionControl;
 import com.codingapi.tx.commons.exception.BeforeBusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,15 +22,10 @@
 @Slf4j
 public class TxcStartingTransaction implements TXLCNTransactionControl {
 
-    private final TxcService txcService;
-
     private final TransactionControlTemplate transactionControlTemplate;
 
     @Autowired
-    public TxcStartingTransaction(
-            TxcService txcService,
-            TransactionControlTemplate transactionControlTemplate) {
-        this.txcService = txcService;
+    public TxcStartingTransaction(TransactionControlTemplate transactionControlTemplate) {
         this.transactionControlTemplate = transactionControlTemplate;
     }
 
@@ -74,11 +68,6 @@ public void postBusinessCode(TxTransactionInfo info) {
             state = -1;
         }
 
-        // 非提交状态，写Undo log
-        if (state != 1) {
-            txcService.writeUndoLog(info.getGroupId(), info.getUnitId(), rollbackInfo);
-        }
-
         // 关闭事务组
         transactionControlTemplate.notifyGroup(info.getGroupId(), info.getUnitId(), info.getTransactionType(), state);
     }

tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/TxcJdbcEventListener.java

@@ -1,11 +1,14 @@
 package com.codingapi.tx.client.spi.transaction.txc.resource;
 
+import com.codingapi.tx.client.bean.DTXLocal;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.SqlExecuteInterceptor;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.bean.LockableSelect;
 import com.codingapi.tx.client.spi.transaction.txc.resource.init.TxcSettingFactory;
+import com.codingapi.tx.client.spi.transaction.txc.resource.util.SqlUtils;
 import com.codingapi.tx.jdbcproxy.p6spy.common.PreparedStatementInformation;
 import com.codingapi.tx.jdbcproxy.p6spy.common.StatementInformation;
 import com.codingapi.tx.jdbcproxy.p6spy.event.SimpleJdbcEventListener;
+import com.codingapi.tx.jdbcproxy.p6spy.util.TxcUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -42,11 +45,14 @@ public TxcJdbcEventListener(SqlExecuteInterceptor sqlExecuteInterceptor, TxcSett
     public void onBeforeAnyExecute(StatementInformation statementInformation) throws SQLException {
         String sql = statementInformation.getSqlWithValues();
 
-        // 忽略Txc数据表
-        if (sql.contains(txcSettingFactory.lockTableName()) || sql.contains(txcSettingFactory.undoLogTableName())) {
+        // 忽略TxcSQL
+        if (TxcUtils.isTxcSQL(sql)) {
             return;
         }
 
+        // 当前业务链接
+        DTXLocal.cur().setResource(statementInformation.getStatement().getConnection());
+
         // 拦截处理
         try {
             long startTime = System.currentTimeMillis();