Include labels in change query results if submit record is not stored in index
If a server has an old change index where the
STORED_SUBMIT_RECORD_LENIENT field is not present yet, the change info
entities returned from change queries miss the labels field when
DETAILED_LABELS or LABELS are requested. Due to this the UI doesn't
show any labels in change lists.
This issue was introduced by change Ie8a185 which stored the submit
records in the index, but didn't allow lazy loading of the submit
records if they were missing in the index.
Fix this by lazy loading the submit records when DETAILED_LABELS or
LABELS are requested, but the index is still missing the stored submit
records.
This logic is only needed temporarily to allow online migrations at
Google. Once all Gerrit instances at Google have been upgraded and use
the new index version this code is no longer needed.
Bug: Issue 4802
Change-Id: I0faa5244bd974a35cbd4e99ac27adcaa4c20a4d1
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
index f9d4f68..e62bf48 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
@@ -367,6 +367,10 @@
}
}
+ public Arguments getArgs() {
+ return args;
+ }
+
public ChangeQueryBuilder asUser(CurrentUser user) {
return new ChangeQueryBuilder(builderDef, args.asUser(user));
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
index 7b8f5fe..62ca0e0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
@@ -14,6 +14,9 @@
package com.google.gerrit.server.query.change;
+import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS;
+import static com.google.gerrit.extensions.client.ListChangesOption.LABELS;
+
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.gerrit.extensions.client.ListChangesOption;
@@ -23,6 +26,7 @@
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.server.change.ChangeJson;
+import com.google.gerrit.server.index.change.ChangeField;
import com.google.gerrit.server.query.QueryParseException;
import com.google.gerrit.server.query.QueryResult;
import com.google.gwtorm.server.OrmException;
@@ -123,8 +127,13 @@
int cnt = queries.size();
List<QueryResult<ChangeData>> results = imp.query(qb.parse(queries));
+ boolean requireLazyLoad =
+ containsAnyOf(options, ImmutableSet.of(DETAILED_LABELS, LABELS))
+ && !qb.getArgs().getSchema()
+ .hasField(ChangeField.STORED_SUBMIT_RECORD_LENIENT);
List<List<ChangeInfo>> res = json.create(options)
- .lazyLoad(containsAnyOf(options, ChangeJson.REQUIRE_LAZY_LOAD))
+ .lazyLoad(requireLazyLoad
+ || containsAnyOf(options, ChangeJson.REQUIRE_LAZY_LOAD))
.formatQueryResults(results);
for (int n = 0; n < cnt; n++) {
List<ChangeInfo> info = res.get(n);
