opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Update git submodules
  Update git submodules
  Remove circular dependency between diff_summary and diff caches
  Fix build for bazel 0.9.0

Change-Id: Iaa995dad9962a1514aa5c201a464a28edc42f461
This commit is contained in:
David Pursehouse
2018-02-01 13:41:11 +09:00
parent fac9cd5299 8a70d63251
commit a3090eed8b
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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
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 PatchListObjectTooLargeException(
"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);