From 1e95e4576d6f6ede05cc37bcf3fc8a67f9824054 Mon Sep 17 00:00:00 2001 From: Eren Basak Date: Tue, 11 Oct 2016 12:18:38 +0300 Subject: [PATCH] Add pg_dist_local_group Metadata Table This change adds the pg_dist_local_group metadata table, which indicates the group id of the current node. It is expected that this table contains one and only one row, which only contains the group id of the node as an integer. --- src/backend/distributed/Makefile | 4 +++- src/backend/distributed/citus--6.0-4--6.0-5.sql | 2 -- src/backend/distributed/citus--6.0-6--6.0-7.sql | 2 +- src/backend/distributed/citus--6.0-8--6.0-9.sql | 9 +++++++++ src/backend/distributed/citus.control | 2 +- src/test/regress/expected/multi_extension.out | 1 + src/test/regress/sql/multi_extension.sql | 1 + 7 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/backend/distributed/citus--6.0-8--6.0-9.sql diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index e0cc59453..7a3c54bb3 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-8 + 6.0-1 6.0-2 6.0-3 6.0-4 6.0-5 6.0-6 6.0-7 6.0-8 6.0-9 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -74,6 +74,8 @@ $(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 $^ > $@ +$(EXTENSION)--6.0-9.sql: $(EXTENSION)--6.0-8.sql $(EXTENSION)--6.0-8--6.0-9.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--6.0-4--6.0-5.sql b/src/backend/distributed/citus--6.0-4--6.0-5.sql index 08ee51a78..1b72ede65 100644 --- a/src/backend/distributed/citus--6.0-4--6.0-5.sql +++ b/src/backend/distributed/citus--6.0-4--6.0-5.sql @@ -1,5 +1,3 @@ -/* citus--5.2-1--5.2-2.sql */ - /* * Replace oid column in pg_dist_shard_placement with an sequence column. */ diff --git a/src/backend/distributed/citus--6.0-6--6.0-7.sql b/src/backend/distributed/citus--6.0-6--6.0-7.sql index 9fe34e250..20cc432c2 100644 --- a/src/backend/distributed/citus--6.0-6--6.0-7.sql +++ b/src/backend/distributed/citus--6.0-6--6.0-7.sql @@ -1,4 +1,4 @@ -/* citus--6.0-5--6.0-6.sql */ +/* citus--6.0-6--6.0-7.sql */ CREATE FUNCTION pg_catalog.get_colocated_table_array(regclass) RETURNS regclass[] diff --git a/src/backend/distributed/citus--6.0-8--6.0-9.sql b/src/backend/distributed/citus--6.0-8--6.0-9.sql new file mode 100644 index 000000000..057966d28 --- /dev/null +++ b/src/backend/distributed/citus--6.0-8--6.0-9.sql @@ -0,0 +1,9 @@ +CREATE TABLE citus.pg_dist_local_group( + groupid int NOT NULL PRIMARY KEY) +; + +/* insert the default value for being the coordinator node */ +INSERT INTO citus.pg_dist_local_group VALUES (0); + +ALTER TABLE citus.pg_dist_local_group SET SCHEMA pg_catalog; +GRANT SELECT ON pg_catalog.pg_dist_local_group TO public; diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index fbf54e7f4..6dcf270ae 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-8' +default_version = '6.0-9' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index f3010ba42..0ebe5275f 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -34,6 +34,7 @@ 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'; +ALTER EXTENSION citus UPDATE TO '6.0-9'; -- drop extension an re-create in newest version DROP EXTENSION citus; \c diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 8803ab777..19c81e27c 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -39,6 +39,7 @@ 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'; +ALTER EXTENSION citus UPDATE TO '6.0-9'; -- drop extension an re-create in newest version DROP EXTENSION citus;