Limework
/
RedisBungee
mirror of https://github.com/proxiodev/RedisBungee.git
2
0
Fork 0
Code Releases Activity

Use an unbounded cache via ConcurrentHashMap.

This commit is contained in:
Tux 2014-08-10 06:34:05 -04:00
parent e15b4d23f3
commit 297d4a8a7f
1 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/com/imaginarycode/minecraft/redisbungee/DataManager.java
View File

@ -6,8 +6,6 @@
*/ */
package com.imaginarycode.minecraft.redisbungee; package com.imaginarycode.minecraft.redisbungee;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -22,6 +20,8 @@ import redis.clients.jedis.exceptions.JedisConnectionException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level; import java.util.logging.Level;
/** /**
@ -32,31 +32,10 @@ import java.util.logging.Level;
@RequiredArgsConstructor @RequiredArgsConstructor
public class DataManager implements Listener { public class DataManager implements Listener {
private final RedisBungee plugin; private final RedisBungee plugin;
private final ConcurrentMap<UUID, String> serverCache = new ConcurrentHashMap<>(192, 0.65f, 4);
/* private final ConcurrentMap<UUID, String> proxyCache = new ConcurrentHashMap<>(192, 0.65f, 4);
* Caches of player data in Redis. private final ConcurrentMap<UUID, InetAddress> ipCache = new ConcurrentHashMap<>(192, 0.65f, 4);
* private final ConcurrentMap<UUID, Long> lastOnlineCache = new ConcurrentHashMap<>(192, 0.65f, 4);
* Most of these are purged only based on size limits but are also invalidated on certain actions.
*/
private final Cache<UUID, String> serverCache = CacheBuilder.newBuilder()
.maximumSize(2000)
.concurrencyLevel(2)
.build();
private final Cache<UUID, String> proxyCache = CacheBuilder.newBuilder()
.maximumSize(2000)
.concurrencyLevel(2)
.build();
private final Cache<UUID, InetAddress> ipCache = CacheBuilder.newBuilder()
.maximumSize(2000)
.concurrencyLevel(2)
.build();
private final Cache<UUID, Long> lastOnlineCache = CacheBuilder.newBuilder()
.maximumSize(2000)
.concurrencyLevel(2)
.build();
static final UUID source = UUID.randomUUID(); static final UUID source = UUID.randomUUID();
@ -66,7 +45,7 @@ public class DataManager implements Listener {
if (player != null) if (player != null)
return player.getServer() != null ? player.getServer().getInfo().getName() : null; return player.getServer() != null ? player.getServer().getInfo().getName() : null;
String server = serverCache.getIfPresent(uuid); String server = serverCache.get(uuid);
if (server != null) if (server != null)
return server; return server;
@ -96,7 +75,7 @@ public class DataManager implements Listener {
if (player != null) if (player != null)
return plugin.getServerId(); return plugin.getServerId();
String server = proxyCache.getIfPresent(uuid); String server = proxyCache.get(uuid);
if (server != null) if (server != null)
return server; return server;
@ -126,7 +105,7 @@ public class DataManager implements Listener {
if (player != null) if (player != null)
return player.getAddress().getAddress(); return player.getAddress().getAddress();
InetAddress address = ipCache.getIfPresent(uuid); InetAddress address = ipCache.get(uuid);
if (address != null) if (address != null)
return address; return address;
@ -162,7 +141,7 @@ public class DataManager implements Listener {
if (player != null) if (player != null)
return 0; return 0;
Long time = lastOnlineCache.getIfPresent(uuid); Long time = lastOnlineCache.get(uuid);
if (time != null) if (time != null)
return time; return time;
@ -214,10 +193,10 @@ public class DataManager implements Listener {
} }
private void invalidate(UUID uuid) { private void invalidate(UUID uuid) {
ipCache.invalidate(uuid); ipCache.remove(uuid);
lastOnlineCache.invalidate(uuid); lastOnlineCache.remove(uuid);
serverCache.invalidate(uuid); serverCache.remove(uuid);
proxyCache.invalidate(uuid); proxyCache.remove(uuid);
} }
@EventHandler @EventHandler
@ -244,7 +223,7 @@ public class DataManager implements Listener {
// For now we will just invalidate the caches, depending on what action occurred. // For now we will just invalidate the caches, depending on what action occurred.
if (message.getAction() == DataManagerMessage.Action.SERVER_CHANGE) { if (message.getAction() == DataManagerMessage.Action.SERVER_CHANGE) {
serverCache.invalidate(message.getTarget()); serverCache.remove(message.getTarget());
} else { } else {
invalidate(message.getTarget()); invalidate(message.getTarget());
} }