opendev/gerrit
Code Issues Proposed changes

Remove special-casing of index schemas prior to PROJECT

Browse Source 
Change-Id: I718af6f9f430c6606fe279a73021ee9f371a5a84
This commit is contained in:
Dave Borowitz
2016-09-22 16:22:40 +02:00
parent 783dc965b3
commit b5618bf0e0
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -401,23 +401,14 @@ public class LuceneChangeIndex implements ChangeIndex {
}
private Set<String> fields(QueryOptions opts) {
// Ensure we request enough fields to construct a ChangeData.
// Ensure we request enough fields to construct a ChangeData. We need both
// change ID and project, which can either come via the Change field or
// separate fields.
Set<String> fs = opts.fields();
if (fs.contains(CHANGE.getName())) {
// A Change is always sufficient.
return fs;
}
if (!schema.hasField(PROJECT)) {
// Schema is not new enough to have project field. Ensure we have ID
// field, and call createOnlyWhenNoteDbDisabled from toChangeData below.
if (fs.contains(LEGACY_ID.getName())) {
return fs;
}
return Sets.union(fs, ImmutableSet.of(LEGACY_ID.getName()));
}
// New enough schema to have project field, so ensure that is requested.
if (fs.contains(PROJECT.getName()) && fs.contains(LEGACY_ID.getName())) {
return fs;
}