diff --git a/src/backend/distributed/commands/citus_add_local_table_to_metadata.c b/src/backend/distributed/commands/citus_add_local_table_to_metadata.c index 0919380e6..9bde3d928 100644 --- a/src/backend/distributed/commands/citus_add_local_table_to_metadata.c +++ b/src/backend/distributed/commands/citus_add_local_table_to_metadata.c @@ -79,7 +79,8 @@ static void DropDefaultExpressionsAndMoveOwnedSequenceOwnerships(Oid sourceRelat static void DropDefaultColumnDefinition(Oid relationId, char *columnName); static void TransferSequenceOwnership(Oid ownedSequenceId, Oid targetRelationId, char *columnName); -static void InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId, bool autoConverted); +static void InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId, + bool autoConverted); static void FinalizeCitusLocalTableCreation(Oid relationId, List *dependentSequenceList); @@ -1099,7 +1100,8 @@ TransferSequenceOwnership(Oid sequenceId, Oid targetRelationId, char *targetColu * pg_dist_partition, pg_dist_shard & pg_dist_placement. */ static void -InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId, bool autoConverted) +InsertMetadataForCitusLocalTable(Oid citusLocalTableId, uint64 shardId, + bool autoConverted) { Assert(OidIsValid(citusLocalTableId)); Assert(shardId != INVALID_SHARD_ID); diff --git a/src/backend/distributed/sql/citus--10.2-3--11.0-1.sql b/src/backend/distributed/sql/citus--10.2-3--11.0-1.sql index 14662dce6..9f7474135 100644 --- a/src/backend/distributed/sql/citus--10.2-3--11.0-1.sql +++ b/src/backend/distributed/sql/citus--10.2-3--11.0-1.sql @@ -6,6 +6,6 @@ #include "udfs/fix_all_partition_shard_index_names/11.0-1.sql" #include "udfs/worker_fix_partition_shard_index_names/11.0-1.sql" -ALTER TABLE pg_catalog.pg_dist_partition ADD COLUMN autoconverted boolean; DROP FUNCTION IF EXISTS pg_catalog.master_apply_delete_command(text); DROP FUNCTION pg_catalog.master_get_table_metadata(text); +ALTER TABLE pg_catalog.pg_dist_partition ADD COLUMN autoconverted boolean; diff --git a/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-3.sql b/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-3.sql index 60a431121..dd3c6a03c 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-3.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-3.sql @@ -4,8 +4,6 @@ DROP FUNCTION pg_catalog.fix_all_partition_shard_index_names(); DROP FUNCTION pg_catalog.fix_partition_shard_index_names(regclass); DROP FUNCTION pg_catalog.worker_fix_partition_shard_index_names(regclass, text, text); -ALTER TABLE pg_catalog.pg_dist_partition DROP COLUMN autoconverted; - CREATE FUNCTION pg_catalog.master_apply_delete_command(text) RETURNS integer LANGUAGE C STRICT @@ -26,3 +24,4 @@ CREATE FUNCTION pg_catalog.master_get_table_metadata( AS 'MODULE_PATHNAME', $$master_get_table_metadata$$; COMMENT ON FUNCTION master_get_table_metadata(relation_name text) IS 'fetch metadata values for the table'; +ALTER TABLE pg_catalog.pg_dist_partition DROP COLUMN autoconverted; diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h index 715aabc24..092ca9041 100644 --- a/src/include/distributed/commands.h +++ b/src/include/distributed/commands.h @@ -533,8 +533,8 @@ extern void ExecuteForeignKeyCreateCommandList(List *ddlCommandList, bool skip_validation); /* create_citus_local_table.c */ -extern void SetAutoConverted(bool autoConvertedValue); -extern void CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys, bool autoConverted); +extern void CreateCitusLocalTable(Oid relationId, bool cascadeViaForeignKeys, + bool autoConverted); extern List * GetExplicitIndexOidList(Oid relationId); extern bool ShouldPropagateSetCommand(VariableSetStmt *setStmt);