Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 17:08:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add parallel pathways for getting accounts asyncronously to Accounts

Browse Source
This commit is contained in:
Jon Chambers
2023-07-11 15:58:21 -04:00
committed by Jon Chambers
parent 1605676509
commit 7d19e58953
2 changed files with 97 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
@@ -631,12 +632,23 @@ public class Accounts extends AbstractDynamoDbStore {
GET_BY_NUMBER_TIMER, phoneNumberConstraintTableName, ATTR_ACCOUNT_E164, AttributeValues.fromString(number));
}
@Nonnull
public CompletableFuture<Optional<Account>> getByE164Async(final String number) {
return getByIndirectLookupAsync(
GET_BY_NUMBER_TIMER, phoneNumberConstraintTableName, ATTR_ACCOUNT_E164, AttributeValues.fromString(number));
}
@Nonnull
public Optional<Account> getByPhoneNumberIdentifier(final UUID phoneNumberIdentifier) {
return getByIndirectLookup(
GET_BY_PNI_TIMER, phoneNumberIdentifierConstraintTableName, ATTR_PNI_UUID, AttributeValues.fromUUID(phoneNumberIdentifier));
}
@Nonnull
public CompletableFuture<Optional<Account>> getByPhoneNumberIdentifierAsync(final UUID phoneNumberIdentifier) {
return getByIndirectLookupAsync(GET_BY_PNI_TIMER, phoneNumberIdentifierConstraintTableName, ATTR_PNI_UUID, AttributeValues.fromUUID(phoneNumberIdentifier));
}
@Nonnull
public Optional<Account> getByUsernameHash(final byte[] usernameHash) {
return getByIndirectLookup(
@@ -662,6 +674,13 @@ public class Accounts extends AbstractDynamoDbStore {
.map(Accounts::fromItem)));
}
@Nonnull
public CompletableFuture<Optional<Account>> getByAccountIdentifierAsync(final UUID uuid) {
return record(GET_BY_UUID_TIMER, () -> itemByKeyAsync(accountsTableName, KEY_ACCOUNT_UUID, AttributeValues.fromUUID(uuid))
.thenApply(maybeItem -> maybeItem.map(Accounts::fromItem)))
.toCompletableFuture();
}
public void delete(final UUID uuid) {
DELETE_TIMER.record(() -> getByAccountIdentifier(uuid).ifPresent(account -> {
@@ -724,6 +743,16 @@ public class Accounts extends AbstractDynamoDbStore {
return getByIndirectLookup(timer, tableName, keyName, keyValue, i -> true);
}
@Nonnull
private CompletableFuture<Optional<Account>> getByIndirectLookupAsync(
final Timer timer,
final String tableName,
final String keyName,
final AttributeValue keyValue) {
return getByIndirectLookupAsync(timer, tableName, keyName, keyValue, i -> true);
}
@Nonnull
private Optional<Account> getByIndirectLookup(
final Timer timer,
@@ -739,6 +768,24 @@ public class Accounts extends AbstractDynamoDbStore {
.map(Accounts::fromItem)));
}
@Nonnull
private CompletableFuture<Optional<Account>> getByIndirectLookupAsync(
final Timer timer,
final String tableName,
final String keyName,
final AttributeValue keyValue,
final Predicate<? super Map<String, AttributeValue>> predicate) {
return record(timer, () -> itemByKeyAsync(tableName, keyName, keyValue)
.thenCompose(maybeItem -> maybeItem
.filter(predicate)
.map(item -> item.get(KEY_ACCOUNT_UUID))
.map(uuid -> itemByKeyAsync(accountsTableName, KEY_ACCOUNT_UUID, uuid)
.thenApply(maybeAccountItem -> maybeAccountItem.map(Accounts::fromItem)))
.orElse(CompletableFuture.completedFuture(Optional.empty()))))
.toCompletableFuture();
}
@Nonnull
private Optional<Map<String, AttributeValue>> itemByKey(final String table, final String keyName, final AttributeValue keyValue) {
final GetItemResponse response = db().getItem(GetItemRequest.builder()
@@ -749,6 +796,16 @@ public class Accounts extends AbstractDynamoDbStore {
return Optional.ofNullable(response.item()).filter(m -> !m.isEmpty());
}
@Nonnull
private CompletableFuture<Optional<Map<String, AttributeValue>>> itemByKeyAsync(final String table, final String keyName, final AttributeValue keyValue) {
return asyncClient.getItem(GetItemRequest.builder()
.tableName(table)
.key(Map.of(keyName, keyValue))
.consistentRead(true)
.build())
.thenApply(response -> Optional.ofNullable(response.item()).filter(item -> !item.isEmpty()));
}
@Nonnull
private Optional<Map<String, AttributeValue>> itemByGsiKey(final String table, final String indexName, final String keyName, final AttributeValue keyValue) {
final QueryResponse response = db().query(QueryRequest.builder()