From 2e38637a6090dd5fa799e33c4e2a5e9ee0b8a642 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期二, 02 九月 2025 16:41:46 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/chkt
---
product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingService.java b/product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingService.java
index a48b8fe..aefb526 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingService.java
@@ -390,6 +390,8 @@
String maxID = paramFse.getString("max_id");
String minID = paramFse.getString("min_id");
String splitTableType = "1".equals(configFse.getString("split_table_type")) ? "1" : "0";
+ //寮�鍚槦鍒楁煡璇㈡椂锛屽厛娓呯┖闃熷垪闃叉涓婃鏈鐞嗗畬鐨勬暟鎹崰鐢ㄥ唴瀛�
+ dataArchivingQueue.clear(sourceTable);
dataArchivingQueue.query(sourceDbe, sourceTable, filterSb.toString(), null, uniqueField, minID);
DataTableEntity allDte;
Map<String, List<DataTableEntity>> groupDteMap;
@@ -534,7 +536,7 @@
targetDao.closeConnection();
sourceDao.closeConnection();
// 鍏抽棴绾跨▼
- dataArchivingQueue.shutdownQueryThread(sourceTable);
+ dataArchivingQueue.clear(sourceTable);
}
// 鍒犻櫎mes涓诲簱鐨勫唴瀹�
@@ -1079,7 +1081,7 @@
for (String indexName : indexInfoObj.keySet()) {
singleFieldInfoObj = indexInfoObj.getJSONObject(indexName);
if (CmnConst.PRIMARY.equalsIgnoreCase(indexName) || CmnConst.PRIMARY.equalsIgnoreCase(singleFieldInfoObj.getString(CmnConst.TYPE))) {
- sql.append("\n PRIMARY KEY (`").append(singleFieldInfoObj.getString(CmnConst.COLUMN_NAME)).append("`) USING BTREE,");
+ sql.append("\n PRIMARY KEY (").append(singleFieldInfoObj.getString(CmnConst.COLUMN_NAME)).append(") USING BTREE,");
} else if (CmnConst.UNIQUE.equalsIgnoreCase(singleFieldInfoObj.getString(CmnConst.TYPE))) {
sql.append("\n UNIQUE INDEX `").append(indexName).append("`(").append(singleFieldInfoObj.getString(CmnConst.COLUMN_NAME)).append(") USING BTREE,");
} else if (CmnConst.NORMAL.equalsIgnoreCase(singleFieldInfoObj.getString(CmnConst.TYPE))) {
--
Gitblit v1.9.2