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

Add ToDos at the missing things

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-20 15:07:22 +02:00
parent 9db4a74154
commit 9e31e7d056
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java vendored
View File

@ -8,7 +8,6 @@ import main.java.com.djrapitops.plan.Settings;
import main.java.com.djrapitops.plan.data.TPS; import main.java.com.djrapitops.plan.data.TPS;
import main.java.com.djrapitops.plan.data.UserData; import main.java.com.djrapitops.plan.data.UserData;
import main.java.com.djrapitops.plan.data.handling.info.HandlingInfo; import main.java.com.djrapitops.plan.data.handling.info.HandlingInfo;
import main.java.com.djrapitops.plan.data.handling.info.LogoutInfo;
import main.java.com.djrapitops.plan.data.handling.info.ReloadInfo; import main.java.com.djrapitops.plan.data.handling.info.ReloadInfo;
import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.database.Database;
import main.java.com.djrapitops.plan.locale.Locale; import main.java.com.djrapitops.plan.locale.Locale;
@ -17,11 +16,11 @@ import main.java.com.djrapitops.plan.queue.DataCacheClearQueue;
import main.java.com.djrapitops.plan.queue.DataCacheGetQueue; import main.java.com.djrapitops.plan.queue.DataCacheGetQueue;
import main.java.com.djrapitops.plan.queue.DataCacheProcessQueue; import main.java.com.djrapitops.plan.queue.DataCacheProcessQueue;
import main.java.com.djrapitops.plan.queue.DataCacheSaveQueue; import main.java.com.djrapitops.plan.queue.DataCacheSaveQueue;
import main.java.com.djrapitops.plan.queue.processing.Processor;
import main.java.com.djrapitops.plan.utilities.Benchmark; import main.java.com.djrapitops.plan.utilities.Benchmark;
import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils;
import main.java.com.djrapitops.plan.utilities.NewPlayerCreator; import main.java.com.djrapitops.plan.utilities.NewPlayerCreator;
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
import main.java.com.djrapitops.plan.utilities.comparators.HandlingInfoTimeComparator;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.sql.SQLException; import java.sql.SQLException;
@ -240,7 +239,7 @@ public class DataCacheHandler extends SessionCache {
if (i == null) { if (i == null) {
return; return;
} }
processTask.addToPool(i); //TODO processTask.addToPool(i);
} }
/** /**
@ -256,7 +255,7 @@ public class DataCacheHandler extends SessionCache {
saveTask.stop(); saveTask.stop();
getTask.stop(); getTask.stop();
clearTask.stop(); clearTask.stop();
List<HandlingInfo> toProcess = processTask.stopAndReturnLeftovers(); List<Processor> toProcess = processTask.stopAndReturnLeftovers();
Benchmark.start("Cache: ProcessOnlineHandlingInfo"); Benchmark.start("Cache: ProcessOnlineHandlingInfo");
Log.debug("ToProcess size: " + toProcess.size() + " DataCache size: " + dataCache.keySet().size()); Log.debug("ToProcess size: " + toProcess.size() + " DataCache size: " + dataCache.keySet().size());
List<IPlayer> onlinePlayers = plugin.fetch().getOnlinePlayers(); List<IPlayer> onlinePlayers = plugin.fetch().getOnlinePlayers();
@ -265,11 +264,11 @@ public class DataCacheHandler extends SessionCache {
UUID uuid = p.getUuid(); UUID uuid = p.getUuid();
endSession(uuid); endSession(uuid);
String worldName = ((Player) p.getWrappedPlayerClass()).getWorld().getName(); String worldName = ((Player) p.getWrappedPlayerClass()).getWorld().getName();
toProcess.add(new LogoutInfo(uuid, time, p.isBanned(), p.getGamemode().name(), getSession(uuid), worldName)); //TODO toProcess.add(new LogoutInfo(uuid, time, p.isBanned(), p.getGamemode().name(), getSession(uuid), worldName));
} }
Log.debug("ToProcess size_AFTER: " + toProcess.size() + " DataCache size: " + dataCache.keySet().size()); Log.debug("ToProcess size_AFTER: " + toProcess.size() + " DataCache size: " + dataCache.keySet().size());
toProcess.sort(new HandlingInfoTimeComparator()); //TODO toProcess.sort(new HandlingInfoTimeComparator());
processUnprocessedHandlingInfo(toProcess); //TODO processUnprocessedHandlingInfo(toProcess);
Benchmark.stop("Cache: ProcessOnlineHandlingInfo"); Benchmark.stop("Cache: ProcessOnlineHandlingInfo");
List<UserData> data = new ArrayList<>(); List<UserData> data = new ArrayList<>();
data.addAll(dataCache.values()); data.addAll(dataCache.values());
@ -436,11 +435,12 @@ public class DataCacheHandler extends SessionCache {
if (userData == null) { if (userData == null) {
return false; return false;
} }
boolean isAccessed = (userData.isAccessed()) || saveTask.containsUUID(uuid) || processTask.containsUUID(uuid); /*TODO boolean isAccessed = (userData.isAccessed()) || saveTask.containsUUID(uuid) || processTask.containsUUID(uuid);
if (isAccessed) { if (isAccessed) {
userData.setClearAfterSave(false); userData.setClearAfterSave(false);
} }
return isAccessed; return isAccessed;*/
return true;
} }
/** /**