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

Removed PingTable.Col

Browse Source
This commit is contained in:
Rsl1122 2019-01-24 15:02:56 +02:00
parent a8a871d931
commit 21b1489d69
2 changed files with 28 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Plan/common/src/main/java/com/djrapitops/plan/db/patches/PingOptimizationPatch.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.db.SQLDB;
import com.djrapitops.plan.db.sql.tables.PingTable;
import com.djrapitops.plan.db.sql.tables.PingTable.Col;
public class PingOptimizationPatch extends Patch {
@ -34,8 +33,8 @@ public class PingOptimizationPatch extends Patch {
@Override
public boolean hasBeenApplied() {
return hasColumn(tableName, Col.UUID.get())
&& hasColumn(tableName, Col.SERVER_UUID.get())
return hasColumn(tableName, PingTable.USER_UUID)
&& hasColumn(tableName, PingTable.SERVER_UUID)
&& !hasColumn(tableName, "user_id")
&& !hasColumn(tableName, "server_id")
&& !hasTable(tempTableName); // If this table exists the patch has failed to finish.
@ -48,21 +47,21 @@ public class PingOptimizationPatch extends Patch {
db.getPingTable().createTable();
execute("INSERT INTO " + tableName + " (" +
Col.UUID + ", " +
Col.SERVER_UUID + ", " +
Col.ID + ", " +
Col.MIN_PING + ", " +
Col.MAX_PING + ", " +
Col.AVG_PING + ", " +
Col.DATE +
PingTable.USER_UUID + ", " +
PingTable.SERVER_UUID + ", " +
PingTable.ID + ", " +
PingTable.MIN_PING + ", " +
PingTable.MAX_PING + ", " +
PingTable.AVG_PING + ", " +
PingTable.DATE +
") 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.MIN_PING + ", " +
Col.MAX_PING + ", " +
Col.AVG_PING + ", " +
Col.DATE +
PingTable.ID + ", " +
PingTable.MIN_PING + ", " +
PingTable.MAX_PING + ", " +
PingTable.AVG_PING + ", " +
PingTable.DATE +
" FROM " + tempTableName
);

64
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java
View File

@ -23,7 +23,6 @@ import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.patches.PingOptimizationPatch;
import com.djrapitops.plan.db.sql.parsing.Column;
import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
import com.djrapitops.plan.db.sql.parsing.Sql;
import com.djrapitops.plugin.api.TimeAmount;
@ -61,12 +60,12 @@ public class PingTable extends UserUUIDTable {
public PingTable(SQLDB db) {
super(TABLE_NAME, db);
insertStatement = "INSERT INTO " + tableName + " (" +
Col.UUID + ", " +
Col.SERVER_UUID + ", " +
Col.DATE + ", " +
Col.MIN_PING + ", " +
Col.MAX_PING + ", " +
Col.AVG_PING +
USER_UUID + ", " +
SERVER_UUID + ", " +
DATE + ", " +
MIN_PING + ", " +
MAX_PING + ", " +
AVG_PING +
") VALUES (?, ?, ?, ?, ?, ?)";
}
@ -89,8 +88,8 @@ public class PingTable extends UserUUIDTable {
public void clean() {
String sql = "DELETE FROM " + tableName +
" WHERE (" + Col.DATE + "<?)" +
" OR (" + Col.MIN_PING + "<0)";
" WHERE (" + DATE + "<?)" +
" OR (" + MIN_PING + "<0)";
execute(new ExecStatement(sql) {
@Override
@ -117,7 +116,7 @@ public class PingTable extends UserUUIDTable {
public List<Ping> getPing(UUID uuid) {
String sql = "SELECT * FROM " + tableName +
" WHERE " + Col.UUID + "=?";
" WHERE " + USER_UUID + "=?";
return query(new QueryStatement<List<Ping>>(sql, 10000) {
@Override
@ -131,11 +130,11 @@ public class PingTable extends UserUUIDTable {
while (set.next()) {
pings.add(new Ping(
set.getLong(Col.DATE.get()),
UUID.fromString(set.getString(Col.SERVER_UUID.get())),
set.getInt(Col.MIN_PING.get()),
set.getInt(Col.MAX_PING.get()),
set.getDouble(Col.AVG_PING.get())
set.getLong(DATE),
UUID.fromString(set.getString(SERVER_UUID)),
set.getInt(MIN_PING),
set.getInt(MAX_PING),
set.getDouble(AVG_PING)
)
);
}
@ -171,39 +170,4 @@ public class PingTable extends UserUUIDTable {
}
});
}
@Deprecated
public enum Col implements Column {
@Deprecated
ID("id"),
@Deprecated
UUID(UserUUIDTable.Col.UUID.get()),
@Deprecated
SERVER_UUID("server_uuid"),
@Deprecated
DATE("date"),
@Deprecated
MAX_PING("max_ping"),
@Deprecated
AVG_PING("avg_ping"),
@Deprecated
MIN_PING("min_ping");
private final String name;
Col(String name) {
this.name = name;
}
@Override
public String get() {
return name;
}
@Override
public String toString() {
return get();
}
}
}