From f5cdb98b01976a6e26600bbddbe51918efd47ca2 Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 19 May 2021 12:31:48 +0100 Subject: [PATCH] Fix ExpiringSet not really working & causing memory leaks (#3027) --- .../messaging/LuckPermsMessagingService.java | 3 +- .../file/watcher/FileWatcher.java | 3 +- .../luckperms/common/util/ExpiringSet.java | 28 ++++++++++++------- velocity/build.gradle | 6 ++-- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java index af7465c54..a49f283ea 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java @@ -53,13 +53,12 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Objects; -import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; public class LuckPermsMessagingService implements InternalMessagingService, IncomingMessageConsumer { private final LuckPermsPlugin plugin; - private final Set receivedMessages; + private final ExpiringSet receivedMessages; private final PushUpdateBuffer updateBuffer; private final MessengerProvider messengerProvider; diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/watcher/FileWatcher.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/watcher/FileWatcher.java index 4a1ada46a..2aaddcd67 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/watcher/FileWatcher.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/watcher/FileWatcher.java @@ -36,7 +36,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; @@ -98,7 +97,7 @@ public class FileWatcher extends AbstractFileWatcher { private final Path path; /** A set of files which have been modified recently */ - private final Set recentlyModifiedFiles = new ExpiringSet<>(4, TimeUnit.SECONDS); + private final ExpiringSet recentlyModifiedFiles = new ExpiringSet<>(4, TimeUnit.SECONDS); /** The listener callback functions */ private final List> callbacks = new CopyOnWriteArrayList<>(); diff --git a/common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java b/common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java index 70df598ab..8ed2535d9 100644 --- a/common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/ExpiringSet.java @@ -26,10 +26,7 @@ package me.lucko.luckperms.common.util; import com.github.benmanes.caffeine.cache.Cache; -import com.google.common.collect.ForwardingSet; -import java.util.Collections; -import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -37,16 +34,27 @@ import java.util.concurrent.TimeUnit; * * @param element type */ -public class ExpiringSet extends ForwardingSet { - private final Set setView; +public class ExpiringSet { + private final Cache cache; + private final long lifetime; public ExpiringSet(long duration, TimeUnit unit) { - Cache cache = CaffeineFactory.newBuilder().expireAfterAccess(duration, unit).build(); - this.setView = Collections.newSetFromMap(cache.asMap()); + this.cache = CaffeineFactory.newBuilder().expireAfterWrite(duration, unit).build(); + this.lifetime = unit.toMillis(duration); } - @Override - protected Set delegate() { - return this.setView; + public boolean add(E item) { + boolean present = contains(item); + this.cache.put(item, System.currentTimeMillis() + this.lifetime); + return !present; + } + + public boolean contains(E item) { + Long timeout = this.cache.getIfPresent(item); + return timeout != null && timeout > System.currentTimeMillis(); + } + + public void remove(E item) { + this.cache.invalidate(item); } } diff --git a/velocity/build.gradle b/velocity/build.gradle index 9ea150c14..652bcf608 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -4,14 +4,14 @@ plugins { } repositories { - maven { url 'https://repo.velocitypowered.com/snapshots/' } + maven { url 'https://repo.velocitypowered.com/releases/' } } dependencies { compile project(':common') - compileOnly 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT' - annotationProcessor 'com.velocitypowered:velocity-api:1.1.0-SNAPSHOT' + compileOnly 'com.velocitypowered:velocity-api:1.1.5' + annotationProcessor 'com.velocitypowered:velocity-api:1.1.5' } blossom {