opendev/gerrit
Code Issues Proposed changes

ChangeResource: Use AccountCache#maybeGet instead of AccountCache#get

Browse Source 
AccountCache#get returns an empty AccountState to represent a missing
account. If an account is missing we can only include the account ID
into the ETag computation. Do this explicitly instead of relying on the
empty account state that is returned by AccountCache#get.

Change-Id: Ife28d99e6c76fe5c8e4efe00e11e971baf361d8f
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-01-26 13:22:43 +01:00
parent 8dbc8174f5
commit 6ad3a8b4d8
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/com/google/gerrit/server/change/ChangeResource.java
View File

@@ -45,6 +45,7 @@ import com.google.inject.TypeLiteral;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
@@ -170,7 +171,15 @@ public class ChangeResource implements RestResource, HasETag {
} catch (OrmException e) {
// This ETag will be invalidated if it loads next time.
}
accounts.stream().forEach(a -> hashAccount(h, accountCache.get(a), buf));
for (Account.Id accountId : accounts) {
Optional<AccountState> accountState = accountCache.maybeGet(accountId);
if (accountState.isPresent()) {
hashAccount(h, accountState.get(), buf);
} else {
h.putInt(accountId.get());
}
}
ObjectId noteId;
try {
@@ -211,6 +220,7 @@ public class ChangeResource implements RestResource, HasETag {
}
private void hashAccount(Hasher h, AccountState accountState, byte[] buf) {
h.putInt(accountState.getAccount().getId().get());
h.putString(
MoreObjects.firstNonNull(accountState.getAccount().getMetaId(), ZERO_ID_STRING), UTF_8);
accountState.getExternalIds().stream().forEach(e -> hashObjectId(h, e.blobId(), buf));