cache improvements

cyraxxPy · Dec 18, 2019 · dcf2e82 · dcf2e82
1 parent 227cdcf
commit dcf2e82
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/com/jagrosh/vortex/Constants.java b/src/main/java/com/jagrosh/vortex/Constants.java
@@ -33,6 +33,7 @@ public class Constants
     public final static String HELP_REACTION   = SUCCESS.replaceAll("<a?:(.+):(\\d+)>", "$1:$2");
     public final static String ERROR_REACTION  = ERROR.replaceAll("<a?:(.+):(\\d+)>", "$1:$2");
     public final static String VORTEX_EMOJI    = "<:Vortex:386971287282515970>";
+    public final static int DEFAULT_CACHE_SIZE = 2000;
     public final static Permission[] PERMISSIONS = {Permission.ADMINISTRATOR, Permission.BAN_MEMBERS, Permission.KICK_MEMBERS, Permission.MANAGE_ROLES,
                                         Permission.MANAGE_SERVER, Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_READ,
                                         Permission.MESSAGE_WRITE,Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_HISTORY, Permission.MESSAGE_EXT_EMOJI,

diff --git a/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java b/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java
@@ -20,6 +20,7 @@
 import com.jagrosh.easysql.SQLColumn;
 import com.jagrosh.easysql.columns.*;
 import com.jagrosh.vortex.Action;
+import com.jagrosh.vortex.Constants;
 import com.jagrosh.vortex.utils.FixedCache;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -60,7 +61,7 @@ public class AutomodManager extends DataManager
     public final static SQLColumn<Integer> DEHOIST_CHAR = new IntegerColumn("DEHOIST_CHAR", false, 0);
 
     // Cache
-    private final FixedCache<Long, AutomodSettings> cache = new FixedCache<>(1000);
+    private final FixedCache<Long, AutomodSettings> cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE);
     private final AutomodSettings blankSettings = new AutomodSettings();
 
     public AutomodManager(DatabaseConnector connector)

diff --git a/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java b/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java
@@ -20,6 +20,7 @@
 import com.jagrosh.easysql.SQLColumn;
 import com.jagrosh.easysql.columns.*;
 import com.jagrosh.vortex.Action;
+import com.jagrosh.vortex.Constants;
 import com.jagrosh.vortex.automod.Filter;
 import com.jagrosh.vortex.utils.FixedCache;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ public class FilterManager extends DataManager
     public final static SQLColumn<Integer> STRIKES = new IntegerColumn("STRIKES", false, 0);
     public final static SQLColumn<String> CONTENT = new StringColumn("CONTENT", false, "", Filter.MAX_CONTENT_LENGTH);
 
-    private final FixedCache<Long, List<Filter>> cache = new FixedCache<>(1000);
+    private final FixedCache<Long, List<Filter>> cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE);
 
     public FilterManager(DatabaseConnector connector)
     {

diff --git a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java
@@ -63,7 +63,7 @@ public class GuildSettingsDataManager extends DataManager implements GuildSettin
     // level to set permission when finished
 
     // Cache
-    private final FixedCache<Long, GuildSettings> cache = new FixedCache<>(1000);
+    private final FixedCache<Long, GuildSettings> cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE);
     private final GuildSettings blankSettings = new GuildSettings();
 
     public GuildSettingsDataManager(DatabaseConnector connector)

diff --git a/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java b/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java
@@ -19,6 +19,7 @@
 import com.jagrosh.easysql.DatabaseConnector;
 import com.jagrosh.easysql.SQLColumn;
 import com.jagrosh.easysql.columns.*;
+import com.jagrosh.vortex.Constants;
 import com.jagrosh.vortex.utils.FixedCache;
 import java.util.HashSet;
 import java.util.List;
@@ -39,7 +40,7 @@ public class IgnoreManager extends DataManager
     public final static SQLColumn<Long> ENTITY_ID = new LongColumn("ENTITY_ID",false,0L,true);
     public final static SQLColumn<Integer> TYPE = new IntegerColumn("TYPE",false,0);
 
-    private final FixedCache<Long, Set<Long>> cache = new FixedCache<>(1000);
+    private final FixedCache<Long, Set<Long>> cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE);
 
     public IgnoreManager(DatabaseConnector connector)
     {

diff --git a/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java b/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java
@@ -4,6 +4,7 @@
 import com.jagrosh.easysql.DatabaseConnector;
 import com.jagrosh.easysql.SQLColumn;
 import com.jagrosh.easysql.columns.LongColumn;
+import com.jagrosh.vortex.Constants;
 import com.jagrosh.vortex.utils.FixedCache;
 import net.dv8tion.jda.core.entities.Guild;
 import org.slf4j.LoggerFactory;
@@ -26,7 +27,7 @@ public class InviteWhitelistManager extends DataManager
     public static final SQLColumn<Long> GUILD_ID = new LongColumn("GUILD_ID", false, 0L);
     public static final SQLColumn<Long> WHITELIST_ID = new LongColumn("WL_ID", false, 0L);
 
-    private final FixedCache<Long, List<Long>> cache = new FixedCache<>(1000);
+    private final FixedCache<Long, List<Long>> cache = new FixedCache<>(Constants.DEFAULT_CACHE_SIZE);
 
     public InviteWhitelistManager(DatabaseConnector connector)
     {

diff --git a/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java b/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java
@@ -20,7 +20,6 @@
 import com.jagrosh.easysql.SQLColumn;
 import com.jagrosh.easysql.columns.InstantColumn;
 import com.jagrosh.easysql.columns.LongColumn;
-import com.jagrosh.vortex.utils.OtherUtil;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import net.dv8tion.jda.core.JDA;