external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the same colocation group for child and parent rels when altering a distributed table (#6225) 

* Alter_distributed_table colocateWith:none bug fix for partitioned tables.

* Regression tests added for alter_distributed_table colocateWith:none for partitioned tables

* Update query comparision to be more accurate
pull/6237/head
Gokhan Gulbiz 2022-08-25 09:23:59 +01:00 committed by GitHub
parent ac07d33a29
commit 69d2fcf5c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/distributed/commands/alter_table.c
View File

@ -640,6 +640,8 @@ ConvertTable(TableConversionState *con)
Oid partitionRelationId = InvalidOid;
foreach_oid(partitionRelationId, partitionList)
{
char *tableQualifiedName = generate_qualified_relation_name(
partitionRelationId);
char *detachPartitionCommand = GenerateDetachPartitionCommand(
partitionRelationId);
char *attachPartitionCommand = GenerateAlterTableAttachPartitionCommand(
@ -685,6 +687,19 @@ ConvertTable(TableConversionState *con)
foreignKeyCommands = list_concat(foreignKeyCommands,
partitionReturn->foreignKeyCommands);
}
/*
* If we are altering a partitioned distributed table by
* colocateWith:none, we override con->colocationWith parameter
* with the first newly created partition table to share the
* same colocation group for rest of partitions and partitioned
* table.
*/
if (con->colocateWith != NULL && IsColocateWithNone(con->colocateWith))
{
con->colocateWith = tableQualifiedName;
}
}
}

49
src/test/regress/expected/alter_distributed_table.out
View File

@ -321,6 +321,55 @@ SELECT * FROM partitioned_table_6_10 ORDER BY 1, 2;
7 | 2
(1 row)
-- test altering partitioned table colocate_with:none
CREATE TABLE foo (x int, y int, t timestamptz default now()) PARTITION BY RANGE (t);
CREATE TABLE foo_1 PARTITION of foo for VALUES FROM ('2022-01-01') TO ('2022-12-31');
CREATE TABLE foo_2 PARTITION of foo for VALUES FROM ('2023-01-01') TO ('2023-12-31');
SELECT create_distributed_table('foo','x');
create_distributed_table
---------------------------------------------------------------------
(1 row)
CREATE TABLE foo_bar (x int, y int, t timestamptz default now()) PARTITION BY RANGE (t);
CREATE TABLE foo_bar_1 PARTITION of foo_bar for VALUES FROM ('2022-01-01') TO ('2022-12-31');
CREATE TABLE foo_bar_2 PARTITION of foo_bar for VALUES FROM ('2023-01-01') TO ('2023-12-31');
SELECT create_distributed_table('foo_bar','x');
create_distributed_table
---------------------------------------------------------------------
(1 row)
SELECT COUNT(DISTINCT colocationid) FROM pg_dist_partition WHERE logicalrelid::regclass::text in ('foo', 'foo_1', 'foo_2', 'foo_bar', 'foo_bar_1', 'foo_bar_2');
count
---------------------------------------------------------------------
1
(1 row)
SELECT alter_distributed_table('foo', colocate_with => 'none');
NOTICE: converting the partitions of alter_distributed_table.foo
NOTICE: creating a new table for alter_distributed_table.foo_1
NOTICE: moving the data of alter_distributed_table.foo_1
NOTICE: dropping the old alter_distributed_table.foo_1
NOTICE: renaming the new table to alter_distributed_table.foo_1
NOTICE: creating a new table for alter_distributed_table.foo_2
NOTICE: moving the data of alter_distributed_table.foo_2
NOTICE: dropping the old alter_distributed_table.foo_2
NOTICE: renaming the new table to alter_distributed_table.foo_2
NOTICE: creating a new table for alter_distributed_table.foo
NOTICE: dropping the old alter_distributed_table.foo
NOTICE: renaming the new table to alter_distributed_table.foo
alter_distributed_table
---------------------------------------------------------------------
(1 row)
SELECT COUNT(DISTINCT colocationid) FROM pg_dist_partition WHERE logicalrelid::regclass::text in ('foo', 'foo_1', 'foo_2', 'foo_bar', 'foo_bar_1', 'foo_bar_2');
count
---------------------------------------------------------------------
2
(1 row)
-- test references
CREATE TABLE referenced_dist_table (a INT UNIQUE);
CREATE TABLE referenced_ref_table (a INT UNIQUE);

18
src/test/regress/sql/alter_distributed_table.sql
View File

@ -84,6 +84,24 @@ SELECT * FROM partitioned_table ORDER BY 1, 2;
SELECT * FROM partitioned_table_1_5 ORDER BY 1, 2;
SELECT * FROM partitioned_table_6_10 ORDER BY 1, 2;
-- test altering partitioned table colocate_with:none
CREATE TABLE foo (x int, y int, t timestamptz default now()) PARTITION BY RANGE (t);
CREATE TABLE foo_1 PARTITION of foo for VALUES FROM ('2022-01-01') TO ('2022-12-31');
CREATE TABLE foo_2 PARTITION of foo for VALUES FROM ('2023-01-01') TO ('2023-12-31');
SELECT create_distributed_table('foo','x');
CREATE TABLE foo_bar (x int, y int, t timestamptz default now()) PARTITION BY RANGE (t);
CREATE TABLE foo_bar_1 PARTITION of foo_bar for VALUES FROM ('2022-01-01') TO ('2022-12-31');
CREATE TABLE foo_bar_2 PARTITION of foo_bar for VALUES FROM ('2023-01-01') TO ('2023-12-31');
SELECT create_distributed_table('foo_bar','x');
SELECT COUNT(DISTINCT colocationid) FROM pg_dist_partition WHERE logicalrelid::regclass::text in ('foo', 'foo_1', 'foo_2', 'foo_bar', 'foo_bar_1', 'foo_bar_2');
SELECT alter_distributed_table('foo', colocate_with => 'none');
SELECT COUNT(DISTINCT colocationid) FROM pg_dist_partition WHERE logicalrelid::regclass::text in ('foo', 'foo_1', 'foo_2', 'foo_bar', 'foo_bar_1', 'foo_bar_2');
-- test references
CREATE TABLE referenced_dist_table (a INT UNIQUE);