diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml b/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml
deleted file mode 100644
index ce0411645..000000000
--- a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml b/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml
new file mode 100644
index 000000000..e45a58e08
--- /dev/null
+++ b/Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
index d5578ac8f..11d2d8757 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
@@ -145,7 +145,7 @@ public class DataCacheHandler extends SessionCache {
}
try {
periodicTaskIsSaving = true;
- Log.debug("Database", "Periodic Cache Save");
+ Log.debug("Database", "Periodic Cache Save: " + dataCache.size());
handler.saveHandlerDataToCache();
handler.saveCachedUserData();
if (timesSaved % clearAfterXsaves == 0) {
@@ -342,7 +342,7 @@ public class DataCacheHandler extends SessionCache {
return;
}
try {
- Log.debug("Database", "Periodic TPS Save");
+ Log.debug("Database", "Periodic TPS Save: " + averages.size());
db.getTpsTable().saveTPSData(averages);
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
index 38cfa6e03..ec216ee91 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
@@ -537,10 +537,8 @@ public abstract class SQLDB extends Database {
if (uuid == null) {
return;
}
- setStatus("Save userdata: " + uuid);
+ Log.debug("Database", "Save userdata: " + uuid);
checkConnection();
- Log.debug("Database", "DB_Save:");
- Log.debug("Database", data.toString());
data.access();
usersTable.saveUserDataInformation(data);
int userId = usersTable.getUserId(uuid.toString());
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
index dd476de9b..7a114e312 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
@@ -6,7 +6,6 @@ import main.java.com.djrapitops.plan.data.time.GMTimes;
import main.java.com.djrapitops.plan.database.Container;
import main.java.com.djrapitops.plan.database.DBUtils;
import main.java.com.djrapitops.plan.database.databases.SQLDB;
-import main.java.com.djrapitops.plan.utilities.Benchmark;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -201,8 +200,6 @@ public class GMTimesTable extends Table {
return;
}
- Benchmark.start("Save GMTimes");
-
Set savedIDs = getSavedIDs();
Map gmTimes = new HashMap<>();
@@ -231,7 +228,6 @@ public class GMTimesTable extends Table {
gamemodeTimes.keySet().removeAll(savedIDs);
addNewGMTimesRows(gamemodeTimes);
- Benchmark.stop("Database", "Save GMTimes");
}
private void saveGMTimesBatch(List> batch) throws SQLException {
@@ -274,7 +270,6 @@ public class GMTimesTable extends Table {
statement.addBatch();
}
- Log.debug("Database", "Executing GM Times batch: " + batchSize);
statement.executeBatch();
} finally {
close(statement);
@@ -286,8 +281,6 @@ public class GMTimesTable extends Table {
return;
}
- Benchmark.start("Add GMTimes Rows");
-
Map gmTimes = new HashMap<>();
for (Map.Entry> entrySet : gamemodeTimes.entrySet()) {
@@ -305,8 +298,6 @@ public class GMTimesTable extends Table {
Log.toLog("GMTimesTable.addNewGMTimesRows", e);
}
});
-
- Benchmark.stop("Database", "Add GMTimes Rows");
}
private void addNewGMTimesBatch(List> batch) throws SQLException {
@@ -343,7 +334,6 @@ public class GMTimesTable extends Table {
statement.addBatch();
}
- Log.debug("Database", "Executing GM Times batch: " + batchSize);
statement.executeBatch();
} finally {
close(statement);
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java
index e6a272dd8..6766d7af7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java
@@ -74,7 +74,6 @@ public class IPsTable extends Table {
* @throws SQLException
*/
public List getIPAddresses(int userId) throws SQLException {
- Benchmark.start("Get Ips");
PreparedStatement statement = null;
ResultSet set = null;
try {
@@ -95,7 +94,6 @@ public class IPsTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "Get Ips");
}
}
@@ -109,7 +107,6 @@ public class IPsTable extends Table {
return;
}
- Benchmark.start("Save Ips");
ips.removeAll(getIPAddresses(userId));
if (ips.isEmpty()) {
@@ -141,7 +138,6 @@ public class IPsTable extends Table {
}
} finally {
close(statement);
- Benchmark.stop("Database", "Save Ips");
}
}
@@ -238,7 +234,6 @@ public class IPsTable extends Table {
}
if (commitRequired) {
- Log.debug("Database", "Executing ips batch: " + batchSize);
statement.executeBatch();
}
} finally {
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java
index e39c52595..7b7105a40 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java
@@ -258,7 +258,6 @@ public class KillsTable extends Table {
}
if (commitRequired) {
- Log.debug("Database", "Executing kills batch: " + i);
statement.executeBatch();
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java
index 0f3d59cf3..dc372f737 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java
@@ -82,7 +82,6 @@ public class NicknamesTable extends Table {
* @throws SQLException
*/
public List getNicknames(int userId) throws SQLException {
- Benchmark.start("Get Nicknames");
PreparedStatement statement = null;
ResultSet set = null;
try {
@@ -109,7 +108,6 @@ public class NicknamesTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "Get Nicknames");
}
}
@@ -123,7 +121,6 @@ public class NicknamesTable extends Table {
if (names == null || names.isEmpty()) {
return;
}
- Benchmark.start("Save Nicknames");
names.removeAll(getNicknames(userId));
if (names.isEmpty()) {
return;
@@ -136,23 +133,19 @@ public class NicknamesTable extends Table {
+ columnNick
+ ") VALUES (?, ?, ?)");
boolean commitRequired = false;
- int i = 0;
for (String name : names) {
statement.setInt(1, userId);
statement.setInt(2, (name.equals(lastNick)) ? 1 : 0);
statement.setString(3, name);
statement.addBatch();
commitRequired = true;
- i++;
}
if (commitRequired) {
- Log.debug("Database", "Executing nicknames batch: " + i);
statement.executeBatch();
}
} finally {
close(statement);
- Benchmark.stop("Database", "Save Nicknames");
}
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
index c02133145..5d59fa9e1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
@@ -58,7 +58,6 @@ public class SessionsTable extends Table {
* @throws SQLException
*/
public List getSessionData(int userId) throws SQLException {
- Benchmark.start("Get Sessions");
PreparedStatement statement = null;
ResultSet set = null;
try {
@@ -75,7 +74,6 @@ public class SessionsTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "Get Sessions");
}
}
@@ -255,8 +253,6 @@ public class SessionsTable extends Table {
statement.setLong(3, session.getSessionEnd());
statement.addBatch();
}
-
- Log.debug("Database", "Executing session batch: " + batchSize);
statement.executeBatch();
} finally {
close(statement);
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
index 98956c216..fccb2adec 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
@@ -160,8 +160,6 @@ public class TPSTable extends Table {
statement.setDouble(7, tps.getChunksLoaded());
statement.addBatch();
}
-
- Log.debug("Database", "Executing tps batch: " + batchSize);
statement.executeBatch();
} finally {
close(statement);
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java
index eb40a5324..561bb5026 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java
@@ -107,7 +107,6 @@ public abstract class Table {
* @throws SQLException
*/
protected PreparedStatement prepareStatement(String sql) throws SQLException {
- Log.debug("Database", sql);
return getConnection().prepareStatement(sql);
}
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
index 2abe9cac5..8bd6da8dd 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
@@ -274,7 +274,6 @@ public class UsersTable extends Table {
* @throws SQLException
*/
public UserData getUserData(UUID uuid) throws SQLException {
- Benchmark.start("Get UserData");
boolean containsBukkitData = getContainsBukkitData(uuid);
UserData data = null;
if (containsBukkitData) {
@@ -284,7 +283,6 @@ public class UsersTable extends Table {
data = new UserData(Fetch.getIOfflinePlayer(uuid));
addUserInformationToUserData(data);
}
- Benchmark.stop("Database", "Get UserData");
return data;
}
@@ -312,7 +310,7 @@ public class UsersTable extends Table {
* @throws SQLException
*/
public List getUserData(Collection uuids) throws SQLException {
- Benchmark.start("Get UserData Multiple");
+ Benchmark.start("Get UserInfo Multiple");
List containsBukkitData = getContainsBukkitData(uuids);
List datas = new ArrayList<>();
datas.addAll(getUserDataForKnown(containsBukkitData));
@@ -330,7 +328,7 @@ public class UsersTable extends Table {
datas.addAll(noBukkitData);
}
- Benchmark.stop("Database", "Get UserData Multiple");
+ Benchmark.stop("Database", "Get UserInfo Multiple");
return datas;
}
@@ -365,7 +363,6 @@ public class UsersTable extends Table {
}
private UserData getUserDataForKnown(UUID uuid) throws SQLException {
- Benchmark.start("getUserDataForKnown UserData");
PreparedStatement statement = null;
ResultSet set = null;
try {
@@ -401,13 +398,11 @@ public class UsersTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "getUserDataForKnown UserData");
}
return null;
}
private List getUserDataForKnown(Collection uuids) throws SQLException {
- Benchmark.start("getUserDataForKnown Multiple");
PreparedStatement statement = null;
ResultSet set = null;
List datas = new ArrayList<>();
@@ -448,7 +443,6 @@ public class UsersTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "getUserDataForKnown Multiple");
}
return datas;
}
@@ -458,7 +452,6 @@ public class UsersTable extends Table {
* @throws SQLException
*/
public void addUserInformationToUserData(UserData data) throws SQLException {
- Benchmark.start("addUserInformationToUserData");
PreparedStatement statement = null;
ResultSet set = null;
try {
@@ -488,7 +481,6 @@ public class UsersTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "addUserInformationToUserData");
}
}
@@ -497,7 +489,6 @@ public class UsersTable extends Table {
* @throws SQLException
*/
public void addUserInformationToUserData(List data) throws SQLException {
- Benchmark.start("addUserInformationToUserData Multiple");
PreparedStatement statement = null;
ResultSet set = null;
try {
@@ -533,7 +524,6 @@ public class UsersTable extends Table {
} finally {
close(set);
close(statement);
- Benchmark.stop("Database", "addUserInformationToUserData Multiple");
}
}
@@ -542,7 +532,6 @@ public class UsersTable extends Table {
* @throws SQLException
*/
public void saveUserDataInformation(UserData data) throws SQLException {
- Benchmark.start("Save UserInfo");
PreparedStatement statement = null;
try {
UUID uuid = data.getUuid();
@@ -598,7 +587,6 @@ public class UsersTable extends Table {
}
} finally {
close(statement);
- Benchmark.stop("Database", "Save UserInfo");
}
}
@@ -738,7 +726,6 @@ public class UsersTable extends Table {
statement.addBatch();
}
- Log.debug("Database", "Executing users batch: " + batchSize);
statement.executeBatch();
} finally {
close(statement);
@@ -801,7 +788,6 @@ public class UsersTable extends Table {
i++;
}
if (commitRequired) {
- Log.debug("Database", "Executing userinfo batch update: " + i);
statement.executeBatch();
}
return saveLast;
@@ -863,29 +849,6 @@ public class UsersTable extends Table {
}
}
- /**
- * @return @throws SQLException
- */
- public Map getLoginTimes() throws SQLException {
- Benchmark.start("Get Logintimes");
- PreparedStatement statement = null;
- ResultSet set = null;
- try {
- Map ids = new HashMap<>();
- statement = prepareStatement("SELECT " + columnID + ", " + columnLoginTimes + " FROM " + tableName);
- set = statement.executeQuery();
- while (set.next()) {
- Integer id = set.getInt(columnID);
- ids.put(id, set.getInt(columnLoginTimes));
- }
- return ids;
- } finally {
- close(set);
- close(statement);
- Benchmark.stop("Database", "Get Logintimes");
- }
- }
-
/**
* @return
*/