opendev/gerrit
Code Issues Proposed changes

Merge "Exclude unneeded ref prefixes when getting refs"

Browse Source
This commit is contained in:
Gal Paikin
2021-02-17 08:30:18 +00:00
committed by Gerrit Code Review
parent 9372f79860 e4aac9ea53
commit 4a86ec5bc0
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/com/google/gerrit/server/git/TagSet.java
View File

@@ -16,9 +16,9 @@ package com.google.gerrit.server.git;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.flogger.FluentLogger; import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project; import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.RefNames;
import com.google.gerrit.server.cache.proto.Cache.TagSetHolderProto.TagSetProto; import com.google.gerrit.server.cache.proto.Cache.TagSetHolderProto.TagSetProto;
@@ -37,6 +37,7 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ObjectIdOwnerMap;
import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevSort; import org.eclipse.jgit.revwalk.RevSort;
@@ -44,6 +45,12 @@ import org.eclipse.jgit.revwalk.RevWalk;
class TagSet { class TagSet {
private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static final ImmutableSet<String> SKIPPABLE_REF_PREFIXES =
ImmutableSet.of(
RefNames.REFS_CHANGES,
RefNames.REFS_CACHE_AUTOMERGE,
RefNames.REFS_DRAFT_COMMENTS,
RefNames.REFS_STARRED_CHANGES);
private final Project.NameKey projectName; private final Project.NameKey projectName;
private final Map<String, CachedRef> refs; private final Map<String, CachedRef> refs;
@@ -179,7 +186,9 @@ class TagSet {
try (TagWalk rw = new TagWalk(git)) { try (TagWalk rw = new TagWalk(git)) {
rw.setRetainBody(false); rw.setRetainBody(false);
for (Ref ref : git.getRefDatabase().getRefs()) { for (Ref ref :
git.getRefDatabase()
.getRefsByPrefixWithExclusions(RefDatabase.ALL, SKIPPABLE_REF_PREFIXES)) {
if (skip(ref)) { if (skip(ref)) {
continue; continue;
@@ -365,9 +374,7 @@ class TagSet {
static boolean skip(Ref ref) { static boolean skip(Ref ref) {
return ref.isSymbolic() return ref.isSymbolic()
|| ref.getObjectId() == null || ref.getObjectId() == null
|| PatchSet.isChangeRef(ref.getName()) || SKIPPABLE_REF_PREFIXES.stream().anyMatch(p -> ref.getName().startsWith(p));
|| RefNames.isNoteDbMetaRef(ref.getName())
|| ref.getName().startsWith(RefNames.REFS_CACHE_AUTOMERGE);
} }
private static boolean isTag(Ref ref) { private static boolean isTag(Ref ref) {