From 4cc167a6bd6aec20c1b9147c624c39c1675fc85c Mon Sep 17 00:00:00 2001 From: Michal Niewrzal Date: Mon, 24 Jul 2023 17:45:32 +0200 Subject: [PATCH] satellite/metabase: use better label for ignoring FTS queries For some test queries we are using workaround to filter them out from full table scan detection. To avoid confustion what is this all about we are changing label to be more descriptive. Change-Id: I41a744e8faf400e3e8de7e416d8f4242f9093fce --- satellite/metabase/metabasetest/run.go | 2 +- satellite/metabase/raw.go | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/satellite/metabase/metabasetest/run.go b/satellite/metabase/metabasetest/run.go index 18a2819b2..1f25c4fb2 100644 --- a/satellite/metabase/metabasetest/run.go +++ b/satellite/metabase/metabasetest/run.go @@ -149,7 +149,7 @@ func fullTableScanQueries(ctx context.Context, db *metabase.DB, applicationName } switch { - case strings.Contains(query, "WITH testing AS (SELECT _)"): + case strings.Contains(query, "WITH ignore_full_scan_for_test AS (SELECT _)"): continue case !strings.Contains(strings.ToUpper(query), "WHERE"): // find smarter way to ignore known full table scan queries continue diff --git a/satellite/metabase/raw.go b/satellite/metabase/raw.go index ce09bf126..b2a45855d 100644 --- a/satellite/metabase/raw.go +++ b/satellite/metabase/raw.go @@ -132,12 +132,12 @@ func (db *DB) TestingGetState(ctx context.Context) (_ *RawState, err error) { // TestingDeleteAll deletes all objects and segments from the database. func (db *DB) TestingDeleteAll(ctx context.Context) (err error) { _, err = db.db.ExecContext(ctx, ` - WITH testing AS (SELECT 1) DELETE FROM objects; - WITH testing AS (SELECT 1) DELETE FROM pending_objects; - WITH testing AS (SELECT 1) DELETE FROM segments; - WITH testing AS (SELECT 1) DELETE FROM segment_copies; - WITH testing AS (SELECT 1) DELETE FROM node_aliases; - WITH testing AS (SELECT 1) SELECT setval('node_alias_seq', 1, false); + WITH ignore_full_scan_for_test AS (SELECT 1) DELETE FROM objects; + WITH ignore_full_scan_for_test AS (SELECT 1) DELETE FROM pending_objects; + WITH ignore_full_scan_for_test AS (SELECT 1) DELETE FROM segments; + WITH ignore_full_scan_for_test AS (SELECT 1) DELETE FROM segment_copies; + WITH ignore_full_scan_for_test AS (SELECT 1) DELETE FROM node_aliases; + WITH ignore_full_scan_for_test AS (SELECT 1) SELECT setval('node_alias_seq', 1, false); `) db.aliasCache = NewNodeAliasCache(db) return Error.Wrap(err) @@ -148,7 +148,7 @@ func (db *DB) testingGetAllObjects(ctx context.Context) (_ []RawObject, err erro objs := []RawObject{} rows, err := db.db.QueryContext(ctx, ` - WITH testing AS (SELECT 1) + WITH ignore_full_scan_for_test AS (SELECT 1) SELECT project_id, bucket_name, object_key, version, stream_id, created_at, expires_at, @@ -210,7 +210,7 @@ func (db *DB) testingGetAllPendingObjects(ctx context.Context) (_ []RawPendingOb objs := []RawPendingObject{} rows, err := db.db.QueryContext(ctx, ` - WITH testing AS (SELECT 1) + WITH ignore_full_scan_for_test AS (SELECT 1) SELECT project_id, bucket_name, object_key, stream_id, created_at, expires_at, @@ -261,7 +261,7 @@ func (db *DB) testingGetAllSegments(ctx context.Context) (_ []RawSegment, err er segs := []RawSegment{} rows, err := db.db.QueryContext(ctx, ` - WITH testing AS (SELECT 1) + WITH ignore_full_scan_for_test AS (SELECT 1) SELECT stream_id, position, created_at, repaired_at, expires_at, @@ -331,7 +331,7 @@ func (db *DB) testingGetAllCopies(ctx context.Context) (_ []RawCopy, err error) copies := []RawCopy{} rows, err := db.db.QueryContext(ctx, ` - WITH testing AS (SELECT 1) + WITH ignore_full_scan_for_test AS (SELECT 1) SELECT stream_id, ancestor_stream_id FROM segment_copies