diff --git a/ci/disallow_c_comments_in_migrations.sh b/ci/disallow_c_comments_in_migrations.sh index 764822b41..4d1a21ef0 100755 --- a/ci/disallow_c_comments_in_migrations.sh +++ b/ci/disallow_c_comments_in_migrations.sh @@ -1,6 +1,10 @@ #! /bin/bash set -euo pipefail + +# make ** match all directories and subdirectories +shopt -s globstar + # shellcheck disable=SC1091 source ci/ci_helpers.sh @@ -12,17 +16,17 @@ source ci/ci_helpers.sh # and reusing them if needed. GNU sed unfortunately does not support lookaround assertions. # /* -> -- -find src/backend/distributed/sql/*.sql -print0 | xargs -0 sed -i 's#/\*#--#g' +find src/backend/{distributed,columnar}/sql/**/*.sql -print0 | xargs -0 sed -i 's#/\*#--#g' # */ -> `` (empty string) # remove all whitespaces immediately before the match -find src/backend/distributed/sql/*.sql -print0 | xargs -0 sed -i 's#\s*\*/\s*##g' +find src/backend/{distributed,columnar}/sql/**/*.sql -print0 | xargs -0 sed -i 's#\s*\*/\s*##g' # * -> -- # keep the indentation # allow only whitespaces before the match -find src/backend/distributed/sql/*.sql -print0 | xargs -0 sed -i 's#^\(\s*\) \*#\1--#g' +find src/backend/{distributed,columnar}/sql/**/*.sql -print0 | xargs -0 sed -i 's#^\(\s*\) \*#\1--#g' # // -> -- # do not touch http:// or similar by allowing only whitespaces before // -find src/backend/distributed/sql/*.sql -print0 | xargs -0 sed -i 's#^\(\s*\)//#\1--#g' +find src/backend/{distributed,columnar}/sql/**/*.sql -print0 | xargs -0 sed -i 's#^\(\s*\)//#\1--#g' diff --git a/src/backend/columnar/sql/columnar--10.0-1--10.0-2.sql b/src/backend/columnar/sql/columnar--10.0-1--10.0-2.sql index ca5dc1cd1..6784f8e01 100644 --- a/src/backend/columnar/sql/columnar--10.0-1--10.0-2.sql +++ b/src/backend/columnar/sql/columnar--10.0-1--10.0-2.sql @@ -1,4 +1,4 @@ -/* columnar--10.0-1--10.0-2.sql */ +-- columnar--10.0-1--10.0-2.sql -- grant read access for columnar metadata tables to unprivileged user GRANT USAGE ON SCHEMA columnar TO PUBLIC; diff --git a/src/backend/columnar/sql/columnar--10.0-3--10.1-1.sql b/src/backend/columnar/sql/columnar--10.0-3--10.1-1.sql index 4cd1add73..f4429a985 100644 --- a/src/backend/columnar/sql/columnar--10.0-3--10.1-1.sql +++ b/src/backend/columnar/sql/columnar--10.0-3--10.1-1.sql @@ -1,4 +1,4 @@ -/* columnar--10.0-3--10.1-1.sql */ +-- columnar--10.0-3--10.1-1.sql -- Drop foreign keys between columnar metadata tables. -- Postgres assigns different names to those foreign keys in PG11, so act accordingly. diff --git a/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql b/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql index 0666d2f54..1ee471117 100644 --- a/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql +++ b/src/backend/columnar/sql/columnar--10.1-1--10.2-1.sql @@ -1,4 +1,4 @@ -/* columnar--10.1-1--10.2-1.sql */ +-- columnar--10.1-1--10.2-1.sql -- For a proper mapping between tid & (stripe, row_num), add a new column to -- columnar.stripe and define a BTREE index on this column. diff --git a/src/backend/columnar/sql/columnar--9.5-1--10.0-1.sql b/src/backend/columnar/sql/columnar--9.5-1--10.0-1.sql index aa932f013..eeec28584 100644 --- a/src/backend/columnar/sql/columnar--9.5-1--10.0-1.sql +++ b/src/backend/columnar/sql/columnar--9.5-1--10.0-1.sql @@ -1,4 +1,4 @@ -/* columnar--9.5-1--10.0-1.sql */ +-- columnar--9.5-1--10.0-1.sql CREATE SCHEMA columnar; SET search_path TO columnar; 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 d82b09a74..bb856e789 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,4 +1,4 @@ -/* columnar--10.0-1--9.5-1.sql */ +-- columnar--10.0-1--9.5-1.sql SET search_path TO columnar; diff --git a/src/backend/columnar/sql/downgrades/columnar--10.0-2--10.0-1.sql b/src/backend/columnar/sql/downgrades/columnar--10.0-2--10.0-1.sql index e82d21f79..043bb63c8 100644 --- a/src/backend/columnar/sql/downgrades/columnar--10.0-2--10.0-1.sql +++ b/src/backend/columnar/sql/downgrades/columnar--10.0-2--10.0-1.sql @@ -1,4 +1,4 @@ -/* columnar--10.0-2--10.0-1.sql */ +-- columnar--10.0-2--10.0-1.sql -- revoke read access for columnar metadata tables from unprivileged user REVOKE USAGE ON SCHEMA columnar FROM PUBLIC; diff --git a/src/backend/columnar/sql/downgrades/columnar--10.1-1--10.0-3.sql b/src/backend/columnar/sql/downgrades/columnar--10.1-1--10.0-3.sql index 46e6e08f7..0da503163 100644 --- a/src/backend/columnar/sql/downgrades/columnar--10.1-1--10.0-3.sql +++ b/src/backend/columnar/sql/downgrades/columnar--10.1-1--10.0-3.sql @@ -1,4 +1,4 @@ -/* columnar--10.1-1--10.0-3.sql */ +-- columnar--10.1-1--10.0-3.sql -- define foreign keys between columnar metadata tables ALTER TABLE columnar.chunk diff --git a/src/backend/columnar/sql/downgrades/columnar--10.2-1--10.1-1.sql b/src/backend/columnar/sql/downgrades/columnar--10.2-1--10.1-1.sql index 7f39cce35..5438a5dc4 100644 --- a/src/backend/columnar/sql/downgrades/columnar--10.2-1--10.1-1.sql +++ b/src/backend/columnar/sql/downgrades/columnar--10.2-1--10.1-1.sql @@ -1,4 +1,4 @@ -/* columnar--10.2-1--10.1-1.sql */ +-- columnar--10.2-1--10.1-1.sql -- downgrade storage for all columnar relations SELECT citus_internal.downgrade_columnar_storage(c.oid) FROM pg_class c, pg_am a diff --git a/src/backend/distributed/sql/downgrades/citus--10.0-4--9.5-1.sql b/src/backend/distributed/sql/downgrades/citus--10.0-4--9.5-1.sql index 0eb38ed60..a7278a21a 100644 --- a/src/backend/distributed/sql/downgrades/citus--10.0-4--9.5-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--10.0-4--9.5-1.sql @@ -42,7 +42,7 @@ COMMENT ON FUNCTION master_update_table_statistics(regclass) IS 'updates shard statistics of the given table and its colocated tables'; DROP FUNCTION pg_catalog.citus_get_active_worker_nodes(OUT text, OUT bigint); -/* copy of citus--10.0-2--10.0-1.sql */ +-- copy of citus--10.0-2--10.0-1.sql #include "../../../columnar/sql/downgrades/columnar--10.0-2--10.0-1.sql" -- copy of citus--10.0-1--9.5-1 diff --git a/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/10.0-1.sql b/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/10.0-1.sql index ea18ff157..bdacd3c08 100644 --- a/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/10.0-1.sql +++ b/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/10.0-1.sql @@ -7,7 +7,7 @@ AS $$ DECLARE r record; BEGIN - /* first check whether we can convert all the to_value's to timestamptz */ + -- first check whether we can convert all the to_value's to timestamptz BEGIN PERFORM FROM pg_catalog.time_partitions @@ -19,7 +19,7 @@ BEGIN RAISE 'partition column of % cannot be cast to a timestamptz', parent_table_name; END; - /* now convert the partitions in separate transactions */ + -- now convert the partitions in separate transactions FOR r IN SELECT partition, from_value, to_value FROM pg_catalog.time_partitions diff --git a/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/latest.sql b/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/latest.sql index ea18ff157..bdacd3c08 100644 --- a/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/latest.sql +++ b/src/backend/distributed/sql/udfs/alter_old_partitions_set_access_method/latest.sql @@ -7,7 +7,7 @@ AS $$ DECLARE r record; BEGIN - /* first check whether we can convert all the to_value's to timestamptz */ + -- first check whether we can convert all the to_value's to timestamptz BEGIN PERFORM FROM pg_catalog.time_partitions @@ -19,7 +19,7 @@ BEGIN RAISE 'partition column of % cannot be cast to a timestamptz', parent_table_name; END; - /* now convert the partitions in separate transactions */ + -- now convert the partitions in separate transactions FOR r IN SELECT partition, from_value, to_value FROM pg_catalog.time_partitions diff --git a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.2-1.sql b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.2-1.sql index b285dc93a..b66ee76cc 100644 --- a/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.2-1.sql +++ b/src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.2-1.sql @@ -24,16 +24,16 @@ BEGIN $cmd$; END IF; - /* - * Citus creates the array_cat_agg but because of a compatibility - * issue between pg13-pg14, we drop and create it during upgrade. - * And as Citus creates it, there needs to be a dependency to the - * Citus extension, so we create that dependency here. - * We are not using: - * ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg - * because we don't have an easy way to check if the aggregate - * exists with anyarray type or anycompatiblearray type. - */ + -- + -- Citus creates the array_cat_agg but because of a compatibility + -- issue between pg13-pg14, we drop and create it during upgrade. + -- And as Citus creates it, there needs to be a dependency to the + -- Citus extension, so we create that dependency here. + -- We are not using: + -- ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg + -- because we don't have an easy way to check if the aggregate + -- exists with anyarray type or anycompatiblearray type. + INSERT INTO pg_depend SELECT 'pg_proc'::regclass::oid as classid, 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 b285dc93a..b66ee76cc 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 @@ -24,16 +24,16 @@ BEGIN $cmd$; END IF; - /* - * Citus creates the array_cat_agg but because of a compatibility - * issue between pg13-pg14, we drop and create it during upgrade. - * And as Citus creates it, there needs to be a dependency to the - * Citus extension, so we create that dependency here. - * We are not using: - * ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg - * because we don't have an easy way to check if the aggregate - * exists with anyarray type or anycompatiblearray type. - */ + -- + -- Citus creates the array_cat_agg but because of a compatibility + -- issue between pg13-pg14, we drop and create it during upgrade. + -- And as Citus creates it, there needs to be a dependency to the + -- Citus extension, so we create that dependency here. + -- We are not using: + -- ALTER EXENSION citus DROP/CREATE AGGREGATE array_cat_agg + -- because we don't have an easy way to check if the aggregate + -- exists with anyarray type or anycompatiblearray type. + INSERT INTO pg_depend SELECT 'pg_proc'::regclass::oid as classid, diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.2-1.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.2-1.sql index 48a54289f..6c45f67df 100644 --- a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.2-1.sql +++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/10.2-1.sql @@ -8,13 +8,13 @@ BEGIN DELETE FROM pg_depend WHERE objid IN (SELECT oid FROM pg_proc WHERE proname = 'array_cat_agg') AND refobjid IN (select oid from pg_extension where extname = 'citus'); - /* - * We are dropping the aggregates because postgres 14 changed - * array_cat type from anyarray to anycompatiblearray. When - * upgrading to pg14, spegifically when running pg_restore on - * array_cat_agg we would get an error. So we drop the aggregate - * and create the right one on citus_finish_pg_upgrade. - */ + -- + -- We are dropping the aggregates because postgres 14 changed + -- array_cat type from anyarray to anycompatiblearray. When + -- upgrading to pg14, spegifically when running pg_restore on + -- array_cat_agg we would get an error. So we drop the aggregate + -- and create the right one on citus_finish_pg_upgrade. + DROP AGGREGATE IF EXISTS array_cat_agg(anyarray); DROP AGGREGATE IF EXISTS array_cat_agg(anycompatiblearray); -- diff --git a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql index 48a54289f..6c45f67df 100644 --- a/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_prepare_pg_upgrade/latest.sql @@ -8,13 +8,13 @@ BEGIN DELETE FROM pg_depend WHERE objid IN (SELECT oid FROM pg_proc WHERE proname = 'array_cat_agg') AND refobjid IN (select oid from pg_extension where extname = 'citus'); - /* - * We are dropping the aggregates because postgres 14 changed - * array_cat type from anyarray to anycompatiblearray. When - * upgrading to pg14, spegifically when running pg_restore on - * array_cat_agg we would get an error. So we drop the aggregate - * and create the right one on citus_finish_pg_upgrade. - */ + -- + -- We are dropping the aggregates because postgres 14 changed + -- array_cat type from anyarray to anycompatiblearray. When + -- upgrading to pg14, spegifically when running pg_restore on + -- array_cat_agg we would get an error. So we drop the aggregate + -- and create the right one on citus_finish_pg_upgrade. + DROP AGGREGATE IF EXISTS array_cat_agg(anyarray); DROP AGGREGATE IF EXISTS array_cat_agg(anycompatiblearray); --