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

Chunk local directory update queries. 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-01-03 19:43:19 -08:00
parent fa4e492d1c
commit 32c0712715
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/whispersystems/textsecuregcm/storage/DirectoryManager.java
View File

@ -171,12 +171,15 @@ public class DirectoryManager {
}
private static class TokenValue {
@JsonProperty(value = "r")
private String relay;
@JsonProperty(value = "s")
private boolean supportsSms;
public TokenValue() {}
public TokenValue(String relay, boolean supportsSms) {
this.relay = relay;
this.supportsSms = supportsSms;

32
src/main/java/org/whispersystems/textsecuregcm/workers/DirectoryUpdater.java
View File

@ -38,6 +38,8 @@ import static org.whispersystems.textsecuregcm.storage.DirectoryManager.PendingC
public class DirectoryUpdater {
private static final int CHUNK_SIZE = 10000;
private final Logger logger = LoggerFactory.getLogger(DirectoryUpdater.class);
private final AccountsManager accountsManager;
@ -60,24 +62,28 @@ public class DirectoryUpdater {
try {
logger.info("Updating from local DB.");
Iterator<Account> accounts = accountsManager.getAll();
int offset = 0;
if (accounts == null)
return;
for (;;) {
List<Account> accounts = accountsManager.getAll(offset, CHUNK_SIZE);
while (accounts.hasNext()) {
Account account = accounts.next();
if (accounts == null || accounts.isEmpty()) break;
else offset += accounts.size();
if (account.isActive()) {
byte[] token = Util.getContactToken(account.getNumber());
ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms());
for (Account account : accounts) {
if (account.isActive()) {
byte[] token = Util.getContactToken(account.getNumber());
ClientContact clientContact = new ClientContact(token, null, account.getSupportsSms());
directory.add(batchOperation, clientContact);
contactsAdded++;
} else {
directory.remove(batchOperation, account.getNumber());
contactsRemoved++;
directory.add(batchOperation, clientContact);
contactsAdded++;
} else {
directory.remove(batchOperation, account.getNumber());
contactsRemoved++;
}
}
logger.info("Processed " + CHUNK_SIZE + " local accounts...");
}
} finally {
directory.stopBatchOperation(batchOperation);