diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index 2d5bf7019..e0cc59453 100644 --- a/src/backend/distributed/Makefile +++ b/src/backend/distributed/Makefile @@ -8,7 +8,7 @@ EXTENSION = citus EXTVERSIONS = 5.0 5.0-1 5.0-2 \ 5.1-1 5.1-2 5.1-3 5.1-4 5.1-5 5.1-6 5.1-7 5.1-8 \ 5.2-1 5.2-2 5.2-3 5.2-4 \ - 6.0-1 6.0-2 6.0-3 6.0-4 6.0-5 6.0-6 6.0-7 + 6.0-1 6.0-2 6.0-3 6.0-4 6.0-5 6.0-6 6.0-7 6.0-8 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -72,6 +72,8 @@ $(EXTENSION)--6.0-6.sql: $(EXTENSION)--6.0-5.sql $(EXTENSION)--6.0-5--6.0-6.sql cat $^ > $@ $(EXTENSION)--6.0-7.sql: $(EXTENSION)--6.0-6.sql $(EXTENSION)--6.0-6--6.0-7.sql cat $^ > $@ +$(EXTENSION)--6.0-8.sql: $(EXTENSION)--6.0-7.sql $(EXTENSION)--6.0-7--6.0-8.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--6.0-5--6.0-6.sql b/src/backend/distributed/citus--6.0-5--6.0-6.sql index ec4a7cd86..33456f43e 100644 --- a/src/backend/distributed/citus--6.0-5--6.0-6.sql +++ b/src/backend/distributed/citus--6.0-5--6.0-6.sql @@ -12,4 +12,3 @@ CREATE FUNCTION column_name_to_column(table_name regclass, column_name text) AS 'MODULE_PATHNAME', $$column_name_to_column$$; COMMENT ON FUNCTION column_name_to_column(table_name regclass, column_name text) IS 'convert a column name to its textual Var representation'; - diff --git a/src/backend/distributed/citus--6.0-7--6.0-8.sql b/src/backend/distributed/citus--6.0-7--6.0-8.sql new file mode 100644 index 000000000..87f0c6644 --- /dev/null +++ b/src/backend/distributed/citus--6.0-7--6.0-8.sql @@ -0,0 +1,4 @@ +/* + * Drop shardalias from pg_dist_shard + */ +ALTER TABLE pg_dist_shard DROP shardalias; diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index 3b26d61b3..fbf54e7f4 100644 --- a/src/backend/distributed/citus.control +++ b/src/backend/distributed/citus.control @@ -1,6 +1,6 @@ # Citus extension comment = 'Citus distributed database' -default_version = '6.0-7' +default_version = '6.0-8' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/backend/distributed/master/master_metadata_utility.c b/src/backend/distributed/master/master_metadata_utility.c index b6e18fd2c..bcc3dda68 100644 --- a/src/backend/distributed/master/master_metadata_utility.c +++ b/src/backend/distributed/master/master_metadata_utility.c @@ -379,8 +379,8 @@ InsertShardRow(Oid relationId, uint64 shardId, char storageType, values[Anum_pg_dist_shard_shardid - 1] = Int64GetDatum(shardId); values[Anum_pg_dist_shard_shardstorage - 1] = CharGetDatum(storageType); - /* deprecated shardalias column is always null. */ - isNulls[Anum_pg_dist_shard_shardalias_DEPRECATED - 1] = true; + /* dropped shardalias column must also be set; it is still part of the tuple */ + isNulls[Anum_pg_dist_shard_shardalias_DROPPED - 1] = true; /* check if shard min/max values are null */ if (shardMinValue != NULL && shardMaxValue != NULL) diff --git a/src/include/distributed/pg_dist_shard.h b/src/include/distributed/pg_dist_shard.h index b0e4a4401..36cf09979 100644 --- a/src/include/distributed/pg_dist_shard.h +++ b/src/include/distributed/pg_dist_shard.h @@ -26,7 +26,7 @@ typedef struct FormData_pg_dist_shard int64 shardid; /* global shardId representing remote partition */ char shardstorage; /* shard storage type; see codes below */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ - text shardalias_DEPRECATED; /* deprecated column, should be unused */ + text shardalias_DROPPED; /* dropped column, not in use */ text shardminvalue; /* partition key's minimum value in shard */ text shardmaxvalue; /* partition key's maximum value in shard */ #endif @@ -47,7 +47,7 @@ typedef FormData_pg_dist_shard *Form_pg_dist_shard; #define Anum_pg_dist_shard_logicalrelid 1 #define Anum_pg_dist_shard_shardid 2 #define Anum_pg_dist_shard_shardstorage 3 -#define Anum_pg_dist_shard_shardalias_DEPRECATED 4 +#define Anum_pg_dist_shard_shardalias_DROPPED 4 #define Anum_pg_dist_shard_shardminvalue 5 #define Anum_pg_dist_shard_shardmaxvalue 6 diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 60d14aa4d..f3010ba42 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -33,6 +33,7 @@ ALTER EXTENSION citus UPDATE TO '6.0-4'; ALTER EXTENSION citus UPDATE TO '6.0-5'; ALTER EXTENSION citus UPDATE TO '6.0-6'; ALTER EXTENSION citus UPDATE TO '6.0-7'; +ALTER EXTENSION citus UPDATE TO '6.0-8'; -- drop extension an re-create in newest version DROP EXTENSION citus; \c diff --git a/src/test/regress/expected/multi_table_ddl.out b/src/test/regress/expected/multi_table_ddl.out index 7da6ce247..0052ad7ae 100644 --- a/src/test/regress/expected/multi_table_ddl.out +++ b/src/test/regress/expected/multi_table_ddl.out @@ -53,8 +53,8 @@ SELECT * FROM pg_dist_partition; (0 rows) SELECT * FROM pg_dist_shard; - logicalrelid | shardid | shardstorage | shardalias | shardminvalue | shardmaxvalue ---------------+---------+--------------+------------+---------------+--------------- + logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue +--------------+---------+--------------+---------------+--------------- (0 rows) SELECT * FROM pg_dist_shard_placement; diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 77131a7c7..8803ab777 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -38,6 +38,7 @@ ALTER EXTENSION citus UPDATE TO '6.0-4'; ALTER EXTENSION citus UPDATE TO '6.0-5'; ALTER EXTENSION citus UPDATE TO '6.0-6'; ALTER EXTENSION citus UPDATE TO '6.0-7'; +ALTER EXTENSION citus UPDATE TO '6.0-8'; -- drop extension an re-create in newest version DROP EXTENSION citus;