opendev/gerrit
Code Issues Proposed changes

Exclude unneeded ref prefixes when getting refs

Browse Source 
In this method we anyway use "skip" method to ignore some refs
(refs/changes and some others), that are not needed here. It's more
efficient not to get those refs in the first place, by using
getRefsByPrefixWithExclusions.

Refactor this said "skip" method to match the same constant list of
prefixes as the getRefsByPrefixWithExclusions code.

Change-Id: I9b14b3e5fb0e2ba0237e46d8fbd2423a9db889e6
This commit is contained in:
Gal Paikin
2021-02-15 12:44:48 +01:00
parent bb1daef20c
commit e4aac9ea53
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.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
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.ObjectIdOwnerMap;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevSort;
@@ -44,6 +45,12 @@ import org.eclipse.jgit.revwalk.RevWalk;
class TagSet {
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 Map<String, CachedRef> refs;
@@ -179,7 +186,9 @@ class TagSet {
try (TagWalk rw = new TagWalk(git)) {
rw.setRetainBody(false);
for (Ref ref : git.getRefDatabase().getRefs()) {
for (Ref ref :
git.getRefDatabase()
.getRefsByPrefixWithExclusions(RefDatabase.ALL, SKIPPABLE_REF_PREFIXES)) {
if (skip(ref)) {
continue;
@@ -365,9 +374,7 @@ class TagSet {
static boolean skip(Ref ref) {
return ref.isSymbolic()
|| ref.getObjectId() == null
|| PatchSet.isChangeRef(ref.getName())
|| RefNames.isNoteDbMetaRef(ref.getName())
|| ref.getName().startsWith(RefNames.REFS_CACHE_AUTOMERGE);
|| SKIPPABLE_REF_PREFIXES.stream().anyMatch(p -> ref.getName().startsWith(p));
}
private static boolean isTag(Ref ref) {