Use long instead of int to avoid overflow in converter

This commit is contained in:
Brokkonaut
2018-11-26 06:20:02 +01:00
parent d847908d3c
commit ab464e1dd5

View File

@ -427,12 +427,12 @@ class Updater {
logblock.getLogger().info("Processing world " + wcfg.world + "..."); logblock.getLogger().info("Processing world " + wcfg.world + "...");
logblock.getLogger().info("Processing block changes..."); logblock.getLogger().info("Processing block changes...");
boolean hadRow = true; boolean hadRow = true;
int rowsToConvert = 0; long rowsToConvert = 0;
int done = 0; long done = 0;
try { try {
ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "`"); ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "`");
if (rs.next()) { if (rs.next()) {
rowsToConvert = rs.getInt(1); rowsToConvert = rs.getLong(1);
logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table); logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table);
} }
rs.close(); rs.close();
@ -516,7 +516,7 @@ class Updater {
try { try {
ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "-chest`"); ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "-chest`");
if (rs.next()) { if (rs.next()) {
rowsToConvert = rs.getInt(1); rowsToConvert = rs.getLong(1);
logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table + "-chest"); logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table + "-chest");
} }
rs.close(); rs.close();
@ -579,7 +579,7 @@ class Updater {
try { try {
ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "-kills`"); ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "-kills`");
if (rs.next()) { if (rs.next()) {
rowsToConvert = rs.getInt(1); rowsToConvert = rs.getLong(1);
logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table + "-kills"); logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table + "-kills");
} }
rs.close(); rs.close();
@ -656,12 +656,12 @@ class Updater {
rsCol.close(); rsCol.close();
conn.commit(); conn.commit();
if (wcfg.isLogging(Logging.SIGNTEXT)) { if (wcfg.isLogging(Logging.SIGNTEXT)) {
int rowsToConvert = 0; long rowsToConvert = 0;
int done = 0; long done = 0;
try { try {
ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "-sign`"); ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "-sign`");
if (rs.next()) { if (rs.next()) {
rowsToConvert = rs.getInt(1); rowsToConvert = rs.getLong(1);
logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table + "-sign"); logblock.getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table + "-sign");
} }
rs.close(); rs.close();