diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-11-23 12:46:32 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-11-23 12:46:32 +0300 |
| commit | a18edd9cd3619c11034ae86474818476a95e13f8 (patch) | |
| tree | 86072d525a87c6a2a8e2c730c797a02aafcc2862 | |
| parent | 313d9f851237a2236660c9a36a256acda85a2f2f (diff) | |
| parent | d4d26c44d1372b799946021cb9cbaca9ae84f548 (diff) | |
Merge branch 'pks-revert-materialized-valid-primaries-view-v14.2' into '14-2-stable'
datastore: Revert use of materialized views (v14.2)
See merge request gitlab-org/gitaly!4119
| -rw-r--r-- | internal/praefect/datastore/collector.go | 5 | ||||
| -rw-r--r-- | internal/praefect/datastore/repository_store.go | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index 40390b47a..c0184d17f 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -78,11 +78,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 virtual_storage, relative_path - 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 beffaa2af..c8616d348 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -615,10 +615,6 @@ func (rs *PostgresRepositoryStore) GetPartiallyAvailableRepositories(ctx context // than the assigned ones. // rows, err := rs.db.QueryContext(ctx, ` -WITH valid_primaries AS MATERIALIZED ( - SELECT * FROM valid_primaries -) - SELECT json_build_object ( 'RelativePath', relative_path, |