Skip to content

Commit

Permalink
Move SQL file changes for citus_shard_sizes fixes into the new 11.3-2…
Browse files Browse the repository at this point in the history
… version
  • Loading branch information
halilozanakgul committed Jul 11, 2023
1 parent 613cced commit 1067a09
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 14 deletions.
9 changes: 9 additions & 0 deletions src/backend/distributed/sql/citus--11.3-1--11.3-2.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
DROP VIEW citus_shards;
DROP VIEW IF EXISTS pg_catalog.citus_tables;
DROP VIEW IF EXISTS public.citus_tables;
DROP FUNCTION citus_shard_sizes;

#include "udfs/citus_shard_sizes/11.3-2.sql"

#include "udfs/citus_shards/11.3-2.sql"
#include "udfs/citus_tables/11.3-2.sql"
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ GRANT SELECT ON pg_catalog.pg_dist_schema TO public;
#include "udfs/citus_internal_unregister_tenant_schema_globally/12.0-1.sql"
#include "udfs/citus_drop_trigger/12.0-1.sql"

DROP VIEW citus_shards;
DROP VIEW IF EXISTS pg_catalog.citus_tables;
DROP VIEW IF EXISTS public.citus_tables;
DROP FUNCTION citus_shard_sizes;
#include "udfs/citus_shard_sizes/12.0-1.sql"

#include "udfs/citus_tables/12.0-1.sql"
#include "udfs/citus_shards/12.0-1.sql"

Expand Down
13 changes: 13 additions & 0 deletions src/backend/distributed/sql/downgrades/citus--11.3-2--11.3-1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
DROP VIEW IF EXISTS public.citus_tables;
DROP VIEW IF EXISTS pg_catalog.citus_tables;

DROP VIEW pg_catalog.citus_shards;
DROP FUNCTION pg_catalog.citus_shard_sizes;
#include "../udfs/citus_shard_sizes/10.0-1.sql"
-- citus_shards/11.1-1.sql tries to create citus_shards in pg_catalog but it is not allowed.
-- Here we use citus_shards/10.0-1.sql to properly create the view in citus schema and
-- then alter it to pg_catalog, so citus_shards/11.1-1.sql can REPLACE it without any errors.
#include "../udfs/citus_shards/10.0-1.sql"

#include "../udfs/citus_tables/11.1-1.sql"
#include "../udfs/citus_shards/11.1-1.sql"
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,9 @@ DROP VIEW IF EXISTS public.citus_tables;
DROP VIEW IF EXISTS pg_catalog.citus_tables;

DROP VIEW pg_catalog.citus_shards;
DROP FUNCTION pg_catalog.citus_shard_sizes;
#include "../udfs/citus_shard_sizes/10.0-1.sql"
-- citus_shards/11.1-1.sql tries to create citus_shards in pg_catalog but it is not allowed.
-- Here we use citus_shards/10.0-1.sql to properly create the view in citus schema and
-- then alter it to pg_catalog, so citus_shards/11.1-1.sql can REPLACE it without any errors.
#include "../udfs/citus_shards/10.0-1.sql"

#include "../udfs/citus_tables/11.1-1.sql"
#include "../udfs/citus_shards/11.1-1.sql"
#include "../udfs/citus_tables/11.3-2.sql"
#include "../udfs/citus_shards/11.3-2.sql"

DROP TABLE pg_catalog.pg_dist_schema;

Expand Down
46 changes: 46 additions & 0 deletions src/backend/distributed/sql/udfs/citus_shards/11.3-2.sql

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions src/backend/distributed/sql/udfs/citus_tables/11.3-2.sql

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1067a09

Please sign in to comment.