Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go')
-rw-r--r--internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go320
1 files changed, 100 insertions, 220 deletions
diff --git a/internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go b/internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go
index a2b5ad5ea..ebfab1bd0 100644
--- a/internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go
+++ b/internal/gitaly/storage/storagemgr/transaction_manager_housekeeping_test.go
@@ -38,7 +38,7 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
lightweightTag := setup.Commits.Diverging.OID
annotatedTag := setup.AnnotatedTags[0]
- directoryStateWithPackedRefs := func(lsn LSN) testhelper.DirectoryState {
+ directoryStateWithReferences := func(lsn LSN) testhelper.DirectoryState {
return testhelper.DirectoryState{
"/": {Mode: fs.ModeDir | perm.PrivateDir},
"/wal": {Mode: fs.ModeDir | perm.PrivateDir},
@@ -48,12 +48,12 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
}
}
- defaultRefs := []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
+ defaultReferences := map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID,
+ "refs/heads/branch-2": setup.Commits.Third.OID,
+ "refs/heads/main": setup.Commits.First.OID,
+ "refs/tags/v1.0.0": lightweightTag,
+ "refs/tags/v2.0.0": annotatedTag.OID,
}
return []transactionTestCase{
@@ -88,29 +88,19 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(1),
+ Directory: directoryStateWithReferences(1),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- // `main` points to the second commit now
- {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID,
+ "refs/heads/branch-2": setup.Commits.Third.OID,
// But `main` in packed-refs file points to the first
// commit.
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ "refs/heads/main": setup.Commits.First.OID,
+ "refs/tags/v1.0.0": lightweightTag,
+ "refs/tags/v2.0.0": annotatedTag.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{
// It's shadowed by the loose reference.
@@ -172,29 +162,18 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(2),
+ Directory: directoryStateWithReferences(2),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/branch-3", Target: setup.Commits.Diverging.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- // All refs are packed to the packed-refs file.
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-3", setup.Commits.Diverging.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID,
+ "refs/heads/branch-2": setup.Commits.Third.OID,
+ "refs/heads/branch-3": setup.Commits.Diverging.OID,
+ "refs/heads/main": setup.Commits.Second.OID,
+ "refs/tags/v1.0.0": lightweightTag,
+ "refs/tags/v2.0.0": annotatedTag.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
@@ -235,32 +214,20 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(2),
+ Directory: directoryStateWithReferences(2),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- {Name: "refs/keep-around/1", Target: setup.Commits.First.OID.String()},
- {Name: "refs/merge-requests/1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- {Name: "refs/very/deep/nested/ref", Target: setup.Commits.Third.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/keep-around/1", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/merge-requests/1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
- fmt.Sprintf("%s refs/very/deep/nested/ref", setup.Commits.Third.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID,
+ "refs/heads/branch-2": setup.Commits.Third.OID,
+ "refs/heads/main": setup.Commits.First.OID,
+ "refs/keep-around/1": setup.Commits.First.OID,
+ "refs/merge-requests/1": setup.Commits.Second.OID,
+ "refs/tags/v1.0.0": lightweightTag,
+ "refs/tags/v2.0.0": annotatedTag.OID,
+ "refs/very/deep/nested/ref": setup.Commits.Third.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
@@ -299,28 +266,17 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(2),
+ Directory: directoryStateWithReferences(2),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/branch-3", Target: setup.Commits.Diverging.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- {Name: "refs/keep-around/1", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID,
+ "refs/heads/branch-2": setup.Commits.Third.OID,
+ "refs/heads/main": setup.Commits.First.OID,
+ "refs/tags/v1.0.0": lightweightTag,
+ "refs/tags/v2.0.0": annotatedTag.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{
// Although ref creation commits beforehand, pack-refs
@@ -365,28 +321,17 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(1),
+ Directory: directoryStateWithReferences(1),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/branch-3", Target: setup.Commits.Diverging.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- {Name: "refs/keep-around/1", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID,
+ "refs/heads/branch-2": setup.Commits.Third.OID,
+ "refs/heads/main": setup.Commits.First.OID,
+ "refs/tags/v1.0.0": lightweightTag,
+ "refs/tags/v2.0.0": annotatedTag.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{
// pack-refs task is unaware of these new refs. It keeps
@@ -432,26 +377,17 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(2),
+ Directory: directoryStateWithReferences(2),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Diverging.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()), // Outdated
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()), // Outdated
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()), // Outdated
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()), // Outdated
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()), // Still up-to-date
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID, // Outdated
+ "refs/heads/branch-2": setup.Commits.Third.OID, // Outdated
+ "refs/heads/main": setup.Commits.First.OID, // Outdated
+ "refs/tags/v1.0.0": lightweightTag, // Outdated
+ "refs/tags/v2.0.0": annotatedTag.OID, // Still up-to-date
},
LooseReferences: map[git.ReferenceName]git.ObjectID{
// Updated refs shadow the ones in the packed-refs file.
@@ -498,26 +434,17 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(1),
+ Directory: directoryStateWithReferences(1),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Diverging.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()), // Outdated
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()), // Outdated
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()), // Outdated
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()), // Outdated
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-1": setup.Commits.Second.OID, // Outdated
+ "refs/heads/branch-2": setup.Commits.Third.OID, // Outdated
+ "refs/heads/main": setup.Commits.First.OID, // Outdated
+ "refs/tags/v1.0.0": lightweightTag, // Outdated
+ "refs/tags/v2.0.0": annotatedTag.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{
"refs/heads/main": setup.Commits.Second.OID,
@@ -565,15 +492,10 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
+ References: &ReferencesState{
// Empty packed-refs. It means the pack-refs task is not
// executed.
- PackedRefsContent: []string{""},
+ PackedReferences: nil,
// Deleted refs went away.
LooseReferences: map[git.ReferenceName]git.ObjectID{
"refs/heads/branch-2": setup.Commits.Third.OID,
@@ -627,14 +549,7 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-1", Target: setup.Commits.Second.OID.String()},
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/tags/v1.0.0", Target: lightweightTag.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{""},
+ References: &ReferencesState{
LooseReferences: map[git.ReferenceName]git.ObjectID{
"refs/heads/branch-1": setup.Commits.Second.OID,
"refs/heads/branch-2": setup.Commits.Third.OID,
@@ -722,13 +637,9 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
setup.Commits.First.OID,
},
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/main": setup.Commits.First.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
@@ -790,22 +701,15 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(2).toProto(),
},
- Directory: directoryStateWithPackedRefs(1),
+ Directory: directoryStateWithReferences(1),
Repositories: RepositoryStates{
setup.RelativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/branch-2", Target: setup.Commits.Third.OID.String()},
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- {Name: "refs/tags/v2.0.0", Target: annotatedTag.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/branch-2": setup.Commits.Third.OID,
+ "refs/heads/main": setup.Commits.First.OID,
+ "refs/tags/v2.0.0": annotatedTag.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
@@ -876,13 +780,9 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/empty-dir/parent/main", Target: setup.Commits.First.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/empty-dir/parent/main", setup.Commits.First.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/empty-dir/parent/main": setup.Commits.First.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
@@ -908,7 +808,9 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: defaultRefs,
+ References: &ReferencesState{
+ LooseReferences: defaultReferences,
+ },
},
},
},
@@ -933,7 +835,9 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: defaultRefs,
+ References: &ReferencesState{
+ LooseReferences: defaultReferences,
+ },
},
},
},
@@ -969,22 +873,13 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Database: DatabaseState{
string(keyAppliedLSN(setup.PartitionID)): LSN(1).toProto(),
},
- Directory: directoryStateWithPackedRefs(1),
+ Directory: directoryStateWithReferences(1),
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: defaultRefs,
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
- },
- LooseReferences: map[git.ReferenceName]git.ObjectID{},
+ References: &ReferencesState{
+ PackedReferences: defaultReferences,
+ LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
},
},
@@ -1055,13 +950,9 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
setup.Commits.First.OID,
},
DefaultBranch: "refs/heads/main",
- References: []git.Reference{
- {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()},
- },
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
+ References: &ReferencesState{
+ PackedReferences: map[git.ReferenceName]git.ObjectID{
+ "refs/heads/main": setup.Commits.First.OID,
},
LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
@@ -1136,18 +1027,9 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: defaultRefs,
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{
- "# pack-refs with: peeled fully-peeled sorted ",
- fmt.Sprintf("%s refs/heads/branch-1", setup.Commits.Second.OID.String()),
- fmt.Sprintf("%s refs/heads/branch-2", setup.Commits.Third.OID.String()),
- fmt.Sprintf("%s refs/heads/main", setup.Commits.First.OID.String()),
- fmt.Sprintf("%s refs/tags/v1.0.0", lightweightTag.String()),
- fmt.Sprintf("%s refs/tags/v2.0.0", annotatedTag.OID.String()),
- fmt.Sprintf("^%s", setup.Commits.Diverging.OID.String()),
- },
- LooseReferences: map[git.ReferenceName]git.ObjectID{},
+ References: &ReferencesState{
+ PackedReferences: defaultReferences,
+ LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
},
},
@@ -1200,10 +1082,8 @@ func generateHousekeepingTests(t *testing.T, ctx context.Context, testPartitionI
Repositories: RepositoryStates{
relativePath: {
DefaultBranch: "refs/heads/main",
- References: nil,
- PackedRefs: &PackedRefsState{
- PackedRefsContent: []string{""},
- LooseReferences: map[git.ReferenceName]git.ObjectID{},
+ References: &ReferencesState{
+ LooseReferences: map[git.ReferenceName]git.ObjectID{},
},
Objects: []git.ObjectID{},
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 08:16:31 +0300