From 9212004b62d96917d29e36b529c2c80994137bf9 Mon Sep 17 00:00:00 2001 From: amit Date: Tue, 24 Jan 2017 14:22:34 +0900 Subject: [PATCH] Do not allocate storage for partitioned tables. Currently, it is not possible to insert any data into a partitioned table. So they're empty at all times, which means it is wasteful to allocate relfilenode and related storage objects. Also, because there is no storage, it doesn't make sense to allow specifying storage parameters such as fillfactor, etc. for partitioned tables. Patch by: Amit Langote & Maksim Milyutin Reviwed by: Kyotaro Horiguchi --- doc/src/sgml/ref/create_table.sgml | 6 +++++ src/backend/access/common/reloptions.c | 35 +++++++++++++++++++++--------- src/backend/catalog/heap.c | 20 ++++++++++------- src/include/access/reloptions.h | 3 ++- src/test/regress/expected/alter_table.out | 5 +++++ src/test/regress/expected/create_table.out | 5 +++++ src/test/regress/sql/alter_table.sql | 5 +++++ src/test/regress/sql/create_table.sql | 4 ++++ 8 files changed, 64 insertions(+), 19 deletions(-) diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 283d53e..5f13f24 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1040,6 +1040,12 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI will use the table's parameter value. + + Note that specifying the following parameters for partitioned tables is + not supported. You must specify them for individual leaf partitions if + necessary. + + diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 72e1253..d3f1e7b 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -1010,7 +1010,7 @@ relopt_value * parseRelOptions(Datum options, bool validate, relopt_kind kind, int *numrelopts) { - relopt_value *reloptions; + relopt_value *reloptions = NULL; int numoptions = 0; int i; int j; @@ -1024,21 +1024,28 @@ parseRelOptions(Datum options, bool validate, relopt_kind kind, if (relOpts[i]->kinds & kind) numoptions++; - if (numoptions == 0) + /* + * Even if we found no options of kind, it's better to raise the + * "unrecognized parameter %s" error here, instead of at the caller. + */ + if (numoptions == 0 && !validate) { *numrelopts = 0; return NULL; } - reloptions = palloc(numoptions * sizeof(relopt_value)); - - for (i = 0, j = 0; relOpts[i]; i++) + if (numoptions > 0) { - if (relOpts[i]->kinds & kind) + reloptions = palloc(numoptions * sizeof(relopt_value)); + + for (i = 0, j = 0; relOpts[i]; i++) { - reloptions[j].gen = relOpts[i]; - reloptions[j].isset = false; - j++; + if (relOpts[i]->kinds & kind) + { + reloptions[j].gen = relOpts[i]; + reloptions[j].isset = false; + j++; + } } } @@ -1418,8 +1425,16 @@ heap_reloptions(char relkind, Datum reloptions, bool validate) return (bytea *) rdopts; case RELKIND_RELATION: case RELKIND_MATVIEW: - case RELKIND_PARTITIONED_TABLE: return default_reloptions(reloptions, validate, RELOPT_KIND_HEAP); + + /* + * There aren't any partitioned table options yet really, so the + * following simply serves to reject whatever's specified as being + * "unrecognized storage parameter" if validate is true. + */ + case RELKIND_PARTITIONED_TABLE: + return default_reloptions(reloptions, validate, + RELOPT_KIND_PARTITIONED_TABLE); default: /* other relkinds are not supported */ return NULL; diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index eee5e2f..ff2f2e8 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -293,6 +293,7 @@ heap_create(const char *relname, case RELKIND_VIEW: case RELKIND_COMPOSITE_TYPE: case RELKIND_FOREIGN_TABLE: + case RELKIND_PARTITIONED_TABLE: create_storage = false; /* @@ -1347,14 +1348,13 @@ heap_create_with_catalog(const char *relname, if (oncommit != ONCOMMIT_NOOP) register_on_commit_action(relid, oncommit); - if (relpersistence == RELPERSISTENCE_UNLOGGED) - { - Assert(relkind == RELKIND_RELATION || relkind == RELKIND_MATVIEW || - relkind == RELKIND_TOASTVALUE || - relkind == RELKIND_PARTITIONED_TABLE); - + /* + * We do not want to create any storage objects for a partitioned + * table, including the init fork. + */ + if (relpersistence == RELPERSISTENCE_UNLOGGED && + relkind != RELKIND_PARTITIONED_TABLE) heap_create_init_fork(new_rel_desc); - } /* * ok, the relation has been cataloged, so close our relations and return @@ -1378,6 +1378,9 @@ heap_create_with_catalog(const char *relname, void heap_create_init_fork(Relation rel) { + Assert(rel->rd_rel->relkind == RELKIND_RELATION || + rel->rd_rel->relkind == RELKIND_MATVIEW || + rel->rd_rel->relkind == RELKIND_TOASTVALUE); RelationOpenSmgr(rel); smgrcreate(rel->rd_smgr, INIT_FORKNUM, false); log_smgrcreate(&rel->rd_smgr->smgr_rnode.node, INIT_FORKNUM); @@ -1824,7 +1827,8 @@ heap_drop_with_catalog(Oid relid) */ if (rel->rd_rel->relkind != RELKIND_VIEW && rel->rd_rel->relkind != RELKIND_COMPOSITE_TYPE && - rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE) + rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE && + rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE) { RelationDropStorage(rel); } diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h index 861977a..4b78d77 100644 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@ -48,8 +48,9 @@ typedef enum relopt_kind RELOPT_KIND_SPGIST = (1 << 8), RELOPT_KIND_VIEW = (1 << 9), RELOPT_KIND_BRIN = (1 << 10), + RELOPT_KIND_PARTITIONED_TABLE = (1 << 11), /* if you add a new kind, make sure you update "last_default" too */ - RELOPT_KIND_LAST_DEFAULT = RELOPT_KIND_BRIN, + RELOPT_KIND_LAST_DEFAULT = RELOPT_KIND_PARTITIONED_TABLE, /* some compilers treat enums as signed ints, so we can't use 1 << 31 */ RELOPT_KIND_MAX = (1 << 30) } relopt_kind; diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index 2227f2d..1230ad7 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -3372,3 +3372,8 @@ ERROR: partition constraint is violated by some row -- cleanup drop table p; drop table p1; +-- partitioned tables accept no options other than "oids" in the WITH list +create table parted_withopt_test (a int) partition by list (a) with (oids = true); +alter table parted_withopt_test set (fillfactor = 90); +ERROR: unrecognized parameter "fillfactor" +drop table parted_withopt_test; diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 6f8645d..6294a16 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -669,3 +669,8 @@ Number of partitions: 3 (Use \d+ to list them.) -- cleanup DROP TABLE parted, list_parted, range_parted, list_parted2, range_parted2, range_parted3; +-- partitioned tables accept no options other than "oids" in the WITH list +create table parted_withopt_test (a int) partition by list (a) with (fillfactor = 10); +ERROR: unrecognized parameter "fillfactor" +create table parted_withopt_test (a int) partition by list (a) with (toast.autvacuum_enabled = true); +ERROR: unrecognized parameter "autvacuum_enabled" diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 8cd6786..e50f408 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -2228,3 +2228,8 @@ alter table p attach partition p1 for values from (1, 2) to (1, 10); -- cleanup drop table p; drop table p1; + +-- partitioned tables accept no options other than "oids" in the WITH list +create table parted_withopt_test (a int) partition by list (a) with (oids = true); +alter table parted_withopt_test set (fillfactor = 90); +drop table parted_withopt_test; diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index 1f0fa8e..0c8cae0 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -597,3 +597,7 @@ CREATE TABLE part_c_1_10 PARTITION OF part_c FOR VALUES FROM (1) TO (10); -- cleanup DROP TABLE parted, list_parted, range_parted, list_parted2, range_parted2, range_parted3; + +-- partitioned tables accept no options other than "oids" in the WITH list +create table parted_withopt_test (a int) partition by list (a) with (fillfactor = 10); +create table parted_withopt_test (a int) partition by list (a) with (toast.autvacuum_enabled = true); -- 2.3.2 (Apple Git-55)