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

Increase Updater batch size

Browse Source
This commit is contained in:
Brokkonaut
2018-08-01 03:38:19 +02:00
parent 8084b3e4c0
commit 7a5e46b65f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import java.util.regex.Pattern;
class Updater { class Updater {
private final LogBlock logblock; private final LogBlock logblock;
final int UUID_CONVERT_BATCH_SIZE = 100; final int UUID_CONVERT_BATCH_SIZE = 100;
final int BLOCKS_CONVERT_BATCH_SIZE = 200000;
Updater(LogBlock logblock) { Updater(LogBlock logblock) {
this.logblock = logblock; this.logblock = logblock;
@ -441,7 +442,7 @@ class Updater {
while (hadRow) { while (hadRow) {
hadRow = false; hadRow = false;
ResultSet entries = st.executeQuery("SELECT id, date, playerid, replaced, type, data, x, y, z FROM `" + wcfg.table + "` ORDER BY id ASC LIMIT 10000"); ResultSet entries = st.executeQuery("SELECT id, date, playerid, replaced, type, data, x, y, z FROM `" + wcfg.table + "` ORDER BY id ASC LIMIT " + BLOCKS_CONVERT_BATCH_SIZE);
while (entries.next()) { while (entries.next()) {
hadRow = true; hadRow = true;
int id = entries.getInt("id"); int id = entries.getInt("id");
@ -515,7 +516,7 @@ class Updater {
PreparedStatement insertChestData = conn.prepareStatement("INSERT INTO `" + wcfg.table + "-chestdata` (id, item, itemremove, itemtype) VALUES (?, ?, ?, ?)"); PreparedStatement insertChestData = conn.prepareStatement("INSERT INTO `" + wcfg.table + "-chestdata` (id, item, itemremove, itemtype) VALUES (?, ?, ?, ?)");
PreparedStatement deleteChest = conn.prepareStatement("DELETE FROM `" + wcfg.table + "-chest` WHERE id = ?"); PreparedStatement deleteChest = conn.prepareStatement("DELETE FROM `" + wcfg.table + "-chest` WHERE id = ?");
while (true) { while (true) {
rs = st.executeQuery("SELECT id, itemtype, itemamount, itemdata FROM `" + wcfg.table + "-chest` ORDER BY id ASC LIMIT 10000"); rs = st.executeQuery("SELECT id, itemtype, itemamount, itemdata FROM `" + wcfg.table + "-chest` ORDER BY id ASC LIMIT " + BLOCKS_CONVERT_BATCH_SIZE);
boolean anyRow = false; boolean anyRow = false;
while (rs.next()) { while (rs.next()) {
anyRow = true; anyRow = true;
@ -566,8 +567,8 @@ class Updater {
rs.close(); rs.close();
PreparedStatement updateWeaponStatement = conn.prepareStatement("UPDATE `" + wcfg.table + "-kills` SET weapon = ? WHERE id = ?"); PreparedStatement updateWeaponStatement = conn.prepareStatement("UPDATE `" + wcfg.table + "-kills` SET weapon = ? WHERE id = ?");
for (int start = 0;; start += 10000) { for (int start = 0;; start += BLOCKS_CONVERT_BATCH_SIZE) {
rs = st.executeQuery("SELECT id, weapon FROM `" + wcfg.table + "-kills` ORDER BY id ASC LIMIT " + start + ",10000"); rs = st.executeQuery("SELECT id, weapon FROM `" + wcfg.table + "-kills` ORDER BY id ASC LIMIT " + start + "," + BLOCKS_CONVERT_BATCH_SIZE);
boolean anyUpdate = false; boolean anyUpdate = false;
boolean anyRow = false; boolean anyRow = false;
while (rs.next()) { while (rs.next()) {
@ -651,7 +652,7 @@ class Updater {
PreparedStatement insertSignState = conn.prepareStatement("INSERT INTO `" + wcfg.table + "-state` (id, replacedState, typeState) VALUES (?, ?, ?)"); PreparedStatement insertSignState = conn.prepareStatement("INSERT INTO `" + wcfg.table + "-state` (id, replacedState, typeState) VALUES (?, ?, ?)");
PreparedStatement deleteSign = conn.prepareStatement("DELETE FROM `" + wcfg.table + "-sign` WHERE id = ?"); PreparedStatement deleteSign = conn.prepareStatement("DELETE FROM `" + wcfg.table + "-sign` WHERE id = ?");
while (true) { while (true) {
rs = st.executeQuery("SELECT id, signtext, replaced, type FROM `" + wcfg.table + "-sign` LEFT JOIN `" + wcfg.table + "-blocks` USING (id) ORDER BY id ASC LIMIT 10000"); rs = st.executeQuery("SELECT id, signtext, replaced, type FROM `" + wcfg.table + "-sign` LEFT JOIN `" + wcfg.table + "-blocks` USING (id) ORDER BY id ASC LIMIT " + BLOCKS_CONVERT_BATCH_SIZE);
boolean anyRow = false; boolean anyRow = false;
while (rs.next()) { while (rs.next()) {
anyRow = true; anyRow = true;