Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-26 21:50:08 +01:00
Code Issues Projects Releases Wiki Activity

Removes DBCommitProcessor

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-23 10:42:19 +02:00
parent 5de5ea25a8
commit dc08f96d43
7 changed files with 20 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Plan/src/main/java/com/djrapitops/plan/data/handling/DBCommitProcessor.java
View File

@ -1,29 +0,0 @@
/*
* Licence is provided in the jar as license.yml also here:
* https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
*/
package main.java.com.djrapitops.plan.data.handling;
import main.java.com.djrapitops.plan.database.Database;
import main.java.com.djrapitops.plan.queue.processing.Processor;
/**
* Processor for queueing a Database Commit after changes.
*
* @author Rsl1122
*/
public class DBCommitProcessor extends Processor<Database> {
public DBCommitProcessor(Database object) {
super(object);
}
@Override
public void process() {
// TODO Prevent Commit during batch operations.
/*try {
TODO FIX object.commit();
} catch (SQLException e) {
Log.toLog(this.getClass().getName(), e);
}*/
}
}

35
Plan/src/main/java/com/djrapitops/plan/data/listeners/PeriodicDBCommitTask.java
View File

@ -1,35 +0,0 @@
/*
* Licence is provided in the jar as license.yml also here:
* https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
*/
package main.java.com.djrapitops.plan.data.listeners;
import com.djrapitops.plugin.task.AbsRunnable;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.handling.DBCommitProcessor;
import main.java.com.djrapitops.plan.database.Database;
/**
* Periodically commits changes to the SQLite Database.
*
* @author Rsl1122
*/
public class PeriodicDBCommitTask extends AbsRunnable {
private Plan plugin;
public PeriodicDBCommitTask(Plan plugin) {
super("PeriodicDBCommitTask");
this.plugin = plugin;
}
@Override
public void run() {
Database db = plugin.getDB();
if ("mysql".equals(db.getConfigName())) {
this.cancel();
return;
}
plugin.addToProcessQueue(new DBCommitProcessor(db));
}
}

4
Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
View File

@ -4,7 +4,6 @@ import com.djrapitops.plugin.utilities.player.Fetch;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.Session;
import main.java.com.djrapitops.plan.data.cache.DataCache;
import main.java.com.djrapitops.plan.data.handling.DBCommitProcessor;
import main.java.com.djrapitops.plan.data.handling.player.*;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import org.bukkit.entity.Player;
@ -97,8 +96,7 @@ public class PlanPlayerListener implements Listener {
plugin.addToProcessQueue(
new RegisterProcessor(uuid, time, playersOnline), //TODO Add required variables after UsersTable is done.
new IPUpdateProcessor(uuid, ip),
new NameProcessor(uuid, playerName, displayName),
new DBCommitProcessor(plugin.getDB())
new NameProcessor(uuid, playerName, displayName)
);
}

16
Plan/src/main/java/com/djrapitops/plan/database/databases/MySQLDB.java
View File

@ -28,12 +28,18 @@ public class MySQLDB extends SQLDB {
dataSource = new BasicDataSource();
dataSource.setDriverClassName("com.mysql.jdbc.Driver");
dataSource.setUrl("jdbc:mysql://" + config.getString("Database.MySQL.Host") + ":" + config.getString("Database.MySQL.Port") + "/"
+ config.getString("Database.MySQL.Database")
+ "?rewriteBatchedStatements=true");
String host = config.getString("Database.MySQL.Host");
String port = config.getString("Database.MySQL.Port");
String database = config.getString("Database.MySQL.Database");
dataSource.setUsername(config.getString("Database.MySQL.User"));
dataSource.setPassword(config.getString("Database.MySQL.Password"));
dataSource.setUrl("jdbc:mysql://" + host + ":" + port + "/" + database + "?rewriteBatchedStatements=true");
String username = config.getString("Database.MySQL.User");
String password = config.getString("Database.MySQL.Password");
dataSource.setUsername(username);
dataSource.setPassword(password);
dataSource.setMaxTotal(-1);
}

10
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -67,7 +67,7 @@ public abstract class SQLDB extends Database {
String benchName = "Init " + getConfigName();
Benchmark.start(benchName);
try {
if (!setupDatabases()) {
if (!setupDatabase()) {
return false;
}
clean();
@ -89,7 +89,7 @@ public abstract class SQLDB extends Database {
* @return Is the connection usable?
* @throws SQLException
*/
public boolean setupDatabases() throws SQLException {
public boolean setupDatabase() throws SQLException {
boolean newDatabase = isNewDatabase();
if (!versionTable.createTable()) {
@ -233,7 +233,7 @@ public abstract class SQLDB extends Database {
Benchmark.start("Remove Account");
Log.debug("Database", "Removing Account: " + uuid);
try {
setupDatabases();
setupDatabase();
} catch (Exception e) {
Log.toLog(this.getClass().getName(), e);
return false;
@ -259,7 +259,7 @@ public abstract class SQLDB extends Database {
public void clean() {
Log.info("Cleaning the database.");
try {
setupDatabases();
setupDatabase();
tpsTable.clean();
Log.info("Clean complete.");
} catch (SQLException e) {
@ -331,7 +331,7 @@ public abstract class SQLDB extends Database {
}
public Connection getConnection() throws SQLException {
return dataSource.getConnection();
return getDataSource().getConnection();
}
/**

3
Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java
View File

@ -1,7 +1,5 @@
package main.java.com.djrapitops.plan.database.sql;
import main.java.com.djrapitops.plan.Log;
public class Select extends WhereParser {
public Select(String start) {
@ -19,7 +17,6 @@ public class Select extends WhereParser {
}
parser.append(" FROM ").append(table);
Log.debug(parser.toString());
return parser;
}
}

6
Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java
View File

@ -312,7 +312,7 @@ public class WebServer {
Plan plan = Plan.getInstance();
if (!checkKey(plan, key)) {
if (!checkKey(key)) {
String error = "Server Key not given or invalid";
return PageCacheHandler.loadPage(error, () -> {
ForbiddenResponse forbidden = new ForbiddenResponse();
@ -336,8 +336,8 @@ public class WebServer {
}
}
private boolean checkKey(Plan plan, String key) {
UUID uuid = plan.getServerInfoManager().getServerUUID();
private boolean checkKey(String key) {
UUID uuid = Plan.getServerUUID();
UUID keyUUID;
try {
keyUUID = UUID.fromString(key);