opendev/gerrit
Code Issues Proposed changes

Merge "ConflictsPredicate: Suppress all checked exceptions"

Browse Source
This commit is contained in:
Dave Borowitz
2019-03-04 18:47:12 +00:00
committed by Gerrit Code Review
parent e951478c60 8552187693
commit d26237eaa8
1 changed files with 85 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
java/com/google/gerrit/server/query/change/ConflictsPredicate.java
View File

@@ -14,6 +14,12 @@
package com.google.gerrit.server.query.change;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.flogger.LazyArgs.lazy;
import static java.util.concurrent.TimeUnit.MINUTES;
import com.google.common.flogger.FluentLogger;
import com.google.common.flogger.LoggingApi;
import com.google.gerrit.common.data.SubmitTypeRecord;
import com.google.gerrit.index.query.PostFilterPredicate;
import com.google.gerrit.index.query.Predicate;
@@ -21,6 +27,7 @@ import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.reviewdb.client.BooleanProjectConfig;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.git.CodeReviewCommit;
import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk;
import com.google.gerrit.server.project.NoSuchProjectException;
@@ -35,26 +42,36 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.Supplier;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
public class ConflictsPredicate {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
// UI code may depend on this string, so use caution when changing.
protected static final String TOO_MANY_FILES = "too many files to find conflicts";
private ConflictsPredicate() {}
public static Predicate<ChangeData> create(Arguments args, String value, Change c)
throws QueryParseException, OrmException {
throws QueryParseException {
ChangeData cd;
List<String> files;
try {
cd = args.changeDataFactory.create(c);
files = cd.currentFilePaths();
} catch (IOException e) {
throw new OrmException(e);
} catch (IOException | OrmException e) {
logWithOccasionalStackTrace(
logger::atWarning,
e,
"Error constructing conflicts predicates for change %s in %s",
c.getId(),
c.getProject());
return Predicate.not(Predicate.any());
}
if (3 + files.size() > args.indexConfig.maxTerms()) {
@@ -95,52 +112,67 @@ public class ConflictsPredicate {
}
@Override
public boolean match(ChangeData object) throws OrmException {
Change otherChange = object.change();
if (otherChange == null || !otherChange.getDest().equals(dest)) {
return false;
}
SubmitTypeRecord str = object.submitTypeRecord();
if (!str.isOk()) {
return false;
}
ProjectState projectState;
public boolean match(ChangeData object) {
Change.Id id = object.getId();
Project.NameKey otherProject = null;
ObjectId other = null;
try {
projectState = changeDataCache.getProjectState();
} catch (NoSuchProjectException e) {
return false;
}
Change otherChange = object.change();
if (otherChange == null || !otherChange.getDest().equals(dest)) {
return false;
}
otherProject = otherChange.getProject();
ObjectId other = ObjectId.fromString(object.currentPatchSet().getRevision().get());
ConflictKey conflictsKey =
ConflictKey.create(
changeDataCache.getTestAgainst(),
other,
str.type,
projectState.is(BooleanProjectConfig.USE_CONTENT_MERGE));
Boolean maybeConflicts = args.conflictsCache.getIfPresent(conflictsKey);
if (maybeConflicts != null) {
return maybeConflicts;
}
SubmitTypeRecord str = object.submitTypeRecord();
if (!str.isOk()) {
return false;
}
try (Repository repo = args.repoManager.openRepository(otherChange.getProject());
CodeReviewRevWalk rw = CodeReviewCommit.newRevWalk(repo)) {
boolean conflicts =
!args.submitDryRun.run(
null,
str.type,
repo,
rw,
otherChange.getDest(),
ProjectState projectState;
try {
projectState = changeDataCache.getProjectState();
} catch (NoSuchProjectException e) {
return false;
}
other = ObjectId.fromString(object.currentPatchSet().getRevision().get());
ConflictKey conflictsKey =
ConflictKey.create(
changeDataCache.getTestAgainst(),
other,
getAlreadyAccepted(repo, rw));
args.conflictsCache.put(conflictsKey, conflicts);
return conflicts;
} catch (IntegrationException | NoSuchProjectException | IOException e) {
throw new OrmException(e);
str.type,
projectState.is(BooleanProjectConfig.USE_CONTENT_MERGE));
Boolean maybeConflicts = args.conflictsCache.getIfPresent(conflictsKey);
if (maybeConflicts != null) {
return maybeConflicts;
}
try (Repository repo = args.repoManager.openRepository(otherChange.getProject());
CodeReviewRevWalk rw = CodeReviewCommit.newRevWalk(repo)) {
boolean conflicts =
!args.submitDryRun.run(
null,
str.type,
repo,
rw,
otherChange.getDest(),
changeDataCache.getTestAgainst(),
other,
getAlreadyAccepted(repo, rw));
args.conflictsCache.put(conflictsKey, conflicts);
return conflicts;
}
} catch (IntegrationException | NoSuchProjectException | OrmException | IOException e) {
ObjectId finalOther = other;
logWithOccasionalStackTrace(
logger::atWarning,
e,
"Merge failure checking conflicts of change %s in %s (%s): %s",
id,
firstNonNull(otherProject, "unknown project"),
lazy(() -> finalOther != null ? finalOther.name() : "unknown commit"),
e.getMessage());
return false;
}
}
@@ -202,4 +234,13 @@ public class ConflictsPredicate {
return alreadyAccepted;
}
}
private static <API extends LoggingApi<API>> void logWithOccasionalStackTrace(
Supplier<LoggingApi<API>> logSupplier, Throwable cause, String format, Object... args) {
BiConsumer<LoggingApi<API>, String> logConsumer = (api, f) -> api.logVarargs(f, args);
logConsumer.accept(logSupplier.get(), format);
logConsumer.accept(
logSupplier.get().withCause(cause).atMostEvery(1, MINUTES),
"(Re-logging with stack trace) " + format);
}
}