feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Skip duplicate rows instead of canceling the conversion

Browse Source
This commit is contained in:
Brokkonaut
2018-11-24 03:34:09 +01:00
parent ab7c8ffbb2
commit 7e47a0c375
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/de/diddiz/LogBlock/Updater.java
View File

@@ -488,12 +488,21 @@ class Updater {
done++; done++;
} }
entries.close(); entries.close();
int failedRows = 0;
if (hadRow) { if (hadRow) {
try {
insertStatement.executeBatch(); insertStatement.executeBatch();
} catch (BatchUpdateException e) {
for (int result : e.getUpdateCounts()) {
if (result == Statement.EXECUTE_FAILED) {
failedRows++;
}
}
}
deleteStatement.executeBatch(); deleteStatement.executeBatch();
} }
conn.commit(); conn.commit();
logblock.getLogger().info("Done: " + done + "/" + rowsToConvert + " (" + (rowsToConvert > 0 ? (done * 100 / rowsToConvert) : 100) + "%)"); logblock.getLogger().info("Done: " + done + "/" + rowsToConvert + " " + (failedRows > 0 ? "Duplicates: " + failedRows + " " : "") + "(" + (rowsToConvert > 0 ? (done * 100 / rowsToConvert) : 100) + "%)");
} }
insertStatement.close(); insertStatement.close();
deleteStatement.close(); deleteStatement.close();