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

Fixed average KDR / Player query

Browse Source 
- The query was causing SQLException on some MySQL versions
- The query did not take into account players who haven't been killed
- The query did not take into account players with no kills
This commit is contained in:
Rsl1122 2019-09-15 16:22:36 +03:00
parent 16a25a2470
commit 9abe83b213
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/KillQueries.java
View File

@ -22,6 +22,7 @@ import com.djrapitops.plan.storage.database.queries.Query;
import com.djrapitops.plan.storage.database.queries.QueryStatement; import com.djrapitops.plan.storage.database.queries.QueryStatement;
import com.djrapitops.plan.storage.database.sql.tables.KillsTable; import com.djrapitops.plan.storage.database.sql.tables.KillsTable;
import com.djrapitops.plan.storage.database.sql.tables.SessionsTable; import com.djrapitops.plan.storage.database.sql.tables.SessionsTable;
import com.djrapitops.plan.storage.database.sql.tables.UserInfoTable;
import com.djrapitops.plan.storage.database.sql.tables.UsersTable; import com.djrapitops.plan.storage.database.sql.tables.UsersTable;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -179,10 +180,11 @@ public class KillQueries {
AND + KillsTable.DATE + ">=?" + AND + KillsTable.DATE + ">=?" +
AND + KillsTable.DATE + "<=?" + AND + KillsTable.DATE + "<=?" +
GROUP_BY + KillsTable.VICTIM_UUID; GROUP_BY + KillsTable.VICTIM_UUID;
String sql = SELECT + "AVG(CAST(kills AS double)/CAST(deaths AS double)) as kdr" + String sql = SELECT + "u." + UserInfoTable.USER_UUID + ",kills, deaths" +
FROM + '(' + selectKillCounts + ") q1" + FROM + UserInfoTable.TABLE_NAME + " u" +
INNER_JOIN + '(' + selectDeathCounts + ") q2 on q1." + KillsTable.KILLER_UUID + "=q2." + KillsTable.VICTIM_UUID + LEFT_JOIN + '(' + selectKillCounts + ") q1 on q1." + KillsTable.KILLER_UUID + "=u." + UserInfoTable.USER_UUID +
WHERE + "deaths!=0"; LEFT_JOIN + '(' + selectDeathCounts + ") q2 on q2." + KillsTable.VICTIM_UUID + "=u." + UserInfoTable.USER_UUID +
WHERE + "u." + UserInfoTable.SERVER_UUID + "=?";
return new QueryStatement<Double>(sql) { return new QueryStatement<Double>(sql) {
@Override @Override
@ -193,11 +195,21 @@ public class KillQueries {
statement.setString(4, serverUUID.toString()); statement.setString(4, serverUUID.toString());
statement.setLong(5, after); statement.setLong(5, after);
statement.setLong(6, before); statement.setLong(6, before);
statement.setString(7, serverUUID.toString());
} }
@Override @Override
public Double processResults(ResultSet set) throws SQLException { public Double processResults(ResultSet set) throws SQLException {
return set.next() ? set.getDouble("kdr") : 0.0; double totalKDR = 0.0;
int playerCount = 0;
while (set.next()) {
int kills = set.getInt("kills");
int deaths = set.getInt("deaths");
System.out.println("K:" + kills + " D:" + deaths);
totalKDR += (double) kills / (deaths > 0 ? deaths : 1);
playerCount++;
}
return totalKDR / (playerCount > 0 ? playerCount : 1);
} }
}; };
} }

12
Plan/common/src/test/java/com/djrapitops/plan/storage/database/DatabaseTest.java
View File

@ -1413,6 +1413,18 @@ public interface DatabaseTest {
assertNotEquals(Collections.emptyList(), result); assertNotEquals(Collections.emptyList(), result);
} }
@Test
default void kdrCastAsDoubleDoesNotCauseExceptions() {
sessionsAreStoredWithAllData();
db().executeTransaction(new PlayerServerRegisterTransaction(player2UUID, () -> 123456789L, "Test", serverUUID()));
Long killCount = db().query(KillQueries.playerKillCount(0L, System.currentTimeMillis(), serverUUID()));
assertEquals(2, killCount); // Ensure the kills were saved
Double result = db().query(KillQueries.averageKDR(0L, System.currentTimeMillis(), serverUUID()));
assertEquals(1.0, result, 0.1);
}
@PluginInfo(name = "ConditionalExtension") @PluginInfo(name = "ConditionalExtension")
class ConditionalExtension implements DataExtension { class ConditionalExtension implements DataExtension {