optimize: support oracle on delete tccfence logs (#5124)

apache · Dec 5, 2022 · 614454b · 614454b
1 parent 10a7470
commit 614454b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -74,6 +74,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#5051](https://github.com/seata/seata/pull/5051)] undo log dirty throw BranchRollbackFailed_Unretriable
 - [[#5075](https://github.com/seata/seata/pull/5075)] intercept the InsertOnDuplicateUpdate statement which has no primary key and unique index value
 - [[#5104](https://github.com/seata/seata/pull/5104)] remove the druid dependency in ConnectionProxy
+- [[#5124](https://github.com/seata/seata/pull/5124)] support oracle on delete tccfence logs
 
 
 ### test:

diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -73,6 +73,7 @@
 - [[#5051](https://github.com/seata/seata/pull/5051)] 回滚时undolog产生脏写需要抛出不再重试(BranchRollbackFailed_Unretriable)的异常
 - [[#5075](https://github.com/seata/seata/pull/5075)] 拦截没有主键及唯一索引值的insert on duplicate update语句
 - [[#5104](https://github.com/seata/seata/pull/5104)] ConnectionProxy脱离对druid的依赖
+- [[#5124](https://github.com/seata/seata/pull/5124)] 支持oracle删除tccfence记录表
 
 ### test：
 - [[#4411](https://github.com/seata/seata/pull/4411)] 测试Oracle数据库AT模式下类型支持

diff --git a/tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java b/tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java
@@ -17,6 +17,7 @@
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Set;
@@ -294,6 +295,12 @@ public static int deleteFenceByDate(Date datetime) {
         int total = 0;
         try {
             connection = DataSourceUtils.getConnection(dataSource);
+            if (isOracle(connection)) {
+                // delete by date if DB is oracle
+                return TCC_FENCE_DAO.deleteTCCFenceDOByDate(connection, datetime);
+            }
+
+            //delete by id if DB is not oracle
             while (true) {
                 Set<String> xidSet = TCC_FENCE_DAO.queryEndStatusXidsByDate(connection, datetime, LIMIT_DELETE);
                 if (xidSet.isEmpty()) {
@@ -312,6 +319,16 @@ public static int deleteFenceByDate(Date datetime) {
 
     }
 
+    private static boolean isOracle(Connection connection) {
+        try {
+            String url = connection.getMetaData().getURL();
+            return url.toLowerCase().contains(":oracle:");
+        } catch (SQLException e) {
+            LOGGER.error("get db type fail", e);
+        }
+        return false;
+    }
+
     private static void initLogCleanExecutor() {
         logCleanExecutor = new ThreadPoolExecutor(MAX_THREAD_CLEAN, MAX_THREAD_CLEAN, Integer.MAX_VALUE,
                 TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),

diff --git a/tcc/src/main/java/io/seata/rm/tcc/store/TCCFenceStore.java b/tcc/src/main/java/io/seata/rm/tcc/store/TCCFenceStore.java
@@ -85,10 +85,10 @@ public interface TCCFenceStore {
      * Delete tcc fence by datetime.
      * @param conn the connection
      * @param datetime datetime
-     * @param limit limit
      * @return the deleted row count
      */
-    int deleteTCCFenceDOByDate(Connection conn, Date datetime, int limit);
+    int deleteTCCFenceDOByDate(Connection conn, Date datetime);
+
 
     /**
      * Set LogTable Name

diff --git a/tcc/src/main/java/io/seata/rm/tcc/store/db/TCCFenceStoreDataBaseDAO.java b/tcc/src/main/java/io/seata/rm/tcc/store/db/TCCFenceStoreDataBaseDAO.java
@@ -192,13 +192,12 @@ public int deleteTCCFenceDO(Connection conn, List<String> xids) {
     }
 
     @Override
-    public int deleteTCCFenceDOByDate(Connection conn, Date datetime, int limit) {
+    public int deleteTCCFenceDOByDate(Connection conn, Date datetime) {
         PreparedStatement ps = null;
         try {
             String sql = TCCFenceStoreSqls.getDeleteSQLByDateAndStatus(logTableName);
             ps = conn.prepareStatement(sql);
             ps.setTimestamp(1, new Timestamp(datetime.getTime()));
-            ps.setInt(2, limit);
             return ps.executeUpdate();
         } catch (SQLException e) {
             throw new StoreException(e);

diff --git a/tcc/src/main/java/io/seata/rm/tcc/store/db/sql/TCCFenceStoreSqls.java b/tcc/src/main/java/io/seata/rm/tcc/store/db/sql/TCCFenceStoreSqls.java
@@ -84,8 +84,7 @@ private TCCFenceStoreSqls() {
      */
     protected static final String DELETE_BY_DATE_AND_STATUS = "delete from " + LOCAL_TCC_LOG_PLACEHOLD
             + " where gmt_modified < ? "
-            + " and status in (" + TCCFenceConstant.STATUS_COMMITTED + " , " + TCCFenceConstant.STATUS_ROLLBACKED + " , " + TCCFenceConstant.STATUS_SUSPENDED + ")"
-            + " limit ?";
+            + " and status in (" + TCCFenceConstant.STATUS_COMMITTED + " , " + TCCFenceConstant.STATUS_ROLLBACKED + " , " + TCCFenceConstant.STATUS_SUSPENDED + ")";
 
     public static String getInsertLocalTCCLogSQL(String localTccTable) {
         return INSERT_LOCAL_TCC_LOG.replace(LOCAL_TCC_LOG_PLACEHOLD, localTccTable);