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

Compare Redis reads using Lettuce's synchronous path.

This commit is contained in:
Jon Chambers 2020-06-09 20:20:48 -04:00 committed by Jon Chambers
parent 0671f05c05
commit 4c623ca3c5
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimiter.java
View File

@ -113,7 +113,7 @@ public class RateLimiter {
final String bucketName = getBucketName(key); final String bucketName = getBucketName(key);
String serialized = jedis.get(bucketName); String serialized = jedis.get(bucketName);
redisClusterExperiment.compareFutureResult(serialized, cacheCluster.withReadCluster(connection -> connection.async().get(bucketName))); redisClusterExperiment.compareSupplierResult(serialized, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(bucketName)));
if (serialized != null) { if (serialized != null) {
return LeakyBucket.fromSerialized(mapper, serialized); return LeakyBucket.fromSerialized(mapper, serialized);

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java
View File

@ -60,7 +60,7 @@ public class AccountDatabaseCrawlerCache {
public boolean isAccelerated() { public boolean isAccelerated() {
try (Jedis jedis = jedisPool.getWriteResource()) { try (Jedis jedis = jedisPool.getWriteResource()) {
final String accelerated = jedis.get(ACCELERATE_KEY); final String accelerated = jedis.get(ACCELERATE_KEY);
redisClusterExperiment.compareFutureResult(accelerated, cacheCluster.withReadCluster(connection -> connection.async().get(ACCELERATE_KEY))); redisClusterExperiment.compareSupplierResult(accelerated, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(ACCELERATE_KEY)));
return "1".equals(accelerated); return "1".equals(accelerated);
} }
@ -88,7 +88,7 @@ public class AccountDatabaseCrawlerCache {
public Optional<UUID> getLastUuid() { public Optional<UUID> getLastUuid() {
try (Jedis jedis = jedisPool.getWriteResource()) { try (Jedis jedis = jedisPool.getWriteResource()) {
String lastUuidString = jedis.get(LAST_UUID_KEY); String lastUuidString = jedis.get(LAST_UUID_KEY);
redisClusterExperiment.compareFutureResult(lastUuidString, cacheCluster.withWriteCluster(connection -> connection.async().get(LAST_UUID_KEY))); redisClusterExperiment.compareSupplierResult(lastUuidString, () -> cacheCluster.withWriteCluster(connection -> connection.sync().get(LAST_UUID_KEY)));
if (lastUuidString == null) return Optional.empty(); if (lastUuidString == null) return Optional.empty();
else return Optional.of(UUID.fromString(lastUuidString)); else return Optional.of(UUID.fromString(lastUuidString));

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
View File

@ -179,7 +179,7 @@ public class AccountsManager {
final String key = getAccountMapKey(number); final String key = getAccountMapKey(number);
String uuid = jedis.get(key); String uuid = jedis.get(key);
redisClusterExperiment.compareFutureResult(uuid, cacheCluster.withReadCluster(connection -> connection.async().get(key))); redisClusterExperiment.compareSupplierResult(uuid, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(key)));
if (uuid != null) return redisGet(jedis, UUID.fromString(uuid)); if (uuid != null) return redisGet(jedis, UUID.fromString(uuid));
else return Optional.empty(); else return Optional.empty();
@ -203,7 +203,7 @@ public class AccountsManager {
final String key = getAccountEntityKey(uuid); final String key = getAccountEntityKey(uuid);
String json = jedis.get(key); String json = jedis.get(key);
redisClusterExperiment.compareFutureResult(json, cacheCluster.withReadCluster(connection -> connection.async().get(key))); redisClusterExperiment.compareSupplierResult(json, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(key)));
if (json != null) { if (json != null) {
Account account = mapper.readValue(json, Account.class); Account account = mapper.readValue(json, Account.class);

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/ActiveUserCounter.java
View File

@ -165,7 +165,7 @@ public class ActiveUserCounter extends AccountDatabaseCrawlerListener {
private void incrementTallies(UUID fromUuid, Map<String, long[]> platformIncrements, Map<String, long[]> countryIncrements) { private void incrementTallies(UUID fromUuid, Map<String, long[]> platformIncrements, Map<String, long[]> countryIncrements) {
try (Jedis jedis = jedisPool.getWriteResource()) { try (Jedis jedis = jedisPool.getWriteResource()) {
String tallyValue = jedis.get(TALLY_KEY); String tallyValue = jedis.get(TALLY_KEY);
redisClusterExperiment.compareFutureResult(tallyValue, cacheCluster.withReadCluster(connection -> connection.async().get(TALLY_KEY))); redisClusterExperiment.compareSupplierResult(tallyValue, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(TALLY_KEY)));
ActiveUserTally activeUserTally; ActiveUserTally activeUserTally;
@ -210,7 +210,7 @@ public class ActiveUserCounter extends AccountDatabaseCrawlerListener {
private ActiveUserTally getFinalTallies() { private ActiveUserTally getFinalTallies() {
try (Jedis jedis = jedisPool.getReadResource()) { try (Jedis jedis = jedisPool.getReadResource()) {
final String tallyJson = jedis.get(TALLY_KEY); final String tallyJson = jedis.get(TALLY_KEY);
redisClusterExperiment.compareFutureResult(tallyJson, cacheCluster.withReadCluster(connection -> connection.async().get(TALLY_KEY))); redisClusterExperiment.compareSupplierResult(tallyJson, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(TALLY_KEY)));
return mapper.readValue(tallyJson, ActiveUserTally.class); return mapper.readValue(tallyJson, ActiveUserTally.class);
} catch (IOException e) { } catch (IOException e) {

2
service/src/main/java/org/whispersystems/textsecuregcm/storage/PendingAccountsManager.java
View File

@ -89,7 +89,7 @@ public class PendingAccountsManager {
final String key = CACHE_PREFIX + number; final String key = CACHE_PREFIX + number;
String json = jedis.get(key); String json = jedis.get(key);
redisClusterExperiment.compareFutureResult(json, cacheCluster.withReadCluster(connection -> connection.async().get(key))); redisClusterExperiment.compareSupplierResult(json, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(key)));
if (json == null) return Optional.empty(); if (json == null) return Optional.empty();
else return Optional.of(mapper.readValue(json, StoredVerificationCode.class)); else return Optional.of(mapper.readValue(json, StoredVerificationCode.class));

2
service/src/main/java/org/whispersystems/textsecuregcm/storage/PendingDevicesManager.java
View File

@ -88,7 +88,7 @@ public class PendingDevicesManager {
final String key = CACHE_PREFIX + number; final String key = CACHE_PREFIX + number;
String json = jedis.get(key); String json = jedis.get(key);
redisClusterExperiment.compareFutureResult(json, cacheCluster.withReadCluster(connection -> connection.async().get(key))); redisClusterExperiment.compareSupplierResult(json, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(key)));
if (json == null) return Optional.empty(); if (json == null) return Optional.empty();
else return Optional.of(mapper.readValue(json, StoredVerificationCode.class)); else return Optional.of(mapper.readValue(json, StoredVerificationCode.class));

2
service/src/main/java/org/whispersystems/textsecuregcm/storage/ProfilesManager.java
View File

@ -74,7 +74,7 @@ public class ProfilesManager {
final String key = CACHE_PREFIX + uuid.toString(); final String key = CACHE_PREFIX + uuid.toString();
String json = jedis.hget(key, version); String json = jedis.hget(key, version);
redisClusterExperiment.compareFutureResult(json, cacheCluster.withReadCluster(connection -> connection.async().hget(key, version))); redisClusterExperiment.compareSupplierResult(json, () -> cacheCluster.withReadCluster(connection -> connection.sync().hget(key, version)));
if (json == null) return Optional.empty(); if (json == null) return Optional.empty();
else return Optional.of(mapper.readValue(json, VersionedProfile.class)); else return Optional.of(mapper.readValue(json, VersionedProfile.class));

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java
View File

@ -148,7 +148,7 @@ public class UsernamesManager {
final String key = getUsernameMapKey(username); final String key = getUsernameMapKey(username);
String result = jedis.get(key); String result = jedis.get(key);
redisClusterExperiment.compareFutureResult(result, cacheCluster.withReadCluster(connection -> connection.async().get(key))); redisClusterExperiment.compareSupplierResult(result, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(key)));
if (result == null) return Optional.empty(); if (result == null) return Optional.empty();
else return Optional.of(UUID.fromString(result)); else return Optional.of(UUID.fromString(result));
@ -165,7 +165,7 @@ public class UsernamesManager {
final String key = getUuidMapKey(uuid); final String key = getUuidMapKey(uuid);
final String result = jedis.get(key); final String result = jedis.get(key);
redisClusterExperiment.compareFutureResult(result, cacheCluster.withReadCluster(connection -> connection.async().get(key))); redisClusterExperiment.compareSupplierResult(result, () -> cacheCluster.withReadCluster(connection -> connection.sync().get(key)));
return Optional.ofNullable(result); return Optional.ofNullable(result);
} catch (JedisException e) { } catch (JedisException e) {