refactor: revert `keys` change

feat/data-edit-commands
William 1 year ago
parent 28afffe95e
commit f803a0b57b
No known key found for this signature in database

@ -299,20 +299,16 @@ public class RedisManager extends JedisPubSub {
public void clearUsersCheckedOutOnServer() { public void clearUsersCheckedOutOnServer() {
final String keyFormat = String.format("%s*", RedisKeyType.DATA_CHECKOUT.getKeyPrefix(clusterId)); final String keyFormat = String.format("%s*", RedisKeyType.DATA_CHECKOUT.getKeyPrefix(clusterId));
try (Jedis jedis = jedisPool.getResource()) { try (Jedis jedis = jedisPool.getResource()) {
final Set<String> keys = Sets.newHashSet(); final Set<String> keys = jedis.keys(keyFormat);
if (keys == null) {
// Scan for keys plugin.log(Level.WARNING, "Checkout key returned null from Redis during clearing");
String nextCursor; return;
do { }
final ScanResult<String> scanResult = jedis.scan(keyFormat, new ScanParams().match(keyFormat)); for (String key : keys) {
keys.addAll(scanResult.getResult()); if (jedis.get(key).equals(plugin.getServerName())) {
nextCursor = scanResult.getCursor(); jedis.del(key);
} while (!nextCursor.equals("0")); }
}
// Delete matched keys
jedis.del(keys.stream()
.filter(k -> jedis.get(k).equals(plugin.getServerName()))
.toArray(String[]::new));
} catch (Throwable e) { } catch (Throwable e) {
plugin.log(Level.SEVERE, "An exception occurred clearing this server's checkout keys on Redis", e); plugin.log(Level.SEVERE, "An exception occurred clearing this server's checkout keys on Redis", e);
} }

Loading…
Cancel
Save