MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Un-reinvent the clustered script execution wheel.

This commit is contained in:
Jon Chambers 2020-06-17 22:11:37 -04:00 committed by Jon Chambers
parent e9b0100b06
commit 26a03b55de
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScript.java
View File

@ -46,20 +46,12 @@ public class ClusterLuaScript {
public Object execute(final List<String> keys, final List<String> args) { public Object execute(final List<String> keys, final List<String> args) {
return redisCluster.withWriteCluster(connection -> { return redisCluster.withWriteCluster(connection -> {
final RedisAdvancedClusterCommands<String, String> clusterCommands = connection.sync(); final RedisAdvancedClusterCommands<String, String> clusterCommands = connection.sync();
final RedisCommands<String, String> redisCommands;
if (keys.isEmpty()) {
redisCommands = clusterCommands.masters().commands(0);
} else {
final int slot = SlotHash.getSlot(keys.get(0));
redisCommands = clusterCommands.nodes(node -> node.is(RedisClusterNode.NodeFlag.MASTER) && node.hasSlot(slot)).commands(0);
}
try { try {
return redisCommands.evalsha(sha, scriptOutputType, keys.toArray(STRING_ARRAY), args.toArray(STRING_ARRAY)); return clusterCommands.evalsha(sha, scriptOutputType, keys.toArray(STRING_ARRAY), args.toArray(STRING_ARRAY));
} catch (final RedisNoScriptException e) { } catch (final RedisNoScriptException e) {
clusterCommands.scriptLoad(script); clusterCommands.scriptLoad(script);
return redisCommands.evalsha(sha, scriptOutputType, keys.toArray(STRING_ARRAY), args.toArray(STRING_ARRAY)); return clusterCommands.evalsha(sha, scriptOutputType, keys.toArray(STRING_ARRAY), args.toArray(STRING_ARRAY));
} }
}); });
} }