From 6ddc0471cf4778d808366b66c04d8e5af52af636 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 8 Aug 2021 10:33:09 -0700 Subject: [PATCH] Remove saving to database on disable. https://github.com/BentoBoxWorld/Level/issues/229 First, the top ten tables are never actually used or loaded. They are created in memory by loading the island levels. So there is no reason to keep saving them. Second, the island level data is saved every time it is changed, so there is no need to save all of the cache on exit. --- src/main/java/world/bentobox/level/Level.java | 5 --- .../world/bentobox/level/LevelsManager.java | 42 ++++--------------- .../bentobox/level/LevelsManagerTest.java | 12 +----- 3 files changed, 11 insertions(+), 48 deletions(-) diff --git a/src/main/java/world/bentobox/level/Level.java b/src/main/java/world/bentobox/level/Level.java index b4c2422..92e916c 100644 --- a/src/main/java/world/bentobox/level/Level.java +++ b/src/main/java/world/bentobox/level/Level.java @@ -247,11 +247,6 @@ public class Level extends Addon implements Listener { public void onDisable() { // Stop the pipeline this.getPipeliner().stop(); - // Save player data and the top tens - if (manager != null) { - manager.save(); - } - } private void loadBlockSettings() { diff --git a/src/main/java/world/bentobox/level/LevelsManager.java b/src/main/java/world/bentobox/level/LevelsManager.java index d67ba1b..23b33f2 100644 --- a/src/main/java/world/bentobox/level/LevelsManager.java +++ b/src/main/java/world/bentobox/level/LevelsManager.java @@ -64,8 +64,6 @@ public class LevelsManager { private final Database handler; // A cache of island levels. private final Map levelsCache; - - private final Database topTenHandler; // Top ten lists private final Map topTenLists; // Background @@ -79,8 +77,6 @@ public class LevelsManager { // Set up the database handler to store and retrieve data // Note that these are saved by the BentoBox database handler = new Database<>(addon, IslandLevels.class); - // Top Ten handler - topTenHandler = new Database<>(addon, TopTenData.class); // Initialize the cache levelsCache = new HashMap<>(); // Initialize top ten lists @@ -181,8 +177,6 @@ public class LevelsManager { } // Save result setIslandResults(island.getWorld(), island.getOwner(), r); - // Save top ten - addon.getManager().saveTopTen(island.getWorld()); // Save the island scan details result.complete(r); }); @@ -418,11 +412,11 @@ public class LevelsManager { .collect(Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new))); } - + void createAndCleanRankings(@NonNull World world) { topTenLists.computeIfAbsent(world, TopTenData::new); // Remove player from top ten if they are online and do not have the perm - topTenLists.get(world).getTopTen().keySet().removeIf(u -> !hasTopTenPerm(world, u)); + topTenLists.get(world).getTopTen().keySet().removeIf(u -> !hasTopTenPerm(world, u)); } /** @@ -441,12 +435,12 @@ public class LevelsManager { public int getRank(@NonNull World world, UUID uuid) { createAndCleanRankings(world); Stream> stream = topTenLists.get(world).getTopTen().entrySet().stream() - .filter(e -> addon.getIslands().isOwner(world, e.getKey())) - .filter(l -> l.getValue() > 0) - .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())); + .filter(e -> addon.getIslands().isOwner(world, e.getKey())) + .filter(l -> l.getValue() > 0) + .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())); return takeWhile(stream, x -> !x.getKey().equals(uuid)).map(Map.Entry::getKey).collect(Collectors.toList()).size() + 1; } - + /** * Java 8's version of Java 9's takeWhile * @param stream @@ -457,7 +451,7 @@ public class LevelsManager { CustomSpliterator customSpliterator = new CustomSpliterator<>(stream.spliterator(), predicate); return StreamSupport.stream(customSpliterator, false); } - + /** * Checks if player has the correct top ten perm to have their level saved * @param world @@ -475,15 +469,14 @@ public class LevelsManager { void loadTopTens() { topTenLists.clear(); Bukkit.getScheduler().runTaskAsynchronously(addon.getPlugin(), () -> { - addon.log("Generating Top Ten Tables"); + addon.log("Generating rankings"); handler.loadObjects().forEach(il -> { if (il.getLevel() > 0) { addon.getIslands().getIslandById(il.getUniqueId()).ifPresent(i -> this.addToTopTen(i, il.getLevel())); } }); topTenLists.keySet().forEach(w -> { - addon.log("Loaded top ten for " + w.getName()); - this.saveTopTen(w); + addon.log("Generated rankings for " + w.getName()); }); }); @@ -497,27 +490,10 @@ public class LevelsManager { public void removeEntry(World world, UUID uuid) { if (topTenLists.containsKey(world)) { topTenLists.get(world).getTopTen().remove(uuid); - topTenHandler.saveObjectAsync(topTenLists.get(world)); } } - /** - * Saves all player data and the top ten - */ - public void save() { - levelsCache.values().forEach(handler::saveObjectAsync); - topTenLists.values().forEach(topTenHandler::saveObjectAsync); - } - - /** - * Save the top ten for world - * @param world - world - */ - public void saveTopTen(World world) { - topTenHandler.saveObjectAsync(topTenLists.get(world)); - } - /** * Set an initial island level * @param island - the island to set. Must have a non-null world diff --git a/src/test/java/world/bentobox/level/LevelsManagerTest.java b/src/test/java/world/bentobox/level/LevelsManagerTest.java index ec4c184..f7c99e9 100644 --- a/src/test/java/world/bentobox/level/LevelsManagerTest.java +++ b/src/test/java/world/bentobox/level/LevelsManagerTest.java @@ -401,14 +401,6 @@ public class LevelsManagerTest { assertFalse(tt.containsKey(uuid)); } - /** - * Test method for {@link world.bentobox.level.LevelsManager#save()}. - */ - @Test - public void testSave() { - lm.save(); - } - /** * Test method for {@link world.bentobox.level.LevelsManager#setInitialIslandLevel(world.bentobox.bentobox.database.objects.Island, long)}. */ @@ -443,7 +435,7 @@ public class LevelsManagerTest { } */ } - + /** * Test method for {@link world.bentobox.level.LevelsManager#getRank(World, UUID)} */ @@ -453,7 +445,7 @@ public class LevelsManagerTest { Map ttl = lm.getTopTenLists(); Map tt = ttl.get(world).getTopTen(); for (long i = 100; i < 150; i++) { - tt.put(UUID.randomUUID(), i); + tt.put(UUID.randomUUID(), i); } // Put player as lowest rank tt.put(uuid, 10L);