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

Removed NicknamesTable.Col

Browse Source
This commit is contained in:
Rsl1122 2019-01-24 15:00:40 +02:00
parent 857892b0e3
commit a8a871d931
4 changed files with 45 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknameLastSeenPatch.java
View File

@ -37,16 +37,16 @@ public class NicknameLastSeenPatch extends Patch {
@Override @Override
public boolean hasBeenApplied() { public boolean hasBeenApplied() {
return hasColumn(NicknamesTable.TABLE_NAME, NicknamesTable.Col.LAST_USED.get()); return hasColumn(NicknamesTable.TABLE_NAME, NicknamesTable.LAST_USED);
} }
@Override @Override
protected void applyPatch() { protected void applyPatch() {
addColumn(NicknamesTable.TABLE_NAME, addColumn(NicknamesTable.TABLE_NAME,
NicknamesTable.Col.LAST_USED + " bigint NOT NULL DEFAULT '0'" NicknamesTable.LAST_USED + " bigint NOT NULL DEFAULT '0'"
); );
if (hasColumn(NicknamesTable.TABLE_NAME, NicknamesTable.Col.UUID.get())) { if (hasColumn(NicknamesTable.TABLE_NAME, NicknamesTable.USER_UUID)) {
// NicknamesOptimizationPatch makes this patch incompatible with newer patch versions. // NicknamesOptimizationPatch makes this patch incompatible with newer patch versions.
return; return;
} }
@ -69,7 +69,7 @@ public class NicknameLastSeenPatch extends Patch {
private Map<Integer, UUID> getServerUUIDsByID() { private Map<Integer, UUID> getServerUUIDsByID() {
String sql = Select.from(ServerTable.TABLE_NAME, String sql = Select.from(ServerTable.TABLE_NAME,
ServerTable.Col.SERVER_ID, ServerTable.Col.SERVER_UUID) ServerTable.SERVER_ID, ServerTable.SERVER_UUID)
.toString(); .toString();
return query(new QueryAllStatement<Map<Integer, UUID>>(sql) { return query(new QueryAllStatement<Map<Integer, UUID>>(sql) {
@ -77,8 +77,8 @@ public class NicknameLastSeenPatch extends Patch {
public Map<Integer, UUID> processResults(ResultSet set) throws SQLException { public Map<Integer, UUID> processResults(ResultSet set) throws SQLException {
Map<Integer, UUID> uuids = new HashMap<>(); Map<Integer, UUID> uuids = new HashMap<>();
while (set.next()) { while (set.next()) {
int id = set.getInt(ServerTable.Col.SERVER_ID.get()); int id = set.getInt(ServerTable.SERVER_ID);
uuids.put(id, UUID.fromString(set.getString(ServerTable.Col.SERVER_UUID.get()))); uuids.put(id, UUID.fromString(set.getString(ServerTable.SERVER_UUID)));
} }
return uuids; return uuids;
} }
@ -112,8 +112,8 @@ public class NicknameLastSeenPatch extends Patch {
} }
private void updateLastUsed(Map<UUID, Integer> serverIDsByUUID, Map<Integer, Set<Nickname>> nicknames) { private void updateLastUsed(Map<UUID, Integer> serverIDsByUUID, Map<Integer, Set<Nickname>> nicknames) {
String updateSQL = "UPDATE " + NicknamesTable.TABLE_NAME + " SET " + NicknamesTable.Col.LAST_USED + "=?" + String updateSQL = "UPDATE " + NicknamesTable.TABLE_NAME + " SET " + NicknamesTable.LAST_USED + "=?" +
" WHERE " + NicknamesTable.Col.NICKNAME + "=?" + " WHERE " + NicknamesTable.NICKNAME + "=?" +
" AND user_id=?" + " AND user_id=?" +
" AND server_id=?"; " AND server_id=?";

17
Plan/common/src/main/java/com/djrapitops/plan/db/patches/NicknamesOptimizationPatch.java
View File

@ -19,7 +19,6 @@ package com.djrapitops.plan.db.patches;
import com.djrapitops.plan.api.exceptions.database.DBOpException; import com.djrapitops.plan.api.exceptions.database.DBOpException;
import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.sql.tables.NicknamesTable; import com.djrapitops.plan.db.sql.tables.NicknamesTable;
import com.djrapitops.plan.db.sql.tables.NicknamesTable.Col;
public class NicknamesOptimizationPatch extends Patch { public class NicknamesOptimizationPatch extends Patch {
@ -34,8 +33,8 @@ public class NicknamesOptimizationPatch extends Patch {
@Override @Override
public boolean hasBeenApplied() { public boolean hasBeenApplied() {
return hasColumn(tableName, Col.UUID.get()) return hasColumn(tableName, NicknamesTable.USER_UUID)
&& hasColumn(tableName, Col.SERVER_UUID.get()) && hasColumn(tableName, NicknamesTable.SERVER_UUID)
&& !hasColumn(tableName, "user_id") && !hasColumn(tableName, "user_id")
&& !hasColumn(tableName, "server_id") && !hasColumn(tableName, "server_id")
&& !hasTable(tempTableName); // If this table exists the patch has failed to finish. && !hasTable(tempTableName); // If this table exists the patch has failed to finish.
@ -48,15 +47,15 @@ public class NicknamesOptimizationPatch extends Patch {
db.getNicknamesTable().createTable(); db.getNicknamesTable().createTable();
execute("INSERT INTO " + tableName + " (" + execute("INSERT INTO " + tableName + " (" +
Col.UUID + ", " + NicknamesTable.USER_UUID + ", " +
Col.SERVER_UUID + ", " + NicknamesTable.SERVER_UUID + ", " +
Col.NICKNAME + ", " + NicknamesTable.NICKNAME + ", " +
Col.LAST_USED + NicknamesTable.LAST_USED +
") SELECT " + ") SELECT " +
"(SELECT plan_users.uuid FROM plan_users WHERE plan_users.id = " + tempTableName + ".user_id LIMIT 1), " + "(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), " + "(SELECT plan_servers.uuid FROM plan_servers WHERE plan_servers.id = " + tempTableName + ".server_id LIMIT 1), " +
Col.NICKNAME + ", " + NicknamesTable.NICKNAME + ", " +
Col.LAST_USED + NicknamesTable.LAST_USED +
" FROM " + tempTableName " FROM " + tempTableName
); );

94
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/NicknamesTable.java
View File

@ -26,10 +26,8 @@ import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.patches.NicknameLastSeenPatch; import com.djrapitops.plan.db.patches.NicknameLastSeenPatch;
import com.djrapitops.plan.db.patches.NicknamesOptimizationPatch; import com.djrapitops.plan.db.patches.NicknamesOptimizationPatch;
import com.djrapitops.plan.db.patches.Version10Patch; import com.djrapitops.plan.db.patches.Version10Patch;
import com.djrapitops.plan.db.sql.parsing.Column;
import com.djrapitops.plan.db.sql.parsing.CreateTableParser; import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
import com.djrapitops.plan.db.sql.parsing.Sql; import com.djrapitops.plan.db.sql.parsing.Sql;
import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
import com.djrapitops.plugin.utilities.Verify; import com.djrapitops.plugin.utilities.Verify;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -65,15 +63,15 @@ public class NicknamesTable extends UserUUIDTable {
public NicknamesTable(SQLDB db) { public NicknamesTable(SQLDB db) {
super(TABLE_NAME, db); super(TABLE_NAME, db);
insertStatement = "INSERT INTO " + tableName + " (" + insertStatement = "INSERT INTO " + tableName + " (" +
Col.UUID + ", " + USER_UUID + ", " +
Col.SERVER_UUID + ", " + SERVER_UUID + ", " +
Col.NICKNAME + ", " + NICKNAME + ", " +
Col.LAST_USED + LAST_USED +
") VALUES (?, ?, ?, ?)"; ") VALUES (?, ?, ?, ?)";
updateStatement = "UPDATE " + tableName + " SET " + Col.LAST_USED + "=?" + updateStatement = "UPDATE " + tableName + " SET " + LAST_USED + "=?" +
" WHERE " + Col.NICKNAME + "=?" + " WHERE " + NICKNAME + "=?" +
" AND " + Col.UUID + "=?" + " AND " + USER_UUID + "=?" +
" AND " + Col.SERVER_UUID + "=?"; " AND " + SERVER_UUID + "=?";
} }
public static String createTableSQL(DBType dbType) { public static String createTableSQL(DBType dbType) {
@ -88,15 +86,7 @@ public class NicknamesTable extends UserUUIDTable {
@Override @Override
public void createTable() throws DBInitException { public void createTable() throws DBInitException {
createTable(TableSqlParser.createTable(tableName) createTable(createTableSQL(db.getType()));
.primaryKeyIDColumn(supportsMySQLQueries, Col.ID)
.column(Col.UUID, Sql.varchar(36)).notNull()
.column(Col.NICKNAME, Sql.varchar(75)).notNull()
.column(Col.SERVER_UUID, Sql.varchar(36)).notNull()
.column(Col.LAST_USED, Sql.LONG).notNull()
.primaryKey(supportsMySQLQueries, Col.ID)
.toString()
);
} }
/** /**
@ -107,9 +97,9 @@ public class NicknamesTable extends UserUUIDTable {
* @return The nicknames of the User * @return The nicknames of the User
*/ */
public List<String> getNicknames(UUID uuid, UUID serverUUID) { public List<String> getNicknames(UUID uuid, UUID serverUUID) {
String sql = "SELECT " + Col.NICKNAME + " FROM " + tableName + String sql = "SELECT " + NICKNAME + " FROM " + tableName +
" WHERE (" + Col.UUID + "=?)" + " WHERE (" + USER_UUID + "=?)" +
" AND " + Col.SERVER_UUID + "=?"; " AND " + SERVER_UUID + "=?";
return query(new QueryStatement<List<String>>(sql, 1000) { return query(new QueryStatement<List<String>>(sql, 1000) {
@Override @Override
@ -122,7 +112,7 @@ public class NicknamesTable extends UserUUIDTable {
public List<String> processResults(ResultSet set) throws SQLException { public List<String> processResults(ResultSet set) throws SQLException {
List<String> nicknames = new ArrayList<>(); List<String> nicknames = new ArrayList<>();
while (set.next()) { while (set.next()) {
String nickname = set.getString(Col.NICKNAME.get()); String nickname = set.getString(NICKNAME);
if (nickname.isEmpty()) { if (nickname.isEmpty()) {
continue; continue;
} }
@ -147,10 +137,10 @@ public class NicknamesTable extends UserUUIDTable {
public Map<UUID, Map<UUID, List<Nickname>>> getAllNicknames() { public Map<UUID, Map<UUID, List<Nickname>>> getAllNicknames() {
String sql = "SELECT " + String sql = "SELECT " +
Col.NICKNAME + ", " + NICKNAME + ", " +
Col.LAST_USED + ", " + LAST_USED + ", " +
Col.UUID + ", " + USER_UUID + ", " +
Col.SERVER_UUID + SERVER_UUID +
" FROM " + tableName; " FROM " + tableName;
return query(new QueryAllStatement<Map<UUID, Map<UUID, List<Nickname>>>>(sql, 5000) { return query(new QueryAllStatement<Map<UUID, Map<UUID, List<Nickname>>>>(sql, 5000) {
@ -158,14 +148,14 @@ public class NicknamesTable extends UserUUIDTable {
public Map<UUID, Map<UUID, List<Nickname>>> processResults(ResultSet set) throws SQLException { public Map<UUID, Map<UUID, List<Nickname>>> processResults(ResultSet set) throws SQLException {
Map<UUID, Map<UUID, List<Nickname>>> map = new HashMap<>(); Map<UUID, Map<UUID, List<Nickname>>> map = new HashMap<>();
while (set.next()) { while (set.next()) {
UUID serverUUID = UUID.fromString(set.getString(Col.SERVER_UUID.get())); UUID serverUUID = UUID.fromString(set.getString(SERVER_UUID));
UUID uuid = UUID.fromString(set.getString(Col.UUID.get())); UUID uuid = UUID.fromString(set.getString(USER_UUID));
Map<UUID, List<Nickname>> serverMap = map.getOrDefault(serverUUID, new HashMap<>()); Map<UUID, List<Nickname>> serverMap = map.getOrDefault(serverUUID, new HashMap<>());
List<Nickname> nicknames = serverMap.getOrDefault(uuid, new ArrayList<>()); List<Nickname> nicknames = serverMap.getOrDefault(uuid, new ArrayList<>());
nicknames.add(new Nickname( nicknames.add(new Nickname(
set.getString(Col.NICKNAME.get()), set.getLong(Col.LAST_USED.get()), serverUUID set.getString(NICKNAME), set.getLong(LAST_USED), serverUUID
)); ));
serverMap.put(uuid, nicknames); serverMap.put(uuid, nicknames);
@ -211,11 +201,11 @@ public class NicknamesTable extends UserUUIDTable {
public List<Nickname> getNicknameInformation(UUID uuid) { public List<Nickname> getNicknameInformation(UUID uuid) {
String sql = "SELECT " + String sql = "SELECT " +
Col.NICKNAME + ", " + NICKNAME + ", " +
Col.LAST_USED + ", " + LAST_USED + ", " +
Col.SERVER_UUID + SERVER_UUID +
" FROM " + tableName + " FROM " + tableName +
" WHERE (" + Col.UUID + "=?)"; " WHERE (" + USER_UUID + "=?)";
return query(new QueryStatement<List<Nickname>>(sql, 5000) { return query(new QueryStatement<List<Nickname>>(sql, 5000) {
@ -228,9 +218,9 @@ public class NicknamesTable extends UserUUIDTable {
public List<Nickname> processResults(ResultSet set) throws SQLException { public List<Nickname> processResults(ResultSet set) throws SQLException {
List<Nickname> nicknames = new ArrayList<>(); List<Nickname> nicknames = new ArrayList<>();
while (set.next()) { while (set.next()) {
UUID serverUUID = UUID.fromString(set.getString(Col.SERVER_UUID.get())); UUID serverUUID = UUID.fromString(set.getString(SERVER_UUID));
String nickname = set.getString(Col.NICKNAME.get()); String nickname = set.getString(NICKNAME);
nicknames.add(new Nickname(nickname, set.getLong(Col.LAST_USED.get()), serverUUID)); nicknames.add(new Nickname(nickname, set.getLong(LAST_USED), serverUUID));
} }
return nicknames; return nicknames;
} }
@ -264,34 +254,4 @@ public class NicknamesTable extends UserUUIDTable {
} }
}); });
} }
@Deprecated
public enum Col implements Column {
@Deprecated
ID("id"),
@Deprecated
UUID(UserUUIDTable.Col.UUID.get()),
@Deprecated
SERVER_UUID("server_uuid"),
@Deprecated
NICKNAME("nickname"),
@Deprecated
LAST_USED("last_used");
private final String column;
Col(String column) {
this.column = column;
}
@Override
public String get() {
return toString();
}
@Override
public String toString() {
return column;
}
}
} }

4
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java
View File

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