Better performance @ init

This commit is contained in:
Fuzzlemann 2017-08-24 20:53:49 +02:00
parent 6949ca9ee9
commit bb20a05791
4 changed files with 16 additions and 8 deletions

View File

@ -40,7 +40,8 @@ public class MySQLDB extends SQLDB {
dataSource.setUsername(username);
dataSource.setPassword(password);
dataSource.setMaxTotal(8);
dataSource.setInitialSize(1);
dataSource.setMaxTotal(120);
}
/**

View File

@ -63,7 +63,6 @@ public abstract class SQLDB extends Database {
*/
@Override
public boolean init() {
super.init();
setStatus("Init");
String benchName = "Init " + getConfigName();
Benchmark.start(benchName);
@ -73,6 +72,7 @@ public abstract class SQLDB extends Database {
if (!setupDatabase()) {
return false;
}
clean();
return true;
} catch (SQLException e) {
@ -108,14 +108,20 @@ public abstract class SQLDB extends Database {
return false;
}
if (newDatabase || getVersion() < 8) {
int version = getVersion();
boolean newVersion = version < 8;
if (newDatabase || newVersion) {
setVersion(8);
}
try (Statement statement = getConnection().createStatement()) {
statement.execute("DROP TABLE IF EXISTS plan_locations");
endTransaction(statement.getConnection());
if (newVersion) {
try (Statement statement = getConnection().createStatement()) {
statement.execute("DROP TABLE IF EXISTS plan_locations");
endTransaction(statement.getConnection());
}
}
return true;
}
@ -258,7 +264,6 @@ public abstract class SQLDB extends Database {
public void clean() {
Log.info("Cleaning the database.");
try {
setupDatabase();
tpsTable.clean();
Log.info("Clean complete.");
} catch (SQLException e) {

View File

@ -56,6 +56,7 @@ public class UsersTable extends UserIDTable {
try {
Set<UUID> uuids = new HashSet<>();
statement = prepareStatement(Select.from(tableName, columnUUID).toString());
statement.setFetchSize(2000);
set = statement.executeQuery();
while (set.next()) {
UUID uuid = UUID.fromString(set.getString(columnUUID));

View File

@ -1,5 +1,6 @@
package main.java.com.djrapitops.plan.database.tables;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.database.databases.SQLDB;
import main.java.com.djrapitops.plan.database.sql.Sql;
import main.java.com.djrapitops.plan.database.sql.TableSqlParser;
@ -69,7 +70,7 @@ public class VersionTable extends Table {
}
return version;
} catch (Exception exc) {
exc.printStackTrace();
Log.toLog("VersionsTable.getVersion", exc);
} finally {
endTransaction(statement);
close(set, statement);