Experimental cache improvements

mewna · Sep 29, 2020 · 1622257 · 1622257
1 parent 514b680
commit 1622257
Show file tree

Hide file tree

Showing 11 changed files with 486 additions and 330 deletions.
diff --git a/src/main/java/com/mewna/catnip/CatnipOptions.java b/src/main/java/com/mewna/catnip/CatnipOptions.java
@@ -30,7 +30,7 @@
 import com.grack.nanojson.JsonObject;
 import com.mewna.catnip.cache.CacheFlag;
 import com.mewna.catnip.cache.EntityCacheWorker;
-import com.mewna.catnip.cache.SplitMemoryEntityCache;
+import com.mewna.catnip.cache.MemoryEntityCache;
 import com.mewna.catnip.entity.delegate.DefaultEntityDelegator;
 import com.mewna.catnip.entity.delegate.EntityDelegator;
 import com.mewna.catnip.entity.serialization.DefaultEntitySerializer;
@@ -93,7 +93,7 @@ public final class CatnipOptions implements CatnipOptionsView, Cloneable {
     @Nonnull
     private EventBuffer eventBuffer = new CachingBuffer();
     @Nonnull
-    private EntityCacheWorker cacheWorker = new SplitMemoryEntityCache();
+    private EntityCacheWorker cacheWorker = new MemoryEntityCache();
     @Nonnull
     private Set<CacheFlag> cacheFlags = EnumSet.noneOf(CacheFlag.class);
     @Nonnull

diff --git a/src/main/java/com/mewna/catnip/cache/EntityCache.java b/src/main/java/com/mewna/catnip/cache/EntityCache.java
@@ -38,7 +38,6 @@
 import com.mewna.catnip.entity.user.User;
 import com.mewna.catnip.entity.user.VoiceState;
 import io.reactivex.rxjava3.core.Maybe;
-import io.reactivex.rxjava3.core.Single;
 
 import javax.annotation.Nonnull;
 

diff --git a/src/main/java/com/mewna/catnip/cache/MemoryEntityCache.java b/src/main/java/com/mewna/catnip/cache/MemoryEntityCache.java
diff --git a/src/main/java/com/mewna/catnip/cache/SplitMemoryEntityCache.java b/src/main/java/com/mewna/catnip/cache/SplitMemoryEntityCache.java
diff --git a/src/main/java/com/mewna/catnip/cache/UnifiedMemoryEntityCache.java b/src/main/java/com/mewna/catnip/cache/UnifiedMemoryEntityCache.java
diff --git a/src/main/java/com/mewna/catnip/entity/impl/EntityBuilder.java b/src/main/java/com/mewna/catnip/entity/impl/EntityBuilder.java
@@ -150,10 +150,14 @@ private static FieldImpl createField(@Nonnull final JsonObject data) {
                 .build();
     }
 
+    public static <T, R extends T> R staticDelegate(@Nonnull final Catnip catnip, @Nonnull final Class<T> type, @Nonnull final T data) {
+        return catnip.options().entityDelegator().delegate(type, data);
+    }
+
     @Nonnull
     @CheckReturnValue
-    private <T, R extends T> R delegate(@Nonnull final Class<T> type, @Nonnull final T data) {
-        return catnip.options().entityDelegator().delegate(type, data);
+    public <T, R extends T> R delegate(@Nonnull final Class<T> type, @Nonnull final T data) {
+        return staticDelegate(catnip, type, data);
     }
 
     @Nonnull