diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
index 666cca03b..9b546cee2 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
@@ -202,8 +202,9 @@ public abstract class SQLDB extends Database {
new NicknameLastSeenPatch(this),
new VersionTableRemovalPatch(this),
new DiskUsagePatch(this),
+ new WorldsOptimizationPatch(this),
new WorldTimesOptimizationPatch(this),
- new WorldsOptimizationPatch(this)
+ new SessionsOptimizationPatch(this)
};
try {
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java
new file mode 100644
index 000000000..a04c542ed
--- /dev/null
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java
@@ -0,0 +1,82 @@
+/*
+ * This file is part of Player Analytics (Plan).
+ *
+ * Plan is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License v3 as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plan is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Plan. If not, see .
+ */
+package com.djrapitops.plan.system.database.databases.sql.patches;
+
+import com.djrapitops.plan.api.exceptions.database.DBOpException;
+import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable;
+import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable.Col;
+
+public class SessionsOptimizationPatch extends Patch {
+
+ private String tempTableName;
+ private String tableName;
+
+ public SessionsOptimizationPatch(SQLDB db) {
+ super(db);
+ tableName = SessionsTable.TABLE_NAME;
+ tempTableName = "temp_sessions";
+ }
+
+ @Override
+ public boolean hasBeenApplied() {
+ return hasColumn(tableName, Col.UUID.get())
+ && hasColumn(tableName, Col.SERVER_UUID.get())
+ && !hasColumn(tableName, "user_id")
+ && !hasColumn(tableName, "server_id")
+ && !hasTable(tempTableName); // If this table exists the patch has failed to finish.
+ }
+
+ @Override
+ public void apply() {
+ try {
+ tempOldTable();
+ db.getSessionsTable().createTable();
+
+ db.execute("INSERT INTO " + tableName + " (" +
+ Col.UUID + ", " +
+ Col.SERVER_UUID + ", " +
+ Col.ID + ", " +
+ Col.SESSION_START + ", " +
+ Col.SESSION_END + ", " +
+ Col.MOB_KILLS + ", " +
+ Col.DEATHS + ", " +
+ Col.AFK_TIME +
+ ") SELECT " +
+ "(SELECT plan_users.uuid FROM plan_users WHERE plan_users.id = " + tempTableName + ".user_id LIMIT 1), " +
+ "(SELECT plan_servers.uuid FROM plan_servers WHERE plan_servers.id = " + tempTableName + ".server_id LIMIT 1), " +
+ Col.ID + ", " +
+ Col.SESSION_START + ", " +
+ Col.SESSION_END + ", " +
+ Col.MOB_KILLS + ", " +
+ Col.DEATHS + ", " +
+ Col.AFK_TIME +
+ " FROM " + tempTableName
+ );
+
+ dropTable(tempTableName);
+ } catch (Exception e) {
+ throw new DBOpException(SessionsOptimizationPatch.class.getSimpleName() + " failed.", e);
+ }
+ }
+
+ private void tempOldTable() {
+ if (!hasTable(tempTableName)) {
+ renameTable(tableName, tempTableName);
+ }
+ }
+}
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java
index 18273fc71..de5ea70c9 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java
@@ -89,19 +89,17 @@ public class WorldsServerIDPatch extends Patch {
WorldTimesTable worldTimesTable = db.getWorldTimesTable();
SessionsTable sessionsTable = db.getSessionsTable();
- String statementSelectServerID = db.getServerTable().statementSelectServerID;
-
String worldIDColumn = worldTimesTable + "." + WorldTimesTable.Col.WORLD_ID;
String worldSessionIDColumn = worldTimesTable + "." + WorldTimesTable.Col.SESSION_ID;
String sessionIDColumn = sessionsTable + "." + SessionsTable.Col.ID;
- String sessionServerIDColumn = sessionsTable + "." + SessionsTable.Col.SERVER_ID;
+ String sessionServerUUIDColumn = sessionsTable + "." + SessionsTable.Col.SERVER_UUID;
String sql = "SELECT DISTINCT " +
WorldTable.Col.NAME + " FROM " +
WorldTable.TABLE_NAME +
" INNER JOIN " + worldTimesTable + " on " + worldIDColumn + "=" + WorldTable.TABLE_NAME + "." + WorldTable.Col.ID +
" INNER JOIN " + sessionsTable + " on " + worldSessionIDColumn + "=" + sessionIDColumn +
- " WHERE " + statementSelectServerID + "=" + sessionServerIDColumn;
+ " WHERE " + sessionServerUUIDColumn + "=?";
return query(new QueryStatement>(sql, 1000) {
@Override
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java
index 9c0c4676b..a4512c78b 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java
@@ -37,45 +37,45 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
+ * Table that represents plan_sessions.
+ *
+ * Patches related to this table:
+ * {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch}
+ * {@link com.djrapitops.plan.system.database.databases.sql.patches.SessionAFKTimePatch}
+ * {@link com.djrapitops.plan.system.database.databases.sql.patches.SessionsOptimizationPatch}
+ *
* @author Rsl1122
*/
public class SessionsTable extends UserIDTable {
public static final String TABLE_NAME = "plan_sessions";
- private final ServerTable serverTable;
private String insertStatement;
public SessionsTable(SQLDB db) {
super(TABLE_NAME, db);
- serverTable = db.getServerTable();
insertStatement = "INSERT INTO " + tableName + " ("
- + Col.USER_ID + ", "
+ + Col.UUID + ", "
+ Col.SESSION_START + ", "
+ Col.SESSION_END + ", "
+ Col.DEATHS + ", "
+ Col.MOB_KILLS + ", "
+ Col.AFK_TIME + ", "
- + Col.SERVER_ID
- + ") VALUES ("
- + usersTable.statementSelectID + ", "
- + "?, ?, ?, ?, ?, "
- + serverTable.statementSelectServerID + ")";
+ + Col.SERVER_UUID
+ + ") VALUES (?, ?, ?, ?, ?, ?, ?)";
}
@Override
public void createTable() throws DBInitException {
createTable(TableSqlParser.createTable(this.tableName)
.primaryKeyIDColumn(supportsMySQLQueries, Col.ID)
- .column(Col.USER_ID, Sql.INT).notNull()
- .column(Col.SERVER_ID, Sql.INT).notNull()
+ .column(Col.UUID, Sql.varchar(36)).notNull()
+ .column(Col.SERVER_UUID, Sql.varchar(36)).notNull()
.column(Col.SESSION_START, Sql.LONG).notNull()
.column(Col.SESSION_END, Sql.LONG).notNull()
.column(Col.MOB_KILLS, Sql.INT).notNull()
.column(Col.DEATHS, Sql.INT).notNull()
.column(Col.AFK_TIME, Sql.LONG).notNull()
- .foreignKey(Col.USER_ID, usersTable.getTableName(), UsersTable.Col.ID)
- .foreignKey(Col.SERVER_ID, serverTable.getTableName(), ServerTable.Col.SERVER_ID)
.primaryKey(supportsMySQLQueries, Col.ID)
.toString()
);
@@ -90,7 +90,7 @@ public class SessionsTable extends UserIDTable {
*/
private int getSessionID(UUID uuid, Session session) {
String sql = "SELECT " + Col.ID + " FROM " + tableName +
- " WHERE " + Col.USER_ID + "=" + usersTable.statementSelectID +
+ " WHERE " + Col.UUID + "=?" +
" AND " + Col.SESSION_START + "=?" +
" AND " + Col.SESSION_END + "=?";
@@ -164,9 +164,8 @@ public class SessionsTable extends UserIDTable {
* @return Map with Sessions that don't contain Kills or WorldTimes.
*/
private Map> getSessionInformation(UUID uuid) {
- Map serverUUIDs = serverTable.getServerUUIDsByID();
String sql = Select.from(tableName, "*")
- .where(Col.USER_ID + "=" + usersTable.statementSelectID)
+ .where(Col.UUID + "=?")
.toString();
return query(new QueryStatement