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

Fix psql-dependent mx-ddl test

pull/1439/head
Jason Petersen 2017-06-04 23:03:22 -06:00
parent b031ac4bef
commit f147c7a539
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
2 changed files with 135 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/test/regress/expected/multi_mx_ddl.out
View File

@ -30,67 +30,112 @@ SELECT master_modify_multiple_shards('UPDATE mx_ddl_table SET version=0.1 WHERE
-- SET NOT NULL -- SET NOT NULL
ALTER TABLE mx_ddl_table ALTER COLUMN version SET NOT NULL; ALTER TABLE mx_ddl_table ALTER COLUMN version SET NOT NULL;
-- See that the changes are applied on coordinator, worker tables and shards -- See that the changes are applied on coordinator, worker tables and shards
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
Table "public.mx_ddl_table"
Column | Type | Modifiers Column | Type | Modifiers
---------+---------+-------------------- ---------+---------+--------------------
key | integer | not null key | integer | not null
value | integer | value | integer |
version | integer | not null default 1 version | integer | not null default 1
Indexes: (3 rows)
"mx_ddl_table_pkey" PRIMARY KEY, btree (key)
"ddl_test_concurrent_index" btree (value) \d ddl_test*_index
"ddl_test_index" btree (value) Index "public.ddl_test_concurrent_index"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table"
Index "public.ddl_test_index"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table"
\c - - - :worker_1_port \c - - - :worker_1_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
Table "public.mx_ddl_table"
Column | Type | Modifiers Column | Type | Modifiers
---------+---------+-------------------- ---------+---------+--------------------
key | integer | not null key | integer | not null
value | integer | value | integer |
version | integer | not null default 1 version | integer | not null default 1
Indexes: (3 rows)
"mx_ddl_table_pkey" PRIMARY KEY, btree (key)
"ddl_test_concurrent_index" btree (value)
"ddl_test_index" btree (value)
\d mx_ddl_table_1220088 \d ddl_test*_index
Table "public.mx_ddl_table_1220088" Index "public.ddl_test_concurrent_index"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table"
Index "public.ddl_test_index"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table"
SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220088'::regclass;
Column | Type | Modifiers Column | Type | Modifiers
---------+---------+-------------------- ---------+---------+--------------------
key | integer | not null key | integer | not null
value | integer | value | integer |
version | integer | not null default 1 version | integer | not null default 1
Indexes: (3 rows)
"mx_ddl_table_pkey_1220088" PRIMARY KEY, btree (key)
"ddl_test_concurrent_index_1220088" btree (value) \d ddl_test*_index_1220088
"ddl_test_index_1220088" btree (value) Index "public.ddl_test_concurrent_index_1220088"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table_1220088"
Index "public.ddl_test_index_1220088"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table_1220088"
\c - - - :worker_2_port \c - - - :worker_2_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
Table "public.mx_ddl_table"
Column | Type | Modifiers Column | Type | Modifiers
---------+---------+-------------------- ---------+---------+--------------------
key | integer | not null key | integer | not null
value | integer | value | integer |
version | integer | not null default 1 version | integer | not null default 1
Indexes: (3 rows)
"mx_ddl_table_pkey" PRIMARY KEY, btree (key)
"ddl_test_concurrent_index" btree (value)
"ddl_test_index" btree (value)
\d mx_ddl_table_1220089 \d ddl_test*_index
Table "public.mx_ddl_table_1220089" Index "public.ddl_test_concurrent_index"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table"
Index "public.ddl_test_index"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table"
SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220089'::regclass;
Column | Type | Modifiers Column | Type | Modifiers
---------+---------+-------------------- ---------+---------+--------------------
key | integer | not null key | integer | not null
value | integer | value | integer |
version | integer | not null default 1 version | integer | not null default 1
Indexes: (3 rows)
"mx_ddl_table_pkey_1220089" PRIMARY KEY, btree (key)
"ddl_test_concurrent_index_1220089" btree (value) \d ddl_test*_index_1220089
"ddl_test_index_1220089" btree (value) Index "public.ddl_test_concurrent_index_1220089"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table_1220089"
Index "public.ddl_test_index_1220089"
Column | Type | Definition
--------+---------+------------
value | integer | value
btree, for table "public.mx_ddl_table_1220089"
INSERT INTO mx_ddl_table VALUES (37, 78, 2); INSERT INTO mx_ddl_table VALUES (37, 78, 2);
INSERT INTO mx_ddl_table VALUES (38, 78); INSERT INTO mx_ddl_table VALUES (38, 78);
@ -132,52 +177,72 @@ ALTER TABLE mx_ddl_table ALTER COLUMN version DROP NOT NULL;
-- DROP COLUMN -- DROP COLUMN
ALTER TABLE mx_ddl_table DROP COLUMN version; ALTER TABLE mx_ddl_table DROP COLUMN version;
-- See that the changes are applied on coordinator, worker tables and shards -- See that the changes are applied on coordinator, worker tables and shards
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
Table "public.mx_ddl_table"
Column | Type | Modifiers Column | Type | Modifiers
--------+---------+----------- --------+---------+-----------
key | integer | not null key | integer | not null
value | integer | value | integer |
Indexes: (2 rows)
"mx_ddl_table_pkey" PRIMARY KEY, btree (key)
\di ddl_test*_index
List of relations
Schema | Name | Type | Owner | Table
--------+------+------+-------+-------
(0 rows)
\c - - - :worker_1_port \c - - - :worker_1_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
Table "public.mx_ddl_table"
Column | Type | Modifiers Column | Type | Modifiers
--------+---------+----------- --------+---------+-----------
key | integer | not null key | integer | not null
value | integer | value | integer |
Indexes: (2 rows)
"mx_ddl_table_pkey" PRIMARY KEY, btree (key)
\d mx_ddl_table_1220088 \di ddl_test*_index
Table "public.mx_ddl_table_1220088" List of relations
Schema | Name | Type | Owner | Table
--------+------+------+-------+-------
(0 rows)
SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220088'::regclass;
Column | Type | Modifiers Column | Type | Modifiers
--------+---------+----------- --------+---------+-----------
key | integer | not null key | integer | not null
value | integer | value | integer |
Indexes: (2 rows)
"mx_ddl_table_pkey_1220088" PRIMARY KEY, btree (key)
\di ddl_test*_index_1220088
List of relations
Schema | Name | Type | Owner | Table
--------+------+------+-------+-------
(0 rows)
\c - - - :worker_2_port \c - - - :worker_2_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
Table "public.mx_ddl_table"
Column | Type | Modifiers Column | Type | Modifiers
--------+---------+----------- --------+---------+-----------
key | integer | not null key | integer | not null
value | integer | value | integer |
Indexes: (2 rows)
"mx_ddl_table_pkey" PRIMARY KEY, btree (key)
\d mx_ddl_table_1220089 \di ddl_test*_index
Table "public.mx_ddl_table_1220089" List of relations
Schema | Name | Type | Owner | Table
--------+------+------+-------+-------
(0 rows)
SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220089'::regclass;
Column | Type | Modifiers Column | Type | Modifiers
--------+---------+----------- --------+---------+-----------
key | integer | not null key | integer | not null
value | integer | value | integer |
Indexes: (2 rows)
"mx_ddl_table_pkey_1220089" PRIMARY KEY, btree (key)
\di ddl_test*_index_1220089
List of relations
Schema | Name | Type | Owner | Table
--------+------+------+-------+-------
(0 rows)
-- Show that DDL commands are done within a two-phase commit transaction -- Show that DDL commands are done within a two-phase commit transaction
\c - - - :master_port \c - - - :master_port

34
src/test/regress/sql/multi_mx_ddl.sql
View File

@ -20,19 +20,22 @@ ALTER TABLE mx_ddl_table ALTER COLUMN version SET NOT NULL;
-- See that the changes are applied on coordinator, worker tables and shards -- See that the changes are applied on coordinator, worker tables and shards
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
\d ddl_test*_index
\c - - - :worker_1_port \c - - - :worker_1_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
\d ddl_test*_index
\d mx_ddl_table_1220088 SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220088'::regclass;
\d ddl_test*_index_1220088
\c - - - :worker_2_port \c - - - :worker_2_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
\d ddl_test*_index
\d mx_ddl_table_1220089 SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220089'::regclass;
\d ddl_test*_index_1220089
INSERT INTO mx_ddl_table VALUES (37, 78, 2); INSERT INTO mx_ddl_table VALUES (37, 78, 2);
INSERT INTO mx_ddl_table VALUES (38, 78); INSERT INTO mx_ddl_table VALUES (38, 78);
@ -68,19 +71,22 @@ ALTER TABLE mx_ddl_table DROP COLUMN version;
-- See that the changes are applied on coordinator, worker tables and shards -- See that the changes are applied on coordinator, worker tables and shards
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
\di ddl_test*_index
\c - - - :worker_1_port \c - - - :worker_1_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
\di ddl_test*_index
\d mx_ddl_table_1220088 SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220088'::regclass;
\di ddl_test*_index_1220088
\c - - - :worker_2_port \c - - - :worker_2_port
\d mx_ddl_table SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table'::regclass;
\di ddl_test*_index
\d mx_ddl_table_1220089 SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='mx_ddl_table_1220089'::regclass;
\di ddl_test*_index_1220089
-- Show that DDL commands are done within a two-phase commit transaction -- Show that DDL commands are done within a two-phase commit transaction
\c - - - :master_port \c - - - :master_port