From dda41ddc82371ed737a31c34fe80fc069654cfa7 Mon Sep 17 00:00:00 2001 From: lulalala Date: Fri, 19 Nov 2021 12:49:56 +0800 Subject: [PATCH] Revert "Materialize valid_primaries view in dataloss query" This reverts commit ab692bf6a4b35d0e9d536d33cb4e248d50449847. Revert "Materialize valid_primaries view in RepositoryStoreCollector" This reverts commit 4fe8fd912146315da97855172cfff4ad1106af77. --- internal/praefect/datastore/collector.go | 5 ----- internal/praefect/datastore/repository_store.go | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index afb5974c1c2..a99f6514d6e 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -80,11 +80,6 @@ func (c *RepositoryStoreCollector) Collect(ch chan<- prometheus.Metric) { // they are either unhealthy or out of date. func (c *RepositoryStoreCollector) queryMetrics(ctx context.Context) (map[string]int, error) { rows, err := c.db.QueryContext(ctx, ` -WITH valid_primaries AS MATERIALIZED ( - SELECT repository_id - FROM valid_primaries -) - SELECT virtual_storage, COUNT(*) FROM repositories WHERE NOT EXISTS ( diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go index cdacca0e886..b9ee33ba35a 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -670,10 +670,6 @@ func (rs *PostgresRepositoryStore) GetPartiallyAvailableRepositories(ctx context // than the assigned ones. // rows, err := rs.db.QueryContext(ctx, ` -WITH valid_primaries AS MATERIALIZED ( - SELECT repository_id, storage FROM valid_primaries -) - SELECT json_build_object ( 'RelativePath', relative_path, @@ -711,7 +707,7 @@ FROM ( ) AS repository_assignments USING (repository_id, storage) JOIN repositories USING (repository_id) LEFT JOIN healthy_storages USING (virtual_storage, storage) - LEFT JOIN valid_primaries USING (repository_id, storage) + LEFT JOIN ( SELECT repository_id, storage FROM valid_primaries ) AS valid_primaries USING (repository_id, storage) WHERE virtual_storage = $1 ORDER BY relative_path, "primary", storage ) AS outdated_repositories -- GitLab