diff --git a/src/main/java/com/dashboard/aws/lambda/handler/S3BatchToMySQLHandler.java b/src/main/java/com/dashboard/aws/lambda/handler/S3BatchToMySQLHandler.java index 82ec08c..2cd38e2 100644 --- a/src/main/java/com/dashboard/aws/lambda/handler/S3BatchToMySQLHandler.java +++ b/src/main/java/com/dashboard/aws/lambda/handler/S3BatchToMySQLHandler.java @@ -30,7 +30,7 @@ import java.util.*; * table/date/ * ├─ 00000001.csv * ├─ 00000002.csv - * └─ .processed ← JSON格式,记录已处理的CSV文件:{"processedFiles": ["00000001.csv", "00000002.csv"]} + * └─ .sync_to_db_processed ← JSON格式,记录已处理的CSV文件:{"processedFiles": ["00000001.csv", "00000002.csv"]} */ public class S3BatchToMySQLHandler implements RequestHandler, String> { @@ -109,8 +109,8 @@ public class S3BatchToMySQLHandler implements RequestHandler * @param timeoutThresholdMs 超时阈值 */ private void processTable(String table, LocalDate fileDate, String dateStr, long overallStartTime, long timeoutThresholdMs) { - // 进度标记文件:table/date/.processed - String markerKey = String.format("%s/%s/.processed", table, dateStr); + // 进度标记文件:table/date/.sync_to_db_processed + String markerKey = String.format("%s/%s/.sync_to_db_processed", table, dateStr); logger.info("[{}][{}] start processing date: {}", DB_SCHEMA, table, dateStr); try { @@ -202,7 +202,7 @@ public class S3BatchToMySQLHandler implements RequestHandler /** * 从S3加载已处理的文件列表 * - * @param markerKey .processed 文件路径 + * @param markerKey .sync_to_db_processed 文件路径 * @return 已处理的文件列表 */ private Map loadProcessedFiles(String markerKey) { @@ -213,7 +213,7 @@ public class S3BatchToMySQLHandler implements RequestHandler return new HashMap<>(); } - // 下载 .processed 文件 + // 下载 .sync_to_db_processed 文件 byte[] content = s3Service.download(markerKey); if (content == null || content.length == 0) { return new HashMap<>(); @@ -232,7 +232,7 @@ public class S3BatchToMySQLHandler implements RequestHandler /** * 保存已处理的文件进度到S3 * - * @param markerKey .processed 文件路径 + * @param markerKey .sync_to_db_processed 文件路径 * @param fileProgress 已处理的文件进度 Map<文件名, 已处理行数> */ private void saveProcessedFiles(String markerKey, Map fileProgress) { diff --git a/src/main/java/com/dashboard/aws/lambda/service/MySQLService.java b/src/main/java/com/dashboard/aws/lambda/service/MySQLService.java index a97dc5b..b2cffd7 100644 --- a/src/main/java/com/dashboard/aws/lambda/service/MySQLService.java +++ b/src/main/java/com/dashboard/aws/lambda/service/MySQLService.java @@ -144,6 +144,7 @@ public class MySQLService { // 提交当前批次事务,每个批次独立事务,失败不影响其他批次 conn.commit(); + //成功才加到 total total += batchInserted; batchSuccess = true;