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

Fixed null in consumer.sql

Browse Source
This commit is contained in:
Robin Kupper
2011-07-21 16:29:32 +02:00
parent 8568698469
commit 1738f3a903
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/de/diddiz/LogBlock/Consumer.java
View File

@@ -11,6 +11,7 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Queue; import java.util.Queue;
import java.util.Set; import java.util.Set;
@@ -295,13 +296,16 @@ public class Consumer extends TimerTask
final File file = new File("plugins/LogBlock/consumer/queue.sql"); final File file = new File("plugins/LogBlock/consumer/queue.sql");
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
final PrintWriter writer = new PrintWriter(file); final PrintWriter writer = new PrintWriter(file);
final Set<Integer> insertedPlayers = new HashSet<Integer>();
while (!queue.isEmpty()) { while (!queue.isEmpty()) {
final Row r = queue.poll(); final Row r = queue.poll();
if (r == null) if (r == null)
continue; continue;
for (final String player : r.getPlayers()) for (final String player : r.getPlayers())
if (!players.containsKey(player.hashCode())) if (!players.containsKey(player.hashCode()) && !insertedPlayers.contains(player.hashCode())) {
writer.println("INSERT IGNORE INTO `lb-players` (playername) VALUES ('" + player + "');"); writer.println("INSERT IGNORE INTO `lb-players` (playername) VALUES ('" + player + "');");
insertedPlayers.add(player.hashCode());
}
for (final String insert : r.getInserts()) for (final String insert : r.getInserts())
writer.println(insert); writer.println(insert);
} }
@@ -340,6 +344,15 @@ public class Consumer extends TimerTask
queue.add(new BlockRow(loc, playerName, typeBefore, typeAfter, data, signtext, ca)); queue.add(new BlockRow(loc, playerName, typeBefore, typeAfter, data, signtext, ca));
} }
private String playerID(String playerName) {
if (playerName == null)
return "NULL";
final Integer id = players.get(playerName.hashCode());
if (id != null)
return id.toString();
return "(SELECT playerid FROM `lb-players` WHERE playername = '" + playerName + "')";
}
private static interface Row private static interface Row
{ {
String[] getInserts(); String[] getInserts();
@@ -357,7 +370,7 @@ public class Consumer extends TimerTask
public String[] getInserts() { public String[] getInserts() {
final String table = worlds.get(loc.getWorld().getName().hashCode()).table; final String table = worlds.get(loc.getWorld().getName().hashCode()).table;
final String[] inserts = new String[ca != null || signtext != null ? 2 : 1]; final String[] inserts = new String[ca != null || signtext != null ? 2 : 1];
inserts[0] = "INSERT INTO `" + table + "` (date, playerid, replaced, type, data, x, y, z) VALUES (FROM_UNIXTIME(" + date + "), " + players.get(playerName.hashCode()) + ", " + replaced + ", " + type + ", " + data + ", '" + loc.getBlockX() + "', " + loc.getBlockY() + ", '" + loc.getBlockZ() + "');"; inserts[0] = "INSERT INTO `" + table + "` (date, playerid, replaced, type, data, x, y, z) VALUES (FROM_UNIXTIME(" + date + "), " + playerID(playerName) + ", " + replaced + ", " + type + ", " + data + ", '" + loc.getBlockX() + "', " + loc.getBlockY() + ", '" + loc.getBlockZ() + "');";
if (signtext != null) if (signtext != null)
inserts[1] = "INSERT INTO `" + table + "-sign` (id, signtext) values (LAST_INSERT_ID(), '" + signtext + "');"; inserts[1] = "INSERT INTO `" + table + "-sign` (id, signtext) values (LAST_INSERT_ID(), '" + signtext + "');";
else if (ca != null) else if (ca != null)
@@ -388,7 +401,7 @@ public class Consumer extends TimerTask
@Override @Override
public String[] getInserts() { public String[] getInserts() {
return new String[]{"INSERT INTO `" + worlds.get(worldHash).table + "-kills` (date, killer, victim, weapon) VALUES (FROM_UNIXTIME(" + date + "), " + (killer == null ? "NULL" : players.get(killer.hashCode())) + ", " + players.get(victim.hashCode()) + ", " + weapon + ");"}; return new String[]{"INSERT INTO `" + worlds.get(worldHash).table + "-kills` (date, killer, victim, weapon) VALUES (FROM_UNIXTIME(" + date + "), " + playerID(killer) + ", " + playerID(victim) + ", " + weapon + ");"};
} }
@Override @Override
@@ -410,7 +423,7 @@ public class Consumer extends TimerTask
@Override @Override
public String[] getInserts() { public String[] getInserts() {
return new String[]{"INSERT INTO `lb-chat` (date, playerid, message) VALUES (FROM_UNIXTIME(" + date + "), " + players.get(player.hashCode()) + ", '" + message + "');"}; return new String[]{"INSERT INTO `lb-chat` (date, playerid, message) VALUES (FROM_UNIXTIME(" + date + "), " + playerID(player) + ", '" + message + "');"};
} }
@Override @Override