Other/data-migration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java
This commit is contained in:
hzj
2024-01-18 14:32:20 +08:00
parent 31b539f44e 071c3a4b07
commit 0abf1bdceb
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java
View File

@@ -180,9 +180,9 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService {
stopWatch.stop(); stopWatch.stop();
jobDetailInfluxDB.setState(1); jobDetailInfluxDB.setState(1);
jobDetailInfluxDB.setDuration(stopWatch.getTotalTimeSeconds()); jobDetailInfluxDB.setDuration(stopWatch.getTotalTimeSeconds());
jobDetailInfluxDB.setUpdateTime(LocalDateTime.now());
jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB);
} }
jobDetailInfluxDB.setUpdateTime(LocalDateTime.now());
jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB);
} catch (Exception exception) { } catch (Exception exception) {
exception.printStackTrace(); exception.printStackTrace();
if (Objects.isNull(jobDetailInfluxDB)) { if (Objects.isNull(jobDetailInfluxDB)) {
@@ -192,7 +192,6 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService {
jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); jobDetailInfluxDB.setUpdateTime(LocalDateTime.now());
jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB); jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB);
} }
System.out.println("执行后总堆内存为：" + runtime.totalMemory() / (1024 * 1024) + " MB"); System.out.println("执行后总堆内存为：" + runtime.totalMemory() / (1024 * 1024) + " MB");
System.out.println("执行后已用堆内存为：" + (runtime.totalMemory() - runtime.freeMemory()) / (1024 * 1024) + " MB"); System.out.println("执行后已用堆内存为：" + (runtime.totalMemory() - runtime.freeMemory()) / (1024 * 1024) + " MB");
System.out.println("执行后空闲堆内存为：" + runtime.freeMemory() / (1024 * 1024) + " MB"); System.out.println("执行后空闲堆内存为：" + runtime.freeMemory() / (1024 * 1024) + " MB");

13
oracle-data/oracle-target/src/main/java/com/njcn/oracle/service/impl/OracleServiceImpl.java
View File

@@ -108,25 +108,20 @@ public class OracleServiceImpl implements IOracleService {
jobDetail.setRowCount(0); jobDetail.setRowCount(0);
} }
jobDetail.setRowCount(jobDetail.getRowCount() + size); jobDetail.setRowCount(jobDetail.getRowCount() + size);
jobDetail.setUpdateTime(LocalDateTime.now()); if (i + 1 == slice) {
jobDetailService.updateByMultiId(jobDetail);
if (i + 1 == slice && Objects.nonNull(jobDetail)) {
stopWatch.stop(); stopWatch.stop();
jobDetail.setState(1); jobDetail.setState(1);
jobDetail.setDuration(stopWatch.getTotalTimeSeconds()); jobDetail.setDuration(stopWatch.getTotalTimeSeconds());
jobDetail.setUpdateTime(LocalDateTime.now());
jobDetailService.updateByMultiId(jobDetail);
} }
jobDetail.setUpdateTime(LocalDateTime.now());
jobDetailService.updateByMultiId(jobDetail);
} catch (Exception exception) { } catch (Exception exception) {
exception.printStackTrace(); exception.printStackTrace();
if (Objects.isNull(jobDetail)) {
jobDetail = new JobDetail(tableName, date, size);
}
jobDetail.setState(2); jobDetail.setState(2);
jobDetail.setUpdateTime(LocalDateTime.now()); jobDetail.setUpdateTime(LocalDateTime.now());
jobDetailService.updateByMultiId(jobDetail); jobDetailService.updateByMultiId(jobDetail);
} }
System.out.println("执行后总堆内存为：" + runtime.totalMemory() / (1024 * 1024) + " MB"); System.out.println("执行后总堆内存为：" + runtime.totalMemory() / (1024 * 1024) + " MB");
System.out.println("执行后已用堆内存为：" + (runtime.totalMemory() - runtime.freeMemory()) / (1024 * 1024) + " MB"); System.out.println("执行后已用堆内存为：" + (runtime.totalMemory() - runtime.freeMemory()) / (1024 * 1024) + " MB");
System.out.println("执行后空闲堆内存为：" + runtime.freeMemory() / (1024 * 1024) + " MB"); System.out.println("执行后空闲堆内存为：" + runtime.freeMemory() / (1024 * 1024) + " MB");