opendev/gerrit
Code Issues Proposed changes

Read reviewedBy set from secondary index

Browse Source 
We now no longer read the database when rendering search results even
with the REVIEWED option used on the account dashboard screen.

Tweak query tests to allow assertions over specific fields set in the
result, to ensure that the value is being set correctly from the
stored field.

Change-Id: I21c43496d2a5b6a1533c45a24e027257f5e4944e
This commit is contained in:
Dave Borowitz
2015-05-27 15:47:20 -07:00
parent 97c7803b7a
commit a7df7ca122
4 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -30,6 +30,7 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -132,12 +133,14 @@ public class LuceneChangeIndex implements ChangeIndex {
sortFieldName(ChangeField.LEGACY_ID);
private static final String MERGEABLE_FIELD = ChangeField.MERGEABLE.getName();
private static final String PATCH_SET_FIELD = ChangeField.PATCH_SET.getName();
private static final String REVIEWEDBY_FIELD =
ChangeField.REVIEWEDBY.getName();
private static final String UPDATED_SORT_FIELD =
sortFieldName(ChangeField.UPDATED);
private static final ImmutableSet<String> FIELDS = ImmutableSet.of(
ADDED_FIELD, APPROVAL_FIELD, CHANGE_FIELD, DELETED_FIELD, ID_FIELD,
MERGEABLE_FIELD, PATCH_SET_FIELD);
MERGEABLE_FIELD, PATCH_SET_FIELD, REVIEWEDBY_FIELD);
private static final Map<String, String> CUSTOM_CHAR_MAPPING = ImmutableMap.of(
"_", " ", ".", " ");
@@ -506,6 +509,21 @@ public class LuceneChangeIndex implements ChangeIndex {
cd.setMergeable(false);
}
// Reviewed-by.
IndexableField[] reviewedBy = doc.getFields(REVIEWEDBY_FIELD);
if (reviewedBy.length > 0) {
Set<Account.Id> accounts =
Sets.newHashSetWithExpectedSize(reviewedBy.length);
for (IndexableField r : reviewedBy) {
int id = r.numericValue().intValue();
if (reviewedBy.length == 1 && id == ChangeField.NOT_REVIEWED) {
break;
}
accounts.add(new Account.Id(id));
}
cd.setReviewedBy(accounts);
}
return cd;
}