opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Remove circular dependency between diff_summary and diff caches
  Fix build for bazel 0.9.0

Change-Id: I3f68cc52ccde83657cf11972cae02c9f3cf6d70e
This commit is contained in:
Paladox 2018-01-31 20:25:29 +00:00
commit 4ad6839f11
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-index/BUILD
View File

@ -19,7 +19,7 @@ genrule2(
cmd = " && ".join([
"$(location //lib/antlr:antlr-tool) -o $$TMP $<",
"cd $$TMP",
"$$ROOT/$(location @bazel_tools//tools/zip:zipper) cC $$ROOT/$@ $$(find *)",
"zip $$ROOT/$@ $$(find . -type f )",
]),
tools = [
"//lib/antlr:antlr-tool",

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryLoader.java
View File

@ -49,7 +49,7 @@ public class DiffSummaryLoader implements Callable<DiffSummary> {
return toDiffSummary(patchList);
}
static DiffSummary toDiffSummary(PatchList patchList) {
private DiffSummary toDiffSummary(PatchList patchList) {
List<String> r = new ArrayList<>(patchList.getPatches().size());
for (PatchListEntry e : patchList.getPatches()) {
if (Patch.isMagic(e.getNewName())) {

5
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
View File

@ -15,8 +15,6 @@
package com.google.gerrit.server.patch;
import static com.google.gerrit.server.patch.DiffSummaryLoader.toDiffSummary;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.cache.Cache;
import com.google.common.util.concurrent.UncheckedExecutionException;
@ -106,9 +104,6 @@ public class PatchListCacheImpl implements PatchListCache {
throw new PatchListNotAvailableException(
"Error computing " + key + ". Previous attempt failed with LargeObjectException");
}
if (key.getAlgorithm() == PatchListKey.Algorithm.OPTIMIZED_DIFF) {
diffSummaryCache.put(DiffSummaryKey.fromPatchListKey(key), toDiffSummary(pl));
}
return pl;
} catch (ExecutionException e) {
PatchListLoader.log.warn("Error computing " + key, e);