Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-01 07:57:43 +02:00
Code Issues Projects Releases Wiki Activity

Nickname table structure optimization

Browse Source 
- Replaced user_id with uuid
- Replaced server_id with server_uuid
This commit is contained in:
Rsl1122 2018-12-13 19:25:15 +02:00
parent 1f6edf0588
commit 918eed1a8f
6 changed files with 121 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
View File

@ -206,7 +206,8 @@ public abstract class SQLDB extends Database {
new WorldTimesOptimizationPatch(this),
new KillsOptimizationPatch(this),
new SessionsOptimizationPatch(this),
new PingOptimizationPatch(this)
new PingOptimizationPatch(this),
new NicknamesOptimizationPatch(this)
};
try {

4
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java
View File

@ -90,8 +90,8 @@ public class NicknameLastSeenPatch extends Patch {
private void updateLastUsed(Map<UUID, Integer> serverIDsByUUID, Map<Integer, Set<Nickname>> nicknames) {
String updateSQL = "UPDATE " + NicknamesTable.TABLE_NAME + " SET " + NicknamesTable.Col.LAST_USED + "=?" +
" WHERE " + NicknamesTable.Col.NICKNAME + "=?" +
" AND " + NicknamesTable.Col.USER_ID + "=?" +
" AND " + NicknamesTable.Col.SERVER_ID + "=?";
" AND user_id=?" +
" AND server_id=?";
db.executeBatch(new ExecStatement(updateSQL) {
@Override

74
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java Normal file
View File

@ -0,0 +1,74 @@
/*
* 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 <https://www.gnu.org/licenses/>.
*/
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.NicknamesTable;
import com.djrapitops.plan.system.database.databases.sql.tables.NicknamesTable.Col;
public class NicknamesOptimizationPatch extends Patch {
private String tempTableName;
private String tableName;
public NicknamesOptimizationPatch(SQLDB db) {
super(db);
tableName = NicknamesTable.TABLE_NAME;
tempTableName = "temp_nicknames";
}
@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.getNicknamesTable().createTable();
db.execute("INSERT INTO " + tableName + " (" +
Col.UUID + ", " +
Col.SERVER_UUID + ", " +
Col.NICKNAME + ", " +
Col.LAST_USED +
") 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.NICKNAME + ", " +
Col.LAST_USED +
" FROM " + tempTableName
);
dropTable(tempTableName);
} catch (Exception e) {
throw new DBOpException(NicknamesOptimizationPatch.class.getSimpleName() + " failed.", e);
}
}
private void tempOldTable() {
if (!hasTable(tempTableName)) {
renameTable(tableName, tempTableName);
}
}
}

16
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/TableSqlParser.java
View File

@ -104,27 +104,27 @@ public class TableSqlParser extends SqlParser {
return this;
}
public TableSqlParser primaryKeyIDColumn(boolean mySQL, Column column) {
return primaryKeyIDColumn(mySQL, column.get());
public TableSqlParser primaryKeyIDColumn(boolean supportsMySQLQueries, Column column) {
return primaryKeyIDColumn(supportsMySQLQueries, column.get());
}
public TableSqlParser primaryKeyIDColumn(boolean mySQL, String column) {
public TableSqlParser primaryKeyIDColumn(boolean supportsMySQLQueries, String column) {
if (columns > 0) {
append(", ");
}
append(column).addSpace();
append(Sql.INT).addSpace();
append((mySQL) ? "NOT NULL AUTO_INCREMENT" : "PRIMARY KEY");
append((supportsMySQLQueries) ? "NOT NULL AUTO_INCREMENT" : "PRIMARY KEY");
columns++;
return this;
}
public TableSqlParser primaryKey(boolean mySQL, Column column) {
return primaryKey(mySQL, column.get());
public TableSqlParser primaryKey(boolean supportsMySQLQueries, Column column) {
return primaryKey(supportsMySQLQueries, column.get());
}
public TableSqlParser primaryKey(boolean mySQL, String column) {
if (mySQL) {
public TableSqlParser primaryKey(boolean supportsMySQLQueries, String column) {
if (supportsMySQLQueries) {
if (columns > 0) {
append(", ");
}

80
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java
View File

@ -37,44 +37,42 @@ import java.util.*;
* <p>
* Table Name: plan_nicknames
* <p>
* For contained columns {@see Col}
* Patches related to this table:
* {@link com.djrapitops.plan.system.database.databases.sql.patches.Version10Patch}
* {@link com.djrapitops.plan.system.database.databases.sql.patches.NicknameLastSeenPatch}
* {@link com.djrapitops.plan.system.database.databases.sql.patches.NicknamesOptimizationPatch}
*
* @author Rsl1122
*/
public class NicknamesTable extends UserIDTable {
public class NicknamesTable extends UserUUIDTable {
public static final String TABLE_NAME = "plan_nicknames";
private final ServerTable serverTable;
private String insertStatement;
private final String updateStatement;
public NicknamesTable(SQLDB db) {
super(TABLE_NAME, db);
serverTable = db.getServerTable();
insertStatement = "INSERT INTO " + tableName + " (" +
Col.USER_ID + ", " +
Col.SERVER_ID + ", " +
Col.UUID + ", " +
Col.SERVER_UUID + ", " +
Col.NICKNAME + ", " +
Col.LAST_USED +
") VALUES (" +
usersTable.statementSelectID + ", " +
serverTable.statementSelectServerID + ", " +
"?, ?)";
") VALUES (?, ?, ?, ?)";
updateStatement = "UPDATE " + tableName + " SET " + Col.LAST_USED + "=?" +
" WHERE " + Col.NICKNAME + "=?" +
" AND " + Col.USER_ID + "=" + usersTable.statementSelectID +
" AND " + Col.SERVER_ID + "=" + serverTable.statementSelectServerID;
" AND " + Col.UUID + "=?" +
" AND " + Col.SERVER_UUID + "=?";
}
@Override
public void createTable() throws DBInitException {
createTable(TableSqlParser.createTable(tableName)
.column(Col.USER_ID, Sql.INT).notNull()
.primaryKeyIDColumn(supportsMySQLQueries, Col.ID)
.column(Col.UUID, Sql.varchar(36)).notNull()
.column(Col.NICKNAME, Sql.varchar(75)).notNull()
.column(Col.SERVER_ID, Sql.INT).notNull()
.column(Col.SERVER_UUID, Sql.varchar(36)).notNull()
.column(Col.LAST_USED, 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()
);
}
@ -88,8 +86,8 @@ public class NicknamesTable extends UserIDTable {
*/
public List<String> getNicknames(UUID uuid, UUID serverUUID) {
String sql = "SELECT " + Col.NICKNAME + " FROM " + tableName +
" WHERE (" + Col.USER_ID + "=" + usersTable.statementSelectID + ")" +
" AND " + Col.SERVER_ID + "=" + serverTable.statementSelectServerID;
" WHERE (" + Col.UUID + "=?)" +
" AND " + Col.SERVER_UUID + "=?";
return query(new QueryStatement<List<String>>(sql, 1000) {
@Override
@ -126,26 +124,20 @@ public class NicknamesTable extends UserIDTable {
}
public Map<UUID, Map<UUID, List<Nickname>>> getAllNicknames() {
String usersIDColumn = usersTable + "." + UsersTable.Col.ID;
String usersUUIDColumn = usersTable + "." + UsersTable.Col.UUID + " as uuid";
String serverIDColumn = serverTable + "." + ServerTable.Col.SERVER_ID;
String serverUUIDColumn = serverTable + "." + ServerTable.Col.SERVER_UUID + " as s_uuid";
String sql = "SELECT " +
Col.NICKNAME + ", " +
Col.LAST_USED + ", " +
usersUUIDColumn + ", " +
serverUUIDColumn +
" FROM " + tableName +
" INNER JOIN " + usersTable + " on " + usersIDColumn + "=" + Col.USER_ID +
" INNER JOIN " + serverTable + " on " + serverIDColumn + "=" + Col.SERVER_ID;
Col.UUID + ", " +
Col.SERVER_UUID +
" FROM " + tableName;
return query(new QueryAllStatement<Map<UUID, Map<UUID, List<Nickname>>>>(sql, 5000) {
@Override
public Map<UUID, Map<UUID, List<Nickname>>> processResults(ResultSet set) throws SQLException {
Map<UUID, Map<UUID, List<Nickname>>> map = new HashMap<>();
while (set.next()) {
UUID serverUUID = UUID.fromString(set.getString("s_uuid"));
UUID uuid = UUID.fromString(set.getString("uuid"));
UUID serverUUID = UUID.fromString(set.getString(Col.SERVER_UUID.get()));
UUID uuid = UUID.fromString(set.getString(Col.UUID.get()));
Map<UUID, List<Nickname>> serverMap = map.getOrDefault(serverUUID, new HashMap<>());
List<Nickname> nicknames = serverMap.getOrDefault(uuid, new ArrayList<>());
@ -169,25 +161,19 @@ public class NicknamesTable extends UserIDTable {
* @see NicknamesTable#getAllNicknames();
*/
public Map<UUID, List<Nickname>> getAllNicknamesUnmapped() {
String usersIDColumn = usersTable + "." + UsersTable.Col.ID;
String usersUUIDColumn = usersTable + "." + UsersTable.Col.UUID + " as uuid";
String serverIDColumn = serverTable + "." + ServerTable.Col.SERVER_ID;
String serverUUIDColumn = serverTable + "." + ServerTable.Col.SERVER_UUID + " as s_uuid";
String sql = "SELECT " +
Col.NICKNAME + ", " +
Col.LAST_USED + ", " +
usersUUIDColumn + ", " +
serverUUIDColumn +
" FROM " + tableName +
" INNER JOIN " + usersTable + " on " + usersIDColumn + "=" + Col.USER_ID +
" INNER JOIN " + serverTable + " on " + serverIDColumn + "=" + Col.SERVER_ID;
Col.UUID + ", " +
Col.SERVER_UUID +
" FROM " + tableName;
return query(new QueryAllStatement<Map<UUID, List<Nickname>>>(sql, 5000) {
@Override
public Map<UUID, List<Nickname>> processResults(ResultSet set) throws SQLException {
Map<UUID, List<Nickname>> map = new HashMap<>();
while (set.next()) {
UUID uuid = UUID.fromString(set.getString("uuid"));
UUID serverUUID = UUID.fromString(set.getString("s_uuid"));
UUID uuid = UUID.fromString(set.getString(Col.UUID.get()));
UUID serverUUID = UUID.fromString(set.getString(Col.SERVER_UUID.get()));
List<Nickname> nicknames = map.computeIfAbsent(uuid, x -> new ArrayList<>());
nicknames.add(new Nickname(
set.getString(Col.NICKNAME.get()), set.getLong(Col.LAST_USED.get()), serverUUID
@ -232,15 +218,12 @@ public class NicknamesTable extends UserIDTable {
}
public List<Nickname> getNicknameInformation(UUID uuid) {
String serverIDColumn = serverTable + "." + ServerTable.Col.SERVER_ID;
String serverUUIDColumn = serverTable + "." + ServerTable.Col.SERVER_UUID + " as s_uuid";
String sql = "SELECT " +
Col.NICKNAME + ", " +
Col.LAST_USED + ", " +
serverUUIDColumn +
Col.SERVER_UUID +
" FROM " + tableName +
" INNER JOIN " + serverTable + " on " + serverIDColumn + "=" + Col.SERVER_ID +
" WHERE (" + Col.USER_ID + "=" + usersTable.statementSelectID + ")";
" WHERE (" + Col.UUID + "=?)";
return query(new QueryStatement<List<Nickname>>(sql, 5000) {
@ -253,7 +236,7 @@ public class NicknamesTable extends UserIDTable {
public List<Nickname> processResults(ResultSet set) throws SQLException {
List<Nickname> nicknames = new ArrayList<>();
while (set.next()) {
UUID serverUUID = UUID.fromString(set.getString("s_uuid"));
UUID serverUUID = UUID.fromString(set.getString(Col.SERVER_UUID.get()));
String nickname = set.getString(Col.NICKNAME.get());
nicknames.add(new Nickname(nickname, set.getLong(Col.LAST_USED.get()), serverUUID));
}
@ -291,8 +274,13 @@ public class NicknamesTable extends UserIDTable {
}
public enum Col implements Column {
ID("id"),
@Deprecated
USER_ID(UserIDTable.Col.USER_ID.get()),
UUID(UserUUIDTable.Col.UUID.get()),
@Deprecated
SERVER_ID("server_id"),
SERVER_UUID("server_uuid"),
NICKNAME("nickname"),
LAST_USED("last_used");

2
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java
View File

@ -249,7 +249,7 @@ public class UsersTable extends UserUUIDTable {
String sql = "SELECT DISTINCT " + Col.USER_NAME + " FROM " + tableName +
" WHERE LOWER(" + Col.USER_NAME + ") LIKE LOWER(?)" +
" UNION SELECT DISTINCT " + Col.USER_NAME + " FROM " + tableName +
" INNER JOIN " + nicknamesTable + " on " + Col.ID + "=" + nicknamesTable + "." + NicknamesTable.Col.USER_ID +
" INNER JOIN " + nicknamesTable + " on " + Col.UUID + "=" + nicknamesTable + "." + NicknamesTable.Col.UUID +
" WHERE LOWER(" + NicknamesTable.Col.NICKNAME + ") LIKE LOWER(?)";
return query(new QueryStatement<List<String>>(sql, 5000) {