opendev/gerrit
Code Issues Proposed changes

Merge "Use LoadingCache#getAll in AccountCacheImpl"

Browse Source
This commit is contained in:
Alice Kober-Sotzek
2020-07-24 12:46:46 +00:00
committed by Gerrit Code Review
parent c68e568365 3f01725c9e
commit 649f156902
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/com/google/gerrit/server/account/AccountCacheImpl.java
View File

@@ -19,6 +19,7 @@ import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_USE
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
import com.google.common.flogger.FluentLogger; import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.RefNames;
@@ -113,20 +114,21 @@ public class AccountCacheImpl implements AccountCache {
? defaultPreferenceCache.get(ref.getObjectId()) ? defaultPreferenceCache.get(ref.getObjectId())
: DefaultPreferencesCache.EMPTY; : DefaultPreferencesCache.EMPTY;
ImmutableMap.Builder<Account.Id, AccountState> result = ImmutableMap.builder(); Set<CachedAccountDetails.Key> keys =
Sets.newLinkedHashSetWithExpectedSize(accountIds.size());
for (Account.Id id : accountIds) { for (Account.Id id : accountIds) {
Ref userRef = allUsers.exactRef(RefNames.refsUsers(id)); Ref userRef = allUsers.exactRef(RefNames.refsUsers(id));
if (userRef == null) { if (userRef == null) {
continue; continue;
} }
keys.add(CachedAccountDetails.Key.create(id, userRef.getObjectId()));
}
ImmutableMap.Builder<Account.Id, AccountState> result = ImmutableMap.builder();
for (Map.Entry<CachedAccountDetails.Key, CachedAccountDetails> account :
accountDetailsCache.getAll(keys).entrySet()) {
result.put( result.put(
id, account.getKey().accountId(),
AccountState.forCachedAccount( AccountState.forCachedAccount(account.getValue(), defaultPreferences, externalIds));
accountDetailsCache.get(
CachedAccountDetails.Key.create(id, userRef.getObjectId())),
defaultPreferences,
externalIds));
} }
return result.build(); return result.build();
} }