opendev/gerrit
Code Issues Proposed changes

Move refs/cache-automerge/ generation logic to RefNames

Browse Source 
Change-Id: Id9b0c1364484205d435cb2f35469a0d95e439757
This commit is contained in:
Dave Borowitz
2016-10-31 15:10:12 -04:00
parent 9acdc6ec0a
commit 7d8667d2cf
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java
View File

@@ -140,6 +140,13 @@ public class RefNames {
return r; return r;
} }
public static String refsCacheAutomerge(String hash) {
return REFS_CACHE_AUTOMERGE
+ hash.substring(0, 2)
+ '/'
+ hash.substring(2);
}
public static String shard(int id) { public static String shard(int id) {
if (id < 0) { if (id < 0) {
return null; return null;

6
gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java
View File

@@ -96,11 +96,7 @@ public class AutoMerger {
} }
rw.parseHeaders(merge); rw.parseHeaders(merge);
String hash = merge.name(); String refName = RefNames.refsCacheAutomerge(merge.name());
String refName = RefNames.REFS_CACHE_AUTOMERGE
+ hash.substring(0, 2)
+ "/"
+ hash.substring(2);
Ref ref = repo.getRefDatabase().exactRef(refName); Ref ref = repo.getRefDatabase().exactRef(refName);
if (ref != null && ref.getObjectId() != null) { if (ref != null && ref.getObjectId() != null) {
RevObject obj = rw.parseAny(ref.getObjectId()); RevObject obj = rw.parseAny(ref.getObjectId());