Reduced database stress by Network and Players pages. (#499)

Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/FetchOperations.java

@@ -82,4 +82,6 @@ public interface FetchOperations {
     List<WebUser> getWebUsers() throws DBException;
 
     Map<Integer, String> getServerNamesByID() throws DBException;
+
+    Map<UUID, Map<UUID, List<Session>>> getSessionsInLastMonth() throws DBException;
 }

Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java

@@ -254,6 +254,15 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
         }
     }
 
+    @Override
+    public Map<UUID, Map<UUID, List<Session>>> getSessionsInLastMonth() throws DBException {
+        try {
+            return sessionsTable.getSessionInLastMonth();
+        } catch (SQLException e) {
+            throw SQLErrorUtil.getExceptionFor(e);
+        }
+    }
+
     @Override
     public Set<String> getWorldNames(UUID serverUuid) throws DBException {
         try {

Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java

@@ -47,8 +47,8 @@ public class ServerTable extends Table {
 
     public ServerTable(SQLDB db) {
         super("plan_servers", db);
-        statementSelectServerID = "(" + Select.from(tableName, tableName + "." + columnServerID).where(columnServerUUID + "=?").toString() + " LIMIT 1)";
+        statementSelectServerID = "(" + Select.from(tableName, tableName + "." + columnServerID).where(tableName + "." + columnServerUUID + "=?").toString() + " LIMIT 1)";
-        statementSelectServerNameID = "(" + Select.from(tableName, tableName + "." + columnServerName).where(columnServerID + "=?").toString() + " LIMIT 1)";
+        statementSelectServerNameID = "(" + Select.from(tableName, tableName + "." + columnServerName).where(tableName + "." + columnServerID + "=?").toString() + " LIMIT 1)";
         insertStatement = Insert.values(tableName,
                 columnServerUUID,
                 columnServerName,
@@ -229,7 +229,7 @@ public class ServerTable extends Table {
         });
     }
 
-    public Map<Integer, UUID> getServerUuids() throws SQLException {
+    public Map<Integer, UUID> getServerUUIDsByID() throws SQLException {
         String sql = Select.from(tableName,
                 columnServerID, columnServerUUID)
                 .toString();

Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java

@@ -10,6 +10,8 @@ import com.djrapitops.plan.system.database.databases.sql.statements.Select;
 import com.djrapitops.plan.system.database.databases.sql.statements.Sql;
 import com.djrapitops.plan.system.database.databases.sql.statements.TableSqlParser;
 import com.djrapitops.plan.system.info.server.ServerInfo;
+import com.djrapitops.plan.utilities.MiscUtils;
+import com.djrapitops.plugin.api.TimeAmount;
 import com.djrapitops.plugin.utilities.Verify;
 
 import java.sql.PreparedStatement;
@@ -152,7 +154,7 @@ public class SessionsTable extends UserIDTable {
      * @throws SQLException DB Error
      */
     private Map<UUID, List<Session>> getSessionInformation(UUID uuid) throws SQLException {
-        Map<Integer, UUID> serverUUIDs = serverTable.getServerUuids();
+        Map<Integer, UUID> serverUUIDs = serverTable.getServerUUIDsByID();
         String sql = Select.from(tableName, "*")
                 .where(columnUserID + "=" + usersTable.statementSelectID)
                 .toString();
@@ -544,29 +546,26 @@ public class SessionsTable extends UserIDTable {
     }
 
     public Map<UUID, Map<UUID, List<Session>>> getAllSessions(boolean getKillsAndWorldTimes) throws SQLException {
-        String usersIDColumn = usersTable + "." + usersTable.getColumnID();
+        Map<Integer, UUID> uuidsByID = usersTable.getUUIDsByID();
-        String usersUUIDColumn = usersTable + "." + usersTable.getColumnUUID() + " as uuid";
+        Map<Integer, UUID> serverUUIDsByID = serverTable.getServerUUIDsByID();
-        String serverIDColumn = serverTable + "." + serverTable.getColumnID();
+
-        String serverUUIDColumn = serverTable + "." + serverTable.getColumnUUID() + " as s_uuid";
         String sql = "SELECT " +
-                tableName + "." + columnID + ", " +
+                columnID + ", " +
+                columnUserID + ", " +
+                columnServerID + ", " +
                 columnSessionStart + ", " +
                 columnSessionEnd + ", " +
                 columnDeaths + ", " +
-                columnMobKills + ", " +
+                columnMobKills +
-                usersUUIDColumn + ", " +
+                " FROM " + tableName;
-                serverUUIDColumn +
-                " FROM " + tableName +
-                " INNER JOIN " + usersTable + " on " + usersIDColumn + "=" + columnUserID +
-                " INNER JOIN " + serverTable + " on " + serverIDColumn + "=" + columnServerID;
 
         return query(new QueryAllStatement<Map<UUID, Map<UUID, List<Session>>>>(sql, 20000) {
             @Override
             public Map<UUID, Map<UUID, List<Session>>> processResults(ResultSet set) throws SQLException {
                 Map<UUID, Map<UUID, List<Session>>> map = new HashMap<>();
                 while (set.next()) {
-                    UUID serverUUID = UUID.fromString(set.getString("s_uuid"));
+                    UUID serverUUID = serverUUIDsByID.get(set.getInt(columnServerID));
-                    UUID uuid = UUID.fromString(set.getString("uuid"));
+                    UUID uuid = uuidsByID.get(set.getInt(columnUserID));
 
                     Map<UUID, List<Session>> sessionsByUser = map.getOrDefault(serverUUID, new HashMap<>());
                     List<Session> sessions = sessionsByUser.getOrDefault(uuid, new ArrayList<>());
@@ -678,4 +677,53 @@ public class SessionsTable extends UserIDTable {
     String getcolumnServerID() {
         return columnServerID;
     }
+
+    public Map<UUID, Map<UUID, List<Session>>> getSessionInLastMonth() throws SQLException {
+        Map<Integer, UUID> uuidsByID = usersTable.getUUIDsByID();
+        Map<Integer, UUID> serverUUIDsByID = serverTable.getServerUUIDsByID();
+
+        String sql = "SELECT " +
+                columnID + ", " +
+                columnUserID + ", " +
+                columnServerID + ", " +
+                columnSessionStart + ", " +
+                columnSessionEnd + ", " +
+                columnDeaths + ", " +
+                columnMobKills +
+                " FROM " + tableName +
+                " WHERE " + columnSessionStart + ">?";
+
+        return query(new QueryStatement<Map<UUID, Map<UUID, List<Session>>>>(sql, 20000) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setLong(1, MiscUtils.getTime() - TimeAmount.MONTH.ms());
+            }
+
+            @Override
+            public Map<UUID, Map<UUID, List<Session>>> processResults(ResultSet set) throws SQLException {
+                Map<UUID, Map<UUID, List<Session>>> map = new HashMap<>();
+                while (set.next()) {
+                    UUID serverUUID = serverUUIDsByID.get(set.getInt(columnServerID));
+                    UUID uuid = uuidsByID.get(set.getInt(columnUserID));
+
+                    Map<UUID, List<Session>> sessionsByUser = map.getOrDefault(serverUUID, new HashMap<>());
+                    List<Session> sessions = sessionsByUser.getOrDefault(uuid, new ArrayList<>());
+
+                    long start = set.getLong(columnSessionStart);
+                    long end = set.getLong(columnSessionEnd);
+
+                    int deaths = set.getInt(columnDeaths);
+                    int mobKills = set.getInt(columnMobKills);
+                    int id = set.getInt(columnID);
+
+                    Session session = new Session(id, start, end, mobKills, deaths);
+                    sessions.add(session);
+
+                    sessionsByUser.put(uuid, sessions);
+                    map.put(serverUUID, sessionsByUser);
+                }
+                return map;
+            }
+        });
+    }
 }

Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java

@@ -185,17 +185,10 @@ public class UserInfoTable extends UserIDTable {
     }
 
     public List<UserInfo> getServerUserInfo(UUID serverUUID) throws SQLException {
-        String usersIDColumn = usersTable + "." + usersTable.getColumnID();
+        Map<UUID, String> playerNames = usersTable.getPlayerNames();
-        String usersUUIDColumn = usersTable + "." + usersTable.getColumnUUID() + " as uuid";
+        Map<Integer, UUID> uuidsByID = usersTable.getUUIDsByID();
-        String usersNameColumn = usersTable + "." + usersTable.getColumnName() + " as name";
+
-        String sql = "SELECT " +
+        String sql = "SELECT * FROM " + tableName +
-                tableName + "." + columnRegistered + ", " +
-                columnOP + ", " +
-                columnBanned + ", " +
-                usersNameColumn + ", " +
-                usersUUIDColumn +
-                " FROM " + tableName +
-                " LEFT JOIN " + usersTable + " on " + usersIDColumn + "=" + columnUserID +
                 " WHERE " + columnServerID + "=" + serverTable.statementSelectServerID;
 
         return query(new QueryStatement<List<UserInfo>>(sql, 20000) {
@@ -211,8 +204,9 @@ public class UserInfoTable extends UserIDTable {
                     long registered = set.getLong(columnRegistered);
                     boolean opped = set.getBoolean(columnOP);
                     boolean banned = set.getBoolean(columnBanned);
-                    String name = set.getString("name");
+                    int userId = set.getInt(columnUserID);
-                    UUID uuid = UUID.fromString(set.getString("uuid"));
+                    UUID uuid = uuidsByID.get(userId);
+                    String name = playerNames.getOrDefault(uuid, "Unknown");
                     UserInfo info = new UserInfo(uuid, name, registered, opped, banned);
                     if (!userInfo.contains(info)) {
                         userInfo.add(info);

Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java

@@ -433,4 +433,23 @@ public class UsersTable extends UserIDTable {
             }
         });
     }
+
+    public Map<Integer, UUID> getUUIDsByID() throws SQLException {
+        String sql = Select.from(tableName, columnID, columnUUID).toString();
+
+        return query(new QueryAllStatement<Map<Integer, UUID>>(sql, 20000) {
+            @Override
+            public Map<Integer, UUID> processResults(ResultSet set) throws SQLException {
+                Map<Integer, UUID> uuidsByID = new TreeMap<>();
+
+                while (set.next()) {
+                    int id = set.getInt(columnID);
+                    UUID uuid = UUID.fromString(set.getString(columnUUID));
+                    uuidsByID.put(id, uuid);
+                }
+
+                return uuidsByID;
+            }
+        });
+    }
 }

Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/NetworkPage.java

@@ -74,7 +74,7 @@ public class NetworkPage extends Page {
     }
 
     private void uniquePlayers(long now, Database db) throws DBException {
-        Map<UUID, Map<UUID, List<Session>>> allSessions = db.fetch().getSessionsWithNoExtras();
+        Map<UUID, Map<UUID, List<Session>>> allSessions = db.fetch().getSessionsInLastMonth();
         Map<UUID, List<Session>> userSessions = AnalysisUtils.sortSessionsByUser(allSessions);
 
         long dayAgo = now - TimeAmount.DAY.ms();

Plan/src/test/java/com/djrapitops/plan/system/BukkitSystemTest.java

@@ -6,6 +6,7 @@ package com.djrapitops.plan.system;
 
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.api.exceptions.EnableException;
+import com.djrapitops.plan.system.settings.Settings;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -48,6 +49,8 @@ public class BukkitSystemTest {
 
     @Test
     public void testEnable() throws EnableException {
+        Settings.WEBSERVER_PORT.setTemporaryValue(9000);
+
         bukkitSystem = new BukkitSystem(planMock);
         bukkitSystem.enable();
     }

Plan/src/test/java/com/djrapitops/plan/system/BungeeSystemTest.java

@@ -52,6 +52,7 @@ public class BungeeSystemTest {
     public void testEnable() throws EnableException {
         bungeeSystem = new BungeeSystem(planMock);
 
+        Settings.WEBSERVER_PORT.setTemporaryValue(9000);
         Settings.BUNGEE_IP.setTemporaryValue("8.8.8.8");
         Settings.DB_TYPE.setTemporaryValue("sqlite");
         bungeeSystem.setDatabaseSystem(new BukkitDBSystem());
@@ -66,6 +67,7 @@ public class BungeeSystemTest {
 
         bungeeSystem = new BungeeSystem(planMock);
 
+        Settings.WEBSERVER_PORT.setTemporaryValue(9000);
         Settings.DB_TYPE.setTemporaryValue("sqlite");
         bungeeSystem.setDatabaseSystem(new BukkitDBSystem());