postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-19 04:03:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in fix-pg_dump (pull request #48)

Browse Source 
Fix (and test) pg_dump of extension tables
This commit is contained in:
Matvey Arye 2017-01-24 15:18:59 +00:00
commit d2ba389c83
7 changed files with 126 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
extension/sql/common/tables.sql
View File

@ -13,6 +13,8 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.node (
active BOOLEAN NOT NULL DEFAULT TRUE,
id SERIAL NOT NULL UNIQUE -- id for node. used in naming
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.node', '');
SELECT pg_catalog.pg_extension_config_dump(pg_get_serial_sequence('_iobeamdb_catalog.node','id'), '');
-- Singleton (i.e. should only contain one row) holding info about meta db.
CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.meta (
@ -20,6 +22,7 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.meta (
hostname TEXT NOT NULL,
server_name NAME NOT NULL
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.meta', '');
CREATE UNIQUE INDEX there_can_be_only_one_meta
ON _iobeamdb_catalog.meta ((1));
@ -28,6 +31,7 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.cluster_user (
username TEXT NOT NULL PRIMARY KEY,
password TEXT NULL --not any more of a security hole than usual since stored in pg_user_mapping anyway
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.cluster_user', '');
-- The hypertable is an abstraction that represents a replicated table that is
-- partitioned on 2 dimensions: time and another (user-)chosen one.
@ -66,12 +70,14 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.hypertable (
UNIQUE (associated_schema_name, associated_table_prefix),
UNIQUE (root_schema_name, root_table_name)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.hypertable', '');
-- deleted_hypertable is used to avoid deadlocks when doing multinode drops.
CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.deleted_hypertable (
LIKE _iobeamdb_catalog.hypertable,
deleted_on NAME
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.deleted_hypertable', '');
-- hypertable_replica contains information on how a hypertable's data replicas
-- are stored. A replica of the data is across all partitions and time.
@ -95,6 +101,7 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.hypertable_replica (
PRIMARY KEY (hypertable_name, replica_id),
UNIQUE (schema_name, table_name)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.hypertable_replica', '');
-- Mapping that shows which replica is pointed to by the main table on
-- each node. The translation from main table to replica should happen
@ -107,6 +114,7 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.default_replica_node (
PRIMARY KEY (database_name, hypertable_name),
FOREIGN KEY (hypertable_name, replica_id) REFERENCES _iobeamdb_catalog.hypertable_replica (hypertable_name, replica_id)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.default_replica_node', '');
--there should be one distinct_replica_node for each node with a chunk from that replica
@ -126,6 +134,7 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.distinct_replica_node (
UNIQUE (schema_name, table_name),
FOREIGN KEY (hypertable_name, replica_id) REFERENCES _iobeamdb_catalog.hypertable_replica (hypertable_name, replica_id) ON DELETE CASCADE
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.distinct_replica_node', '');
-- A partition_epoch represents a different partitioning of the data.
-- It has a start and end time (data time). Data needs to be placed in the correct epoch by time.
@ -149,6 +158,8 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.partition_epoch (
UNIQUE (hypertable_name, end_time),
CHECK (start_time < end_time)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.partition_epoch', '');
SELECT pg_catalog.pg_extension_config_dump(pg_get_serial_sequence('_iobeamdb_catalog.partition_epoch','id'), '');
-- A partition defines a partition witin a partition_epoch.
-- For any partition the keyspace is defined as [keyspace_start, keyspace_end].
@ -162,6 +173,8 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.partition (
UNIQUE (epoch_id, keyspace_start),
CHECK (keyspace_end > keyspace_start)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.partition', '');
SELECT pg_catalog.pg_extension_config_dump(pg_get_serial_sequence('_iobeamdb_catalog.partition','id'), '');
--Represents a replica for a partition.
--Each row creates a table:
@ -179,6 +192,8 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.partition_replica (
UNIQUE (partition_id, replica_id),
FOREIGN KEY (hypertable_name, replica_id) REFERENCES _iobeamdb_catalog.hypertable_replica (hypertable_name, replica_id) ON DELETE CASCADE
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.partition_replica', '');
SELECT pg_catalog.pg_extension_config_dump(pg_get_serial_sequence('_iobeamdb_catalog.partition_replica','id'), '');
-- Represent a (replicated) chunk of data, which is data in a hypertable that is
-- both partitioned by both the partition_column and time.
@ -200,6 +215,8 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.chunk (
UNIQUE (partition_id, end_time),
CHECK (start_time <= end_time)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.chunk', '');
SELECT pg_catalog.pg_extension_config_dump(pg_get_serial_sequence('_iobeamdb_catalog.chunk','id'), '');
-- A mapping between chunks, partition_replica, and nodes representing where
-- actual data is stored. That is, a chunk_replica_node is a particular
@ -217,6 +234,7 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.chunk_replica_node (
UNIQUE (chunk_id, database_name), --no two chunk replicas on same node
UNIQUE (schema_name, table_name)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.chunk_replica_node', '');
-- Represents a hypertable column.
CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.hypertable_column (
@ -232,12 +250,14 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.hypertable_column (
PRIMARY KEY (hypertable_name, name),
UNIQUE(hypertable_name, attnum)
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.hypertable_column', '');
-- TODO(mat) - Description?
CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.deleted_hypertable_column (
LIKE _iobeamdb_catalog.hypertable_column,
deleted_on NAME
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.deleted_hypertable_column', '');
CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.hypertable_index (
hypertable_name NAME NOT NULL REFERENCES _iobeamdb_catalog.hypertable(name) ON DELETE CASCADE,
@ -248,9 +268,11 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.hypertable_index (
PRIMARY KEY (hypertable_name, main_index_name),
UNIQUE(main_schema_name, main_index_name) --globally unique since index names globally unique
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.hypertable_index', '');
-- TODO(mat) - Description?
CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.deleted_hypertable_index (
LIKE _iobeamdb_catalog.hypertable_index,
deleted_on NAME
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.deleted_hypertable_index', '');

4
extension/sql/main/tables.sql
View File

@ -1,4 +1,5 @@
CREATE SEQUENCE IF NOT EXISTS _iobeamdb_catalog.chunk_replica_node_index_name_prefix;
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.chunk_replica_node_index_name_prefix', '');
/*
Keeps track of indexes on local chunk_replica_nodes.
@ -14,3 +15,6 @@ CREATE TABLE IF NOT EXISTS _iobeamdb_catalog.chunk_replica_node_index (
FOREIGN KEY (schema_name, table_name) REFERENCES _iobeamdb_catalog.chunk_replica_node (schema_name, table_name),
FOREIGN KEY (main_schema_name, main_index_name) REFERENCES _iobeamdb_catalog.hypertable_index (main_schema_name, main_index_name) ON DELETE CASCADE
);
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.chunk_replica_node_index', '');

1
extension/sql/meta/ddl.sql
View File

@ -1,4 +1,5 @@
CREATE SEQUENCE IF NOT EXISTS _iobeamdb_catalog.default_hypertable_seq;
SELECT pg_catalog.pg_extension_config_dump('_iobeamdb_catalog.default_hypertable_seq', '');
-- Creates a hypertable.
CREATE OR REPLACE FUNCTION _meta.create_hypertable(

1
extension/sql/tests/regression/.gitignore vendored
View File

@ -1 +1,2 @@
actual/
dump/

56
extension/sql/tests/regression/expected/pg_dump.out Normal file
View File

@ -0,0 +1,56 @@
psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "dblink"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "postgres_fdw"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "hstore"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "dblink"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "postgres_fdw"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "hstore"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "dblink"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "postgres_fdw"
LOCATION: CreateExtensionInternal, extension.c:1441
psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "hstore"
LOCATION: CreateExtensionInternal, extension.c:1441
\c postgres
\! pg_dump -h localhost -U postgres -Fc Test1 > dump/Test1.sql
\! pg_dump -h localhost -U postgres -Fc test2 > dump/test2.sql
\! pg_dump -h localhost -U postgres -Fc meta > dump/meta.sql
\! dropdb -h localhost -U postgres Test1
\! dropdb -h localhost -U postgres test2
\! dropdb -h localhost -U postgres meta
\! pg_restore -h localhost -U postgres -d postgres -C dump/Test1.sql
\! pg_restore -h localhost -U postgres -d postgres -C dump/test2.sql
\! pg_restore -h localhost -U postgres -d postgres -C dump/meta.sql
\c test2
SELECT * FROM "testNs";
timeCustom | device_id | series_0 | series_1 | series_2 | series_bool
---------------------+-----------+----------+----------+----------+-------------
1257894000000000000 | dev1 | 1.5 | 1 | 2 | t
1257894000000000000 | dev1 | 1.5 | 2 | |
1257894000000001000 | dev1 | 2.5 | 3 | |
1257894001000000000 | dev1 | 3.5 | 4 | |
1257897600000000000 | dev1 | 4.5 | 5 | | f
1257894002000000000 | dev1 | 2.5 | 3 | |
1257987600000000000 | dev1 | 1.5 | 1 | |
1257987600000000000 | dev1 | 1.5 | 2 | |
1257894000000000000 | dev20 | 1.5 | 1 | |
1257894000000000000 | dev20 | 1.5 | 2 | |
(10 rows)
--query for the extension tables/sequences that will not be dumped by pg_dump (should be empty)
SELECT objid::regclass, *
FROM pg_catalog.pg_depend
WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND
refobjid = (select oid from pg_extension where extname='iobeamdb') AND
deptype = 'e' AND
classid='pg_catalog.pg_class'::pg_catalog.regclass
AND objid NOT IN (select unnest(extconfig) from pg_extension where extname='iobeamdb')
objid | classid | objid | objsubid | refclassid | refobjid | refobjsubid | deptype
-------+---------+-------+----------+------------+----------+-------------+---------
(0 rows)

40
extension/sql/tests/regression/pg_dump.sql Normal file
View File

@ -0,0 +1,40 @@
\set ON_ERROR_STOP 1
\set VERBOSITY verbose
\set SHOW_CONTEXT never
\o /dev/null
\ir include/insert.sql
\o
\set ECHO ALL
\c postgres
\! pg_dump -h localhost -U postgres -Fc Test1 > dump/Test1.sql
\! pg_dump -h localhost -U postgres -Fc test2 > dump/test2.sql
\! pg_dump -h localhost -U postgres -Fc meta > dump/meta.sql
\! dropdb -h localhost -U postgres Test1
\! dropdb -h localhost -U postgres test2
\! dropdb -h localhost -U postgres meta
\! pg_restore -h localhost -U postgres -d postgres -C dump/Test1.sql
\! pg_restore -h localhost -U postgres -d postgres -C dump/test2.sql
\! pg_restore -h localhost -U postgres -d postgres -C dump/meta.sql
\c test2
SELECT * FROM "testNs";
--query for the extension tables/sequences that will not be dumped by pg_dump (should be empty)
SELECT objid::regclass, *
FROM pg_catalog.pg_depend
WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND
refobjid = (select oid from pg_extension where extname='iobeamdb') AND
deptype = 'e' AND
classid='pg_catalog.pg_class'::pg_catalog.regclass
AND objid NOT IN (select unnest(extconfig) from pg_extension where extname='iobeamdb')

2
extension/sql/tests/regression/run.sh
View File

@ -23,6 +23,8 @@ golden_test() {
mkdir -p actual
rm -fr actual/*
mkdir -p dump
rm -fr dump/*
if [ "$#" -ne 0 ]; then