Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-10 22:01:00 +01:00
Code Issues Projects Releases Wiki Activity

Removed KillsTable#getPlayerKills

Browse Source
This commit is contained in:
Rsl1122 2019-01-20 11:36:34 +02:00
parent 7e3950e5fc
commit 8f1b35d4d5
2 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
View File

@ -23,7 +23,6 @@ import com.djrapitops.plan.data.container.Session;
import com.djrapitops.plan.data.store.keys.SessionKeys; import com.djrapitops.plan.data.store.keys.SessionKeys;
import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.ExecStatement; import com.djrapitops.plan.db.access.ExecStatement;
import com.djrapitops.plan.db.access.QueryAllStatement;
import com.djrapitops.plan.db.access.QueryStatement; import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.patches.KillsOptimizationPatch; import com.djrapitops.plan.db.patches.KillsOptimizationPatch;
import com.djrapitops.plan.db.patches.KillsServerIDPatch; import com.djrapitops.plan.db.patches.KillsServerIDPatch;
@ -37,7 +36,9 @@ import com.djrapitops.plugin.utilities.Verify;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.List;
import java.util.Map;
import java.util.UUID;
/** /**
* Table that is in charge of storing kill data for each session. * Table that is in charge of storing kill data for each session.
@ -209,38 +210,6 @@ public class KillsTable extends UserUUIDTable {
}); });
} }
public Map<UUID, List<PlayerKill>> getPlayerKills() {
String usersVictimUUIDColumn = usersTable + "." + UsersTable.Col.UUID;
String usersVictimNameColumn = usersTable + "." + UsersTable.Col.USER_NAME + " as victim_name";
String sql = "SELECT " +
Col.DATE + ", " +
Col.WEAPON + ", " +
Col.VICTIM_UUID + ", " +
usersVictimNameColumn + ", " +
Col.KILLER_UUID +
" FROM " + tableName +
" INNER JOIN " + usersTable + " on " + usersVictimUUIDColumn + "=" + Col.VICTIM_UUID;
return query(new QueryAllStatement<Map<UUID, List<PlayerKill>>>(sql, 50000) {
@Override
public Map<UUID, List<PlayerKill>> processResults(ResultSet set) throws SQLException {
Map<UUID, List<PlayerKill>> allKills = new HashMap<>();
while (set.next()) {
UUID killer = UUID.fromString(set.getString(Col.KILLER_UUID.get()));
UUID victim = UUID.fromString(set.getString(Col.VICTIM_UUID.get()));
String victimName = set.getString("victim_name");
long date = set.getLong(Col.DATE.get());
String weapon = set.getString(Col.WEAPON.get());
List<PlayerKill> kills = allKills.getOrDefault(killer, new ArrayList<>());
kills.add(new PlayerKill(victim, weapon, date, victimName));
allKills.put(killer, kills);
}
return allKills;
}
});
}
public void addKillsToSessions(Map<UUID, Map<UUID, List<Session>>> map) { public void addKillsToSessions(Map<UUID, Map<UUID, List<Session>>> map) {
Map<Integer, List<PlayerKill>> playerKillsBySessionID = db.query(LargeFetchQueries.fetchAllPlayerKillsBySessionID()); Map<Integer, List<PlayerKill>> playerKillsBySessionID = db.query(LargeFetchQueries.fetchAllPlayerKillsBySessionID());
for (UUID serverUUID : map.keySet()) { for (UUID serverUUID : map.keySet()) {

12
Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
View File

@ -682,9 +682,15 @@ public abstract class CommonDBTest {
commitTest(); commitTest();
Map<UUID, List<PlayerKill>> playerKills = db.getKillsTable().getPlayerKills(); Map<UUID, List<Session>> sessions = db.getSessionsTable().getSessions(playerUUID);
List<PlayerKill> kills = playerKills.get(playerUUID); List<Session> savedSessions = sessions.get(playerUUID);
assertFalse(playerKills.isEmpty()); assertNotNull(savedSessions);
assertFalse(savedSessions.isEmpty());
Session savedSession = savedSessions.get(0);
assertNotNull(savedSession);
List<PlayerKill> kills = savedSession.getPlayerKills();
assertNotNull(kills); assertNotNull(kills);
assertFalse(kills.isEmpty()); assertFalse(kills.isEmpty());
assertEquals(expected, kills); assertEquals(expected, kills);