aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2018-11-23 08:44:15 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2018-11-23 08:47:34 -0300
commita5586a0e0b6b6cf58f77fe0f3e506646444e6d51 (patch)
tree3b35965d5094bd163b817b09d7c1b11fdc89e9c2
parentefcb06f1f593d2db0e953df6cc5b597057bc1716 (diff)
downloadpostgresql-a5586a0e0b6b6cf58f77fe0f3e506646444e6d51.tar.gz
postgresql-a5586a0e0b6b6cf58f77fe0f3e506646444e6d51.zip
Don't allow partitioned indexes in pg_global tablespace
Missing in dfa608141982. Author: David Rowley Discussion: https://postgr.es/m/CAKJS1f-M3NMTCpv=vDfkoqHbMPFf=3-Z1ud=+1DHH00tC+zLaQ@mail.gmail.com
-rw-r--r--src/backend/commands/tablecmds.c6
-rw-r--r--src/test/regress/input/tablespace.source1
-rw-r--r--src/test/regress/output/tablespace.source2
3 files changed, 9 insertions, 0 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index d40d3ca70ca..82312686c4f 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -11070,6 +11070,12 @@ ATExecPartedIdxSetTableSpace(Relation rel, Oid newTableSpace)
Assert(rel->rd_rel->relkind == RELKIND_PARTITIONED_INDEX);
+ /* Can't allow a non-shared relation in pg_global */
+ if (newTableSpace == GLOBALTABLESPACE_OID)
+ ereport(ERROR,
+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+ errmsg("only shared relations can be placed in pg_global tablespace")));
+
/*
* No work if no change in tablespace.
*/
diff --git a/src/test/regress/input/tablespace.source b/src/test/regress/input/tablespace.source
index 60c87261db8..2ac757cfab2 100644
--- a/src/test/regress/input/tablespace.source
+++ b/src/test/regress/input/tablespace.source
@@ -101,6 +101,7 @@ CREATE UNIQUE INDEX anindex ON testschema.atable(column1);
ALTER TABLE testschema.atable SET TABLESPACE regress_tblspace;
ALTER INDEX testschema.anindex SET TABLESPACE regress_tblspace;
+ALTER INDEX testschema.part_a_idx SET TABLESPACE pg_global;
ALTER INDEX testschema.part_a_idx SET TABLESPACE pg_default;
ALTER INDEX testschema.part_a_idx SET TABLESPACE regress_tblspace;
diff --git a/src/test/regress/output/tablespace.source b/src/test/regress/output/tablespace.source
index 43962e6f013..2e78e5ece68 100644
--- a/src/test/regress/output/tablespace.source
+++ b/src/test/regress/output/tablespace.source
@@ -214,6 +214,8 @@ CREATE TABLE testschema.atable AS VALUES (1), (2);
CREATE UNIQUE INDEX anindex ON testschema.atable(column1);
ALTER TABLE testschema.atable SET TABLESPACE regress_tblspace;
ALTER INDEX testschema.anindex SET TABLESPACE regress_tblspace;
+ALTER INDEX testschema.part_a_idx SET TABLESPACE pg_global;
+ERROR: only shared relations can be placed in pg_global tablespace
ALTER INDEX testschema.part_a_idx SET TABLESPACE pg_default;
ALTER INDEX testschema.part_a_idx SET TABLESPACE regress_tblspace;
INSERT INTO testschema.atable VALUES(3); -- ok