Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-08 09:54:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Recover on database error

Browse Source 
Might resolve #1476
This commit is contained in:
Jesse Boyd 2017-03-15 02:10:57 +11:00
parent e208d7f72a
commit 8e3407505a
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 99 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View File

@ -304,7 +304,16 @@ public class SQLManager implements AbstractDB {
} }
Runnable task = getGlobalTasks().remove(); Runnable task = getGlobalTasks().remove();
if (task != null) { if (task != null) {
task.run(); try {
task.run();
} catch (Throwable e) {
PS.debug("============ DATABASE ERROR ============");
PS.debug("There was an error updating the database.");
PS.debug(" - It will be correct on shutdown");
PS.debug("========================================");
e.printStackTrace();
PS.debug("========================================");
}
} }
commit(); commit();
return true; return true;
@ -320,26 +329,35 @@ public class SQLManager implements AbstractDB {
UniqueStatement task = null; UniqueStatement task = null;
UniqueStatement lastTask = null; UniqueStatement lastTask = null;
for (Entry<Plot, Queue<UniqueStatement>> entry : this.plotTasks.entrySet()) { for (Entry<Plot, Queue<UniqueStatement>> entry : this.plotTasks.entrySet()) {
Plot plot = entry.getKey(); try {
if (this.plotTasks.get(plot).isEmpty()) { Plot plot = entry.getKey();
this.plotTasks.remove(plot); if (this.plotTasks.get(plot).isEmpty()) {
continue; this.plotTasks.remove(plot);
} continue;
task = this.plotTasks.get(plot).remove();
count++;
if (task != null) {
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task.method;
statement = task.get();
} }
task.set(statement); task = this.plotTasks.get(plot).remove();
task.addBatch(statement); count++;
if (task != null) {
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task.method;
statement = task.get();
}
task.set(statement);
task.addBatch(statement);
}
lastTask = task;
} catch (Throwable e) {
PS.debug("============ DATABASE ERROR ============");
PS.debug("There was an error updating the database.");
PS.debug(" - It will be correct on shutdown");
PS.debug("========================================");
e.printStackTrace();
PS.debug("========================================");
} }
lastTask = task;
} }
if (statement != null && task != null) { if (statement != null && task != null) {
task.execute(statement); task.execute(statement);
@ -356,26 +374,35 @@ public class SQLManager implements AbstractDB {
UniqueStatement task = null; UniqueStatement task = null;
UniqueStatement lastTask = null; UniqueStatement lastTask = null;
for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) { for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
UUID uuid = entry.getKey(); try {
if (this.playerTasks.get(uuid).isEmpty()) { UUID uuid = entry.getKey();
this.playerTasks.remove(uuid); if (this.playerTasks.get(uuid).isEmpty()) {
continue; this.playerTasks.remove(uuid);
} continue;
task = this.playerTasks.get(uuid).remove();
count++;
if (task != null) {
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task.method;
statement = task.get();
} }
task.set(statement); task = this.playerTasks.get(uuid).remove();
task.addBatch(statement); count++;
if (task != null) {
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task.method;
statement = task.get();
}
task.set(statement);
task.addBatch(statement);
}
lastTask = task;
} catch (Throwable e) {
PS.debug("============ DATABASE ERROR ============");
PS.debug("There was an error updating the database.");
PS.debug(" - It will be correct on shutdown");
PS.debug("========================================");
e.printStackTrace();
PS.debug("========================================");
} }
lastTask = task;
} }
if (statement != null && task != null) { if (statement != null && task != null) {
task.execute(statement); task.execute(statement);
@ -392,26 +419,35 @@ public class SQLManager implements AbstractDB {
UniqueStatement task = null; UniqueStatement task = null;
UniqueStatement lastTask = null; UniqueStatement lastTask = null;
for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks.entrySet()) { for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks.entrySet()) {
PlotCluster cluster = entry.getKey(); try {
if (this.clusterTasks.get(cluster).isEmpty()) { PlotCluster cluster = entry.getKey();
this.clusterTasks.remove(cluster); if (this.clusterTasks.get(cluster).isEmpty()) {
continue; this.clusterTasks.remove(cluster);
} continue;
task = this.clusterTasks.get(cluster).remove();
count++;
if (task != null) {
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task.method;
statement = task.get();
} }
task.set(statement); task = this.clusterTasks.get(cluster).remove();
task.addBatch(statement); count++;
if (task != null) {
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task.method;
statement = task.get();
}
task.set(statement);
task.addBatch(statement);
}
lastTask = task;
} catch (Throwable e) {
PS.debug("============ DATABASE ERROR ============");
PS.debug("There was an error updating the database.");
PS.debug(" - It will be correct on shutdown");
PS.debug("========================================");
e.printStackTrace();
PS.debug("========================================");
} }
lastTask = task;
} }
if (statement != null && task != null) { if (statement != null && task != null) {
task.execute(statement); task.execute(statement);
@ -433,8 +469,13 @@ public class SQLManager implements AbstractDB {
if (!this.plotTasks.isEmpty()) { if (!this.plotTasks.isEmpty()) {
this.plotTasks.clear(); this.plotTasks.clear();
} }
} catch (SQLException e) { } catch (Throwable e) {
PS.debug("============ DATABASE ERROR ============");
PS.debug("There was an error updating the database.");
PS.debug(" - It will be correct on shutdown");
PS.debug("========================================");
e.printStackTrace(); e.printStackTrace();
PS.debug("========================================");
} }
return false; return false;
} }
@ -993,9 +1034,11 @@ public class SQLManager implements AbstractDB {
@Override @Override
public void createPlotAndSettings(final Plot plot, Runnable whenDone) { public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
System.out.println("Create plot!");
addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) { addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
@Override @Override
public void set(PreparedStatement stmt) throws SQLException { public void set(PreparedStatement stmt) throws SQLException {
System.out.println("Set and run!");
stmt.setInt(1, plot.getId().x); stmt.setInt(1, plot.getId().x);
stmt.setInt(2, plot.getId().y); stmt.setInt(2, plot.getId().y);
stmt.setString(3, plot.owner.toString()); stmt.setString(3, plot.owner.toString());