Skip to content

Commit f49bcd4

Browse files
robertmhaasrobertmhaas
committed
postgres_fdw: Teach IMPORT FOREIGN SCHEMA about partitioning.
Don't import partitions. Do import partitioned tables which are not themselves partitions. Report by Stephen Frost. Design and patch by Michael Paquier, reviewed by Amit Langote. Documentation revised by me. Discussion: http://postgr.es/m/20170309141531.GD9812@tamriel.snowman.net
1 parent e306df7 commit f49bcd4

File tree

4 files changed

+55
-5
lines changed

4 files changed

+55
-5
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6907,6 +6907,9 @@ CREATE TABLE import_source.t3 (c1 timestamptz default now(), c2 typ1);
69076907
CREATE TABLE import_source."x 4" (c1 float8, "C 2" text, c3 varchar(42));
69086908
CREATE TABLE import_source."x 5" (c1 float8);
69096909
ALTER TABLE import_source."x 5" DROP COLUMN c1;
6910+
CREATE TABLE import_source.t4 (c1 int) PARTITION BY RANGE (c1);
6911+
CREATE TABLE import_source.t4_part PARTITION OF import_source.t4
6912+
FOR VALUES FROM (1) TO (100);
69106913
CREATE SCHEMA import_dest1;
69116914
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
69126915
\det+ import_dest1.*
@@ -6916,9 +6919,10 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
69166919
import_dest1 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
69176920
import_dest1 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
69186921
import_dest1 | t3 | loopback | (schema_name 'import_source', table_name 't3') |
6922+
import_dest1 | t4 | loopback | (schema_name 'import_source', table_name 't4') |
69196923
import_dest1 | x 4 | loopback | (schema_name 'import_source', table_name 'x 4') |
69206924
import_dest1 | x 5 | loopback | (schema_name 'import_source', table_name 'x 5') |
6921-
(5 rows)
6925+
(6 rows)
69226926

69236927
\d import_dest1.*
69246928
Foreign table "import_dest1.t1"
@@ -6946,6 +6950,13 @@ FDW Options: (schema_name 'import_source', table_name 't2')
69466950
Server: loopback
69476951
FDW Options: (schema_name 'import_source', table_name 't3')
69486952

6953+
Foreign table "import_dest1.t4"
6954+
Column | Type | Collation | Nullable | Default | FDW Options
6955+
--------+---------+-----------+----------+---------+--------------------
6956+
c1 | integer | | not null | | (column_name 'c1')
6957+
Server: loopback
6958+
FDW Options: (schema_name 'import_source', table_name 't4')
6959+
69496960
Foreign table "import_dest1.x 4"
69506961
Column | Type | Collation | Nullable | Default | FDW Options
69516962
--------+-----------------------+-----------+----------+---------+---------------------
@@ -6972,9 +6983,10 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2
69726983
import_dest2 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
69736984
import_dest2 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
69746985
import_dest2 | t3 | loopback | (schema_name 'import_source', table_name 't3') |
6986+
import_dest2 | t4 | loopback | (schema_name 'import_source', table_name 't4') |
69756987
import_dest2 | x 4 | loopback | (schema_name 'import_source', table_name 'x 4') |
69766988
import_dest2 | x 5 | loopback | (schema_name 'import_source', table_name 'x 5') |
6977-
(5 rows)
6989+
(6 rows)
69786990

69796991
\d import_dest2.*
69806992
Foreign table "import_dest2.t1"
@@ -7002,6 +7014,13 @@ FDW Options: (schema_name 'import_source', table_name 't2')
70027014
Server: loopback
70037015
FDW Options: (schema_name 'import_source', table_name 't3')
70047016

7017+
Foreign table "import_dest2.t4"
7018+
Column | Type | Collation | Nullable | Default | FDW Options
7019+
--------+---------+-----------+----------+---------+--------------------
7020+
c1 | integer | | not null | | (column_name 'c1')
7021+
Server: loopback
7022+
FDW Options: (schema_name 'import_source', table_name 't4')
7023+
70057024
Foreign table "import_dest2.x 4"
70067025
Column | Type | Collation | Nullable | Default | FDW Options
70077026
--------+-----------------------+-----------+----------+---------+---------------------
@@ -7027,9 +7046,10 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3
70277046
import_dest3 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
70287047
import_dest3 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
70297048
import_dest3 | t3 | loopback | (schema_name 'import_source', table_name 't3') |
7049+
import_dest3 | t4 | loopback | (schema_name 'import_source', table_name 't4') |
70307050
import_dest3 | x 4 | loopback | (schema_name 'import_source', table_name 'x 4') |
70317051
import_dest3 | x 5 | loopback | (schema_name 'import_source', table_name 'x 5') |
7032-
(5 rows)
7052+
(6 rows)
70337053

70347054
\d import_dest3.*
70357055
Foreign table "import_dest3.t1"
@@ -7057,6 +7077,13 @@ FDW Options: (schema_name 'import_source', table_name 't2')
70577077
Server: loopback
70587078
FDW Options: (schema_name 'import_source', table_name 't3')
70597079

7080+
Foreign table "import_dest3.t4"
7081+
Column | Type | Collation | Nullable | Default | FDW Options
7082+
--------+---------+-----------+----------+---------+--------------------
7083+
c1 | integer | | | | (column_name 'c1')
7084+
Server: loopback
7085+
FDW Options: (schema_name 'import_source', table_name 't4')
7086+
70607087
Foreign table "import_dest3.x 4"
70617088
Column | Type | Collation | Nullable | Default | FDW Options
70627089
--------+-----------------------+-----------+----------+---------+---------------------
@@ -7092,8 +7119,9 @@ IMPORT FOREIGN SCHEMA import_source EXCEPT (t1, "x 4", nonesuch)
70927119
import_dest4 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
70937120
import_dest4 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
70947121
import_dest4 | t3 | loopback | (schema_name 'import_source', table_name 't3') |
7122+
import_dest4 | t4 | loopback | (schema_name 'import_source', table_name 't4') |
70957123
import_dest4 | x 5 | loopback | (schema_name 'import_source', table_name 'x 5') |
7096-
(4 rows)
7124+
(5 rows)
70977125

70987126
-- Assorted error cases
70997127
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest4;

‎contrib/postgres_fdw/postgres_fdw.c‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3849,6 +3849,10 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
38493849
* should save a few cycles to not process excluded tables in the
38503850
* first place.)
38513851
*
3852+
* Ignore table data for partitions and only include the definitions
3853+
* of the root partitioned tables to allow access to the complete
3854+
* remote data set locally in the schema imported.
3855+
*
38523856
* Note: because we run the connection with search_path restricted to
38533857
* pg_catalog, the format_type() and pg_get_expr() outputs will always
38543858
* include a schema name for types/functions in other schemas, which
@@ -3897,10 +3901,15 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
38973901
CppAsString2(RELKIND_RELATION) ","
38983902
CppAsString2(RELKIND_VIEW) ","
38993903
CppAsString2(RELKIND_FOREIGN_TABLE) ","
3900-
CppAsString2(RELKIND_MATVIEW) ") "
3904+
CppAsString2(RELKIND_MATVIEW) ","
3905+
CppAsString2(RELKIND_PARTITIONED_TABLE) ") "
39013906
" AND n.nspname = ");
39023907
deparseStringLiteral(&buf, stmt->remote_schema);
39033908

3909+
/* Partitions are supported since Postgres 10 */
3910+
if (PQserverVersion(conn) >= 100000)
3911+
appendStringInfoString(&buf, " AND NOT c.relispartition ");
3912+
39043913
/* Apply restrictions for LIMIT TO and EXCEPT */
39053914
if (stmt->list_type == FDW_IMPORT_SCHEMA_LIMIT_TO ||
39063915
stmt->list_type == FDW_IMPORT_SCHEMA_EXCEPT)

‎contrib/postgres_fdw/sql/postgres_fdw.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,6 +1618,9 @@ CREATE TABLE import_source.t3 (c1 timestamptz default now(), c2 typ1);
16181618
CREATE TABLE import_source."x 4" (c1 float8, "C 2" text, c3 varchar(42));
16191619
CREATE TABLE import_source."x 5" (c1 float8);
16201620
ALTER TABLE import_source."x 5" DROP COLUMN c1;
1621+
CREATE TABLE import_source.t4 (c1 int) PARTITION BY RANGE (c1);
1622+
CREATE TABLE import_source.t4_part PARTITION OF import_source.t4
1623+
FOR VALUES FROM (1) TO (100);
16211624

16221625
CREATE SCHEMA import_dest1;
16231626
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;

‎doc/src/sgml/postgres-fdw.sgml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,16 @@
425425
For more detail about the treatment of <literal>CHECK</> constraints on
426426
foreign tables, see <xref linkend="sql-createforeigntable">.
427427
</para>
428+
429+
<para>
430+
Tables or foreign tables which are partitions of some other table are
431+
automatically excluded. Partitioned tables are imported, unless they
432+
are a partition of some other table. Since all data can be accessed
433+
through the partitioned table which is the root of the partitioning
434+
hierarchy, this approach should allow access to all the data without
435+
creating extra objects.
436+
</para>
437+
428438
</sect3>
429439
</sect2>
430440

0 commit comments

Comments
 (0)