From 2f66bfa78c667b8f17acc2c063c92be6fee59921 Mon Sep 17 00:00:00 2001 From: Alexander Meech Date: Tue, 7 Nov 2017 00:17:58 -0500 Subject: [PATCH] Revert "Revert "Implement a stat bucket filler tool"" This reverts commit 0e95fa3ce7c78c8a10faf6135ccaa2426d7904c1. --- .../mineplex/statconverter/BucketFiller.java | 192 ++++++++++++++++++ .../src/com/mineplex/statconverter/Main.java | 26 ++- 2 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 Tools/Stat Conversion/src/com/mineplex/statconverter/BucketFiller.java diff --git a/Tools/Stat Conversion/src/com/mineplex/statconverter/BucketFiller.java b/Tools/Stat Conversion/src/com/mineplex/statconverter/BucketFiller.java new file mode 100644 index 000000000..20bace50d --- /dev/null +++ b/Tools/Stat Conversion/src/com/mineplex/statconverter/BucketFiller.java @@ -0,0 +1,192 @@ +package com.mineplex.statconverter; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.regex.Pattern; + +import com.google.common.io.Files; +import com.mineplex.statconverter.database.mysql.DBPool; + +public class BucketFiller +{ + private File _info; + + private boolean _complete = false; + + private List _statIds; + private int _nextStat; + private int _nextStartLimit; + + public BucketFiller() + { + int stat = 0; + int startLimit = 0; + try + { + if (new File(new File(".").getCanonicalPath() + File.separator + "completeBuckets.dat").exists()) + { + return; + } + _info = new File(new File(".").getCanonicalPath() + File.separator + "bucketInfo.dat"); + System.out.println(_info.getCanonicalPath()); + + _statIds = loadStatIds(); + if (_statIds.isEmpty() || _statIds == null) + { + return; + } + + if (_info.exists()) + { + String startStr = Files.readFirstLine(_info, Charset.defaultCharset()); + if (startStr != null && !startStr.isEmpty() && startStr.contains(",") && !startStr.endsWith(",") && !startStr.startsWith(",")) + { + String[] starts = startStr.split(Pattern.quote(",")); + stat = Integer.parseInt(starts[0]); + startLimit = Integer.parseInt(starts[1]); + } + } + else + { + _info.createNewFile(); + stat = _statIds.get(0); + Files.write((stat + ",0").getBytes(), _info); + } + + _nextStat = stat; + _nextStartLimit = startLimit; + + while (!_complete) + { + try + { + convertStat(_nextStat, _nextStartLimit); + } + catch (SQLException | IOException e) + { + e.printStackTrace(); + break; + } + } + } + catch (IOException e) + { + e.printStackTrace(); + return; + } + } + + private List loadStatIds() + { + List ids = new ArrayList<>(); + + try (Connection c = DBPool.getDataSource("ACCOUNT_PC").getConnection(); + PreparedStatement ps = c.prepareStatement("SELECT id FROM stats ORDER BY id DESC;"); + ResultSet rs = ps.executeQuery(); + ) + { + while (rs.next()) + { + ids.add(rs.getInt("id")); + } + } + catch (SQLException e) + { + e.printStackTrace(); + return null; + } + + return ids; + } + + private void convertStat(int stat, int start) throws SQLException, IOException + { + System.out.println("[INFO] Starting " + stat + ": " + start + " to " + (start + 9999)); + Map accounts = new HashMap<>(); + try (Connection c = DBPool.getDataSource("ACCOUNT_PC").getConnection()) + { + try (Statement s = c.createStatement(); + ResultSet rs = s.executeQuery("SELECT accountId, value FROM accountStatsAllTime WHERE statId=" + stat + " LIMIT " + start + ",10000;") + ) + { + while (rs.next()) + { + accounts.put(rs.getInt("accountId"), rs.getLong("value")); + } + } + + if (!accounts.isEmpty()) + { + for (Entry entry : accounts.entrySet()) + { + Long value = entry.getValue(); + try (Statement s = c.createStatement()) + { + s.execute("UPDATE accountStatsAllTimeBuckets SET playerCount=playerCount+1 WHERE minScore <= " + value + " AND maxScore >= " + value + " AND statId=" + stat + " LIMIT 1;"); + } + } + completeStatGroup(stat, start); + } + else + { + try + { + completeStat(stat); + } + catch (IndexOutOfBoundsException ex) + { + complete(); + } + } + } + } + + private void completeStatGroup(int stat, int start) throws IOException + { + _nextStartLimit = start + 10000; + if (_info.delete()) + { + _info.createNewFile(); + Files.write((stat + "," + start).getBytes(), _info); + System.out.println("[INFO] Completed " + stat + ": " + start + " to " + (_nextStartLimit - 1)); + } + else + { + throw new IOException("Unable to delete info file"); + } + } + + private void completeStat(int stat) throws IOException, IndexOutOfBoundsException + { + if (_info.delete()) + { + _info.createNewFile(); + Files.write((stat + "," + 0).getBytes(), _info); + System.out.println("[INFO] Conversion of stat " + stat + " complete"); + } + else + { + throw new IOException("Unable to delete info file"); + } + _nextStat = _statIds.get(_statIds.indexOf(stat) + 1); + _nextStartLimit = 0; + } + + private void complete() throws IOException + { + _complete = true; + System.out.println("[INFO] Conversion of buckets complete"); + new File(new File(".").getCanonicalPath() + File.separator + "completeBuckets.dat").createNewFile(); + } +} \ No newline at end of file diff --git a/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java b/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java index 6cb37ba86..03f4cf18f 100644 --- a/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java +++ b/Tools/Stat Conversion/src/com/mineplex/statconverter/Main.java @@ -20,7 +20,21 @@ public class Main { public static void main(String[] args) { - new Main(); + try + { + if (new File(new File(".").getCanonicalPath() + File.separator + "doBuckets.dat").exists()) + { + new BucketFiller(); + } + else + { + new Main(); + } + } + catch (IOException e) + { + new Main(); + } } private File _info; @@ -51,7 +65,7 @@ public class Main else { _info.createNewFile(); - Files.write("0".getBytes(), _info); + Files.write(String.valueOf(0).getBytes(), _info); } _nextStart = start; @@ -76,7 +90,7 @@ public class Main { try (Statement s = c.createStatement(); ResultSet rs = s.executeQuery("SELECT DISTINCT accountId FROM accountStat LIMIT " + start + ",10000;") - ) + ) { while (rs.next()) { @@ -92,7 +106,7 @@ public class Main Map newStats = new HashMap<>(); try (Statement s = c.createStatement(); ResultSet rs = s.executeQuery("SELECT statId, value FROM accountStat WHERE accountId=" + accountId + ";") - ) + ) { while (rs.next()) { @@ -101,7 +115,7 @@ public class Main } try (Statement s = c.createStatement(); ResultSet rs = s.executeQuery("SELECT statId, value FROM accountStatsAllTime WHERE accountId=" + accountId + ";") - ) + ) { while (rs.next()) { @@ -167,7 +181,7 @@ public class Main try { _info.createNewFile(); - Files.write((_nextStart + "").getBytes(), _info); + Files.write(String.valueOf(_nextStart).getBytes(), _info); System.out.println("[INFO] Completed " + start + " to " + (_nextStart - 1)); } catch (IOException e)