Merge "Trivial: fix typos"
diff --git a/java/com/google/gerrit/lucene/LuceneAccountIndex.java b/java/com/google/gerrit/lucene/LuceneAccountIndex.java
index 934b27f..fe3fc15 100644
--- a/java/com/google/gerrit/lucene/LuceneAccountIndex.java
+++ b/java/com/google/gerrit/lucene/LuceneAccountIndex.java
@@ -72,7 +72,7 @@
private static Term idTerm(boolean useLegacyNumericFields, Account.Id id) {
FieldDef<AccountState, ?> idField = useLegacyNumericFields ? ID : ID_STR;
if (useLegacyNumericFields) {
- return QueryBuilder.intTerm(idField.getName(), id.get());
+ return QueryBuilder.intTerm(idField.getName());
}
return QueryBuilder.stringTerm(idField.getName(), Integer.toString(id.get()));
}
diff --git a/java/com/google/gerrit/lucene/QueryBuilder.java b/java/com/google/gerrit/lucene/QueryBuilder.java
index bd34743..14ad528 100644
--- a/java/com/google/gerrit/lucene/QueryBuilder.java
+++ b/java/com/google/gerrit/lucene/QueryBuilder.java
@@ -49,7 +49,7 @@
public class QueryBuilder<V> {
/** @param name field name qparam i key value */
- static Term intTerm(String name, int i) {
+ static Term intTerm(String name) {
checkState(false, "Lucene index implementation removed legacy numeric type");
return null;
}
diff --git a/java/com/google/gerrit/server/permissions/GitVisibleChangeFilter.java b/java/com/google/gerrit/server/permissions/GitVisibleChangeFilter.java
index 506d292..12a7841 100644
--- a/java/com/google/gerrit/server/permissions/GitVisibleChangeFilter.java
+++ b/java/com/google/gerrit/server/permissions/GitVisibleChangeFilter.java
@@ -130,11 +130,10 @@
notesResult -> {
if (!notesResult.error().isPresent()) {
return changeDataFactory.create(notesResult.notes());
- } else {
- logger.atWarning().withCause(notesResult.error().get()).log(
- "Unable to load ChangeNotes for %s", notesResult.id());
- return null;
}
+ logger.atWarning().withCause(notesResult.error().get()).log(
+ "Unable to load ChangeNotes for %s", notesResult.id());
+ return null;
})
.filter(Objects::nonNull);
} catch (IOException e) {
diff --git a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java
index 842f4b9..f991e17 100644
--- a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java
+++ b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java
@@ -32,6 +32,7 @@
import com.google.gerrit.extensions.common.SuggestedReviewerInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.Url;
+import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.IndexConfig;
import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.query.FieldBundle;
@@ -235,7 +236,10 @@
return suggestedReviewers;
}
- private static Account.Id fromIdField(FieldBundle f) {
+ private static Account.Id fromIdField(FieldBundle f, boolean useLegacyNumericFields) {
+ if (useLegacyNumericFields) {
+ return Account.id(f.getValue(AccountField.ID).intValue());
+ }
return Account.id(Integer.valueOf(f.getValue(AccountField.ID_STR)));
}
@@ -251,6 +255,10 @@
accountQueryBuilder.defaultQuery(suggestReviewers.getQuery()));
logger.atFine().log("accounts index query: %s", pred);
accountIndexRewriter.validateMaxTermsInQuery(pred);
+ boolean useLegacyNumericFields =
+ accountIndexes.getSearchIndex().getSchema().hasField(AccountField.ID);
+ FieldDef<AccountState, ?> idField =
+ useLegacyNumericFields ? AccountField.ID : AccountField.ID_STR;
ResultSet<FieldBundle> result =
accountIndexes
.getSearchIndex()
@@ -260,10 +268,12 @@
indexConfig,
0,
suggestReviewers.getLimit(),
- ImmutableSet.of(AccountField.ID_STR.getName())))
+ ImmutableSet.of(idField.getName())))
.readRaw();
List<Account.Id> matches =
- result.toList().stream().map(f -> fromIdField(f)).collect(toList());
+ result.toList().stream()
+ .map(f -> fromIdField(f, useLegacyNumericFields))
+ .collect(toList());
logger.atFine().log("Matches: %s", matches);
return matches;
} catch (TooManyTermsInQueryException e) {
diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java
index 58db331..1a49171 100644
--- a/java/com/google/gerrit/server/submit/MergeOp.java
+++ b/java/com/google/gerrit/server/submit/MergeOp.java
@@ -16,7 +16,6 @@
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.gerrit.server.project.ProjectCache.illegalState;
import static java.util.Comparator.comparing;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toSet;
@@ -72,8 +71,6 @@
import com.google.gerrit.server.notedb.StoreSubmitRequirementsOp;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.NoSuchProjectException;
-import com.google.gerrit.server.project.ProjectCache;
-import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.SubmitRuleOptions;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery;
@@ -247,7 +244,6 @@
private final RetryHelper retryHelper;
private final ChangeData.Factory changeDataFactory;
private final StoreSubmitRequirementsOp.Factory storeSubmitRequirementsOpFactory;
- private final ProjectCache projectCache;
// Changes that were updated by this MergeOp.
private final Map<Change.Id, Change> updatedChanges;
@@ -282,8 +278,7 @@
TopicMetrics topicMetrics,
RetryHelper retryHelper,
ChangeData.Factory changeDataFactory,
- StoreSubmitRequirementsOp.Factory storeSubmitRequirementsOpFactory,
- ProjectCache projectCache) {
+ StoreSubmitRequirementsOp.Factory storeSubmitRequirementsOpFactory) {
this.cmUtil = cmUtil;
this.batchUpdateFactory = batchUpdateFactory;
this.internalUserFactory = internalUserFactory;
@@ -301,7 +296,6 @@
this.changeDataFactory = changeDataFactory;
this.updatedChanges = new HashMap<>();
this.storeSubmitRequirementsOpFactory = storeSubmitRequirementsOpFactory;
- this.projectCache = projectCache;
}
@Override
@@ -654,12 +648,12 @@
Project.NameKey project = entry.getValue().project();
Change.Id changeId = entry.getKey();
ChangeData cd = entry.getValue();
- Collection<SubmitRequirementResult> srResults =
- cd.submitRequirementsIncludingLegacy().values();
batchUpdatesByProject
.get(project)
- .addOp(changeId, storeSubmitRequirementsOpFactory.create(srResults, cd));
- crossCheckSubmitRequirementResults(cd, srResults, project);
+ .addOp(
+ changeId,
+ storeSubmitRequirementsOpFactory.create(
+ cd.submitRequirementsIncludingLegacy().values(), cd));
}
try {
submissionExecutor.setAdditionalBatchUpdateListeners(
@@ -1009,28 +1003,4 @@
+ " projects involved; some projects may have submitted successfully, but others may have"
+ " failed";
}
-
- /**
- * Make sure that for every project config submit requirement there exists a corresponding result
- * with the same name in {@code srResults}. If no result is found, log a warning message.
- */
- private void crossCheckSubmitRequirementResults(
- ChangeData cd, Collection<SubmitRequirementResult> srResults, Project.NameKey project) {
- ProjectState state = projectCache.get(project).orElseThrow(illegalState(project));
- Map<String, SubmitRequirement> projectConfigRequirements = state.getSubmitRequirements();
- for (String srName : projectConfigRequirements.keySet()) {
- boolean hasResult = false;
- for (SubmitRequirementResult srResult : srResults) {
- if (!srResult.isLegacy() && srResult.submitRequirement().name().equals(srName)) {
- hasResult = true;
- break;
- }
- }
- if (!hasResult) {
- logger.atWarning().log(
- "Change %d: No result found for project config submit requirement '%s'",
- cd.getId().get(), srName);
- }
- }
- }
}
diff --git a/javatests/com/google/gerrit/server/update/BUILD b/javatests/com/google/gerrit/server/update/BUILD
index 4fe4ab04..6d96c10 100644
--- a/javatests/com/google/gerrit/server/update/BUILD
+++ b/javatests/com/google/gerrit/server/update/BUILD
@@ -1,8 +1,8 @@
load("//tools/bzl:junit.bzl", "junit_tests")
junit_tests(
- name = "small_tests",
- size = "small",
+ name = "update_tests",
+ size = "medium",
srcs = glob(["*.java"]),
runtime_deps = [
"//java/com/google/gerrit/lucene",
diff --git a/plugins/replication b/plugins/replication
index fd3b732..6a0e987 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit fd3b732959f964763117be5fdff78ee40ed211fa
+Subproject commit 6a0e98744a5be2bd315aeb21193e313a3e9849ad
