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
diff options
context:
space:
mode:
authorSami Hiltunen <shiltunen@gitlab.com>2021-10-06 15:01:32 +0300
committerSami Hiltunen <shiltunen@gitlab.com>2021-10-19 13:15:40 +0300
commit50a5c01249ba8f7ef10cea6eaad23e65b967eaf6 (patch)
treed53f5d8351e2a009cf8f9e9976a694456cddae7c
parent2c9d1f816c765882610552cc80288724b53a24a3 (diff)
Setup repository ids in RepositoryStoreCollector testssmh-test-patch
This commit updates the tests of RepositoryStoreCollector to setup repository IDs correctly to prepare for updating the query to use repository IDs.
-rw-r--r--internal/praefect/datastore/collector_test.go36
1 files changed, 22 insertions, 14 deletions
diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go
index 3514b1239..3014f6d71 100644
--- a/internal/praefect/datastore/collector_test.go
+++ b/internal/praefect/datastore/collector_test.go
@@ -156,29 +156,37 @@ func TestRepositoryStoreCollector(t *testing.T) {
})
for _, repository := range tc.repositories {
- if !repository.deleted {
- _, err := tx.ExecContext(ctx, `
- INSERT INTO repositories (virtual_storage, relative_path)
- VALUES ('virtual-storage-1', $1)
- `, repository.relativePath,
- )
- require.NoError(t, err)
- }
+ rs := NewPostgresRepositoryStore(tx, nil)
+
+ var repositoryID int64
for storage, replica := range repository.replicas {
+ const virtualStorage = "virtual-storage-1"
+
+ if repositoryID == 0 {
+ var err error
+ repositoryID, err = rs.ReserveRepositoryID(ctx, virtualStorage, repository.relativePath)
+ require.NoError(t, err)
+
+ require.NoError(t, rs.CreateRepository(ctx, repositoryID, virtualStorage, repository.relativePath, storage, nil, nil, false, false))
+ }
+
if replica.assigned {
_, err := tx.ExecContext(ctx, `
- INSERT INTO repository_assignments (virtual_storage, relative_path, storage)
- VALUES ('virtual-storage-1', $1, $2)
- `, repository.relativePath, storage,
+ INSERT INTO repository_assignments (repository_id, virtual_storage, relative_path, storage)
+ VALUES ($1, 'virtual-storage-1', $2, $3)
+ `, repositoryID, repository.relativePath, storage,
)
require.NoError(t, err)
}
+ require.NoError(t, rs.SetGeneration(ctx, virtualStorage, repository.relativePath, storage, replica.generation))
+ }
+
+ if repository.deleted {
_, err := tx.ExecContext(ctx, `
- INSERT INTO storage_repositories (virtual_storage, relative_path, storage, generation)
- VALUES ('virtual-storage-1', $1, $2, $3)
- `, repository.relativePath, storage, replica.generation,
+ DELETE FROM repositories WHERE repository_id = $1
+ `, repositoryID,
)
require.NoError(t, err)
}