From 068af7f38e34f4caaa923274c7d005998d837121 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 7 Dec 2020 13:11:51 -0800 Subject: [PATCH] fixup upgrade tests --- src/test/regress/expected/multi_extension.out | 12 ++++++------ src/test/regress/expected/multi_extension_0.out | 16 ++++++++-------- .../expected/upgrade_list_citus_objects.out | 14 +++++++------- .../expected/upgrade_list_citus_objects_0.out | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index c6f34ed96..e6644b485 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -482,12 +482,12 @@ SELECT * FROM print_extension_changes(); | 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 cstore.columnar_handler(internal) - | schema cstore - | sequence cstore.storageid_seq - | table cstore.cstore_skipnodes - | table cstore.cstore_stripes - | table cstore.options + | function columnar.columnar_handler(internal) + | schema columnar + | sequence columnar.storageid_seq + | table columnar.cstore_skipnodes + | table columnar.cstore_stripes + | table columnar.options | view citus_tables (11 rows) diff --git a/src/test/regress/expected/multi_extension_0.out b/src/test/regress/expected/multi_extension_0.out index 4d2749306..2ca0e47ff 100644 --- a/src/test/regress/expected/multi_extension_0.out +++ b/src/test/regress/expected/multi_extension_0.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 --------------------------------------------------------------------- @@ -478,12 +478,12 @@ ALTER EXTENSION citus UPDATE TO '10.0-1'; SELECT * FROM print_extension_changes(); previous_object | current_object --------------------------------------------------------------------- - | function citus_internal.cstore_ensure_objects_exist() - | schema cstore - | sequence cstore.storageid_seq - | table cstore.cstore_skipnodes - | table cstore.cstore_stripes - | table cstore.options + | function citus_internal.columnar_ensure_objects_exist() + | schema columnar + | sequence columnar.storageid_seq + | table columnar.columnar_skipnodes + | table columnar.columnar_stripes + | table columnar.options | view citus_tables (7 rows) @@ -503,7 +503,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 --------------------------------------------------------------------- diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out index 209386a2d..5b03e2aae 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -36,7 +36,7 @@ ORDER BY 1; function citus_executor_name(integer) function citus_extradata_container(internal) function citus_finish_pg_upgrade() - function citus_internal.cstore_ensure_objects_exist() + function citus_internal.columnar_ensure_objects_exist() function citus_internal.find_groupid_for_node(text,integer) function citus_internal.pg_dist_node_trigger_func() function citus_internal.pg_dist_rebalance_strategy_enterprise_check() @@ -80,7 +80,7 @@ ORDER BY 1; function create_distributed_table(regclass,text,citus.distribution_type,text) function create_intermediate_result(text,text) function create_reference_table(regclass) - function cstore.columnar_handler(internal) + function columnar.columnar_handler(internal) function distributed_tables_colocated(regclass,regclass) function dump_global_wait_edges() function dump_local_wait_edges() @@ -184,17 +184,17 @@ ORDER BY 1; function worker_save_query_explain_analyze(text,jsonb) schema citus schema citus_internal - schema cstore - sequence cstore.storageid_seq + schema columnar + sequence columnar.storageid_seq sequence pg_dist_colocationid_seq sequence pg_dist_groupid_seq sequence pg_dist_node_nodeid_seq sequence pg_dist_placement_placementid_seq sequence pg_dist_shardid_seq table citus.pg_dist_object - table cstore.cstore_skipnodes - table cstore.cstore_stripes - table cstore.options + table columnar.columnar_skipnodes + table columnar.columnar_stripes + table columnar.options table pg_dist_authinfo table pg_dist_colocation table pg_dist_local_group diff --git a/src/test/regress/expected/upgrade_list_citus_objects_0.out b/src/test/regress/expected/upgrade_list_citus_objects_0.out index a5a7a4cbb..b60dc61ab 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects_0.out +++ b/src/test/regress/expected/upgrade_list_citus_objects_0.out @@ -33,7 +33,7 @@ ORDER BY 1; function citus_executor_name(integer) function citus_extradata_container(internal) function citus_finish_pg_upgrade() - function citus_internal.cstore_ensure_objects_exist() + function citus_internal.columnar_ensure_objects_exist() function citus_internal.find_groupid_for_node(text,integer) function citus_internal.pg_dist_node_trigger_func() function citus_internal.pg_dist_rebalance_strategy_enterprise_check() @@ -180,17 +180,17 @@ ORDER BY 1; function worker_save_query_explain_analyze(text,jsonb) schema citus schema citus_internal - schema cstore - sequence cstore.storageid_seq + schema columnar + sequence columnar.storageid_seq sequence pg_dist_colocationid_seq sequence pg_dist_groupid_seq sequence pg_dist_node_nodeid_seq sequence pg_dist_placement_placementid_seq sequence pg_dist_shardid_seq table citus.pg_dist_object - table cstore.cstore_skipnodes - table cstore.cstore_stripes - table cstore.options + table columnar.columnar_skipnodes + table columnar.columnar_stripes + table columnar.options table pg_dist_authinfo table pg_dist_colocation table pg_dist_local_group