From 5b3c32eb3826241a943f3002b285911291efffa5 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 7 Dec 2020 13:18:22 -0800 Subject: [PATCH] fixup tests --- .../sql/downgrades/columnar--10.0-1--9.5-1.sql | 10 +++++----- .../sql/udfs/citus_finish_pg_upgrade/10.0-1.sql | 2 +- .../sql/udfs/citus_finish_pg_upgrade/latest.sql | 2 +- src/test/regress/expected/multi_extension.out | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/backend/columnar/sql/downgrades/columnar--10.0-1--9.5-1.sql b/src/backend/columnar/sql/downgrades/columnar--10.0-1--9.5-1.sql index aacef9617..1a045de23 100644 --- a/src/backend/columnar/sql/downgrades/columnar--10.0-1--9.5-1.sql +++ b/src/backend/columnar/sql/downgrades/columnar--10.0-1--9.5-1.sql @@ -1,6 +1,6 @@ /* columnar--10.0-1--9.5-1.sql */ -SET search_path TO cstore; +SET search_path TO columnar; DO $proc$ BEGIN @@ -27,12 +27,12 @@ IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN END IF; END$proc$; -DROP TABLE cstore_skipnodes; -DROP TABLE cstore_stripes; +DROP TABLE columnar_skipnodes; +DROP TABLE columnar_stripes; DROP TABLE options; DROP SEQUENCE storageid_seq; -DROP FUNCTION citus_internal.cstore_ensure_objects_exist(); +DROP FUNCTION citus_internal.columnar_ensure_objects_exist(); RESET search_path; -DROP SCHEMA cstore; +DROP SCHEMA columnar; diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.0-1.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.0-1.sql index d0fdfc2e2..c329efea4 100644 --- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.0-1.sql +++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.0-1.sql @@ -108,7 +108,7 @@ BEGIN old_records naming, pg_get_object_address(naming.type, naming.object_names, naming.object_args) address; - PERFORM citus_internal.cstore_ensure_objects_exist(); + PERFORM citus_internal.columnar_ensure_objects_exist(); END; $cppu$; diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql index d0fdfc2e2..c329efea4 100644 --- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql @@ -108,7 +108,7 @@ BEGIN old_records naming, pg_get_object_address(naming.type, naming.object_names, naming.object_args) address; - PERFORM citus_internal.cstore_ensure_objects_exist(); + PERFORM citus_internal.columnar_ensure_objects_exist(); END; $cppu$; diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index e6644b485..8ed63aeab 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -90,7 +90,7 @@ FROM pg_depend AS pgd, WHERE pgd.refclassid = 'pg_extension'::regclass AND pgd.refobjid = pge.oid AND pge.extname = 'citus' AND - pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'cstore') + pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar') ORDER BY 1, 2; type | identity --------------------------------------------------------------------- @@ -481,12 +481,12 @@ SELECT * FROM print_extension_changes(); | access method columnar | function alter_columnar_table_reset(regclass,boolean,boolean,boolean) | function alter_columnar_table_set(regclass,integer,integer,name) - | function citus_internal.cstore_ensure_objects_exist() + | function citus_internal.columnar_ensure_objects_exist() | function columnar.columnar_handler(internal) | schema columnar | sequence columnar.storageid_seq - | table columnar.cstore_skipnodes - | table columnar.cstore_stripes + | table columnar.columnar_skipnodes + | table columnar.columnar_stripes | table columnar.options | view citus_tables (11 rows) @@ -507,7 +507,7 @@ FROM pg_depend AS pgd, WHERE pgd.refclassid = 'pg_extension'::regclass AND pgd.refobjid = pge.oid AND pge.extname = 'citus' AND - pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'cstore') + pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar') ORDER BY 1, 2; type | identity ---------------------------------------------------------------------