From bf176c436df641f502e24b35a8c3dac49f7af60a Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Thu, 13 Oct 2016 18:37:07 +0300 Subject: [PATCH] nodeport int8 -> int4 --- src/backend/distributed/Makefile | 4 +++- src/backend/distributed/citus--6.0-10--6.0-11.sql | 4 ++++ src/backend/distributed/citus.control | 2 +- src/backend/distributed/master/master_metadata_utility.c | 4 ++-- src/test/regress/expected/multi_extension.out | 1 + src/test/regress/sql/multi_extension.sql | 1 + 6 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 src/backend/distributed/citus--6.0-10--6.0-11.sql diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index b06e5a876..beb90d024 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-9 6.0-10 + 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 6.0-10 6.0-11 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -78,6 +78,8 @@ $(EXTENSION)--6.0-9.sql: $(EXTENSION)--6.0-8.sql $(EXTENSION)--6.0-8--6.0-9.sql cat $^ > $@ $(EXTENSION)--6.0-10.sql: $(EXTENSION)--6.0-9.sql $(EXTENSION)--6.0-9--6.0-10.sql cat $^ > $@ +$(EXTENSION)--6.0-11.sql: $(EXTENSION)--6.0-10.sql $(EXTENSION)--6.0-10--6.0-11.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--6.0-10--6.0-11.sql b/src/backend/distributed/citus--6.0-10--6.0-11.sql new file mode 100644 index 000000000..0b172c215 --- /dev/null +++ b/src/backend/distributed/citus--6.0-10--6.0-11.sql @@ -0,0 +1,4 @@ +/* + * nodeport should be 32-bit, not 64-bit + */ +ALTER TABLE pg_dist_shard_placement ALTER nodeport TYPE int4; diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index da6f90cff..726af25ca 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-10' +default_version = '6.0-11' 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 bcc3dda68..ee1462c79 100644 --- a/src/backend/distributed/master/master_metadata_utility.c +++ b/src/backend/distributed/master/master_metadata_utility.c @@ -350,7 +350,7 @@ TupleToShardPlacement(TupleDesc tupleDescriptor, HeapTuple heapTuple) shardPlacement->shardLength = DatumGetInt64(shardLength); shardPlacement->shardState = DatumGetUInt32(shardState); shardPlacement->nodeName = TextDatumGetCString(nodeName); - shardPlacement->nodePort = DatumGetInt64(nodePort); + shardPlacement->nodePort = DatumGetInt32(nodePort); return shardPlacement; } @@ -439,7 +439,7 @@ InsertShardPlacementRow(uint64 shardId, uint64 placementId, values[Anum_pg_dist_shard_placement_shardstate - 1] = CharGetDatum(shardState); values[Anum_pg_dist_shard_placement_shardlength - 1] = Int64GetDatum(shardLength); values[Anum_pg_dist_shard_placement_nodename - 1] = CStringGetTextDatum(nodeName); - values[Anum_pg_dist_shard_placement_nodeport - 1] = Int64GetDatum(nodePort); + values[Anum_pg_dist_shard_placement_nodeport - 1] = Int32GetDatum(nodePort); values[Anum_pg_dist_shard_placement_placementid - 1] = Int64GetDatum(placementId); /* open shard placement relation and insert new tuple */ diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 7ff35d2ee..ec7a73d5f 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -36,6 +36,7 @@ ALTER EXTENSION citus UPDATE TO '6.0-7'; ALTER EXTENSION citus UPDATE TO '6.0-8'; ALTER EXTENSION citus UPDATE TO '6.0-9'; ALTER EXTENSION citus UPDATE TO '6.0-10'; +ALTER EXTENSION citus UPDATE TO '6.0-11'; -- 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 bf9a0e7c4..a7aaa0eef 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -41,6 +41,7 @@ ALTER EXTENSION citus UPDATE TO '6.0-7'; ALTER EXTENSION citus UPDATE TO '6.0-8'; ALTER EXTENSION citus UPDATE TO '6.0-9'; ALTER EXTENSION citus UPDATE TO '6.0-10'; +ALTER EXTENSION citus UPDATE TO '6.0-11'; -- drop extension an re-create in newest version DROP EXTENSION citus;