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

multi_colocation_utils: sort by nodeport, not placementid 

multi_copy: replace smgr with aclitem, smgr is removed in pg12
pull/2852/head
Philip Dubé 2019-07-24 19:02:43 +00:00
parent c471d9680c
commit 0e233c63a3
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/test/regress/expected/multi_colocation_utils.out
View File

@ -716,7 +716,7 @@ ORDER BY
logicalrelid, logicalrelid,
shardmaxvalue::integer, shardmaxvalue::integer,
shardid, shardid,
placementid; nodeport;
logicalrelid | shardid | shardstorage | nodeport | shardminvalue | shardmaxvalue logicalrelid | shardid | shardstorage | nodeport | shardminvalue | shardmaxvalue
----------------------------------+---------+--------------+----------+---------------+--------------- ----------------------------------+---------+--------------+----------+---------------+---------------
table1_groupb | 1300026 | t | 57637 | -2147483648 | -1 table1_groupb | 1300026 | t | 57637 | -2147483648 | -1
@ -725,102 +725,102 @@ ORDER BY
table2_groupb | 1300029 | t | 57638 | 0 | 2147483647 table2_groupb | 1300029 | t | 57638 | 0 | 2147483647
table1_groupc | 1300030 | t | 57637 | -2147483648 | -1 table1_groupc | 1300030 | t | 57637 | -2147483648 | -1
table1_groupc | 1300030 | t | 57638 | -2147483648 | -1 table1_groupc | 1300030 | t | 57638 | -2147483648 | -1
table1_groupc | 1300031 | t | 57638 | 0 | 2147483647
table1_groupc | 1300031 | t | 57637 | 0 | 2147483647 table1_groupc | 1300031 | t | 57637 | 0 | 2147483647
table2_groupc | 1300032 | t | 57638 | -2147483648 | -1 table1_groupc | 1300031 | t | 57638 | 0 | 2147483647
table2_groupc | 1300032 | t | 57637 | -2147483648 | -1 table2_groupc | 1300032 | t | 57637 | -2147483648 | -1
table2_groupc | 1300032 | t | 57638 | -2147483648 | -1
table2_groupc | 1300033 | t | 57637 | 0 | 2147483647 table2_groupc | 1300033 | t | 57637 | 0 | 2147483647
table2_groupc | 1300033 | t | 57638 | 0 | 2147483647 table2_groupc | 1300033 | t | 57638 | 0 | 2147483647
table1_groupd | 1300034 | t | 57637 | -2147483648 | -1610612737 table1_groupd | 1300034 | t | 57637 | -2147483648 | -1610612737
table1_groupd | 1300034 | t | 57638 | -2147483648 | -1610612737 table1_groupd | 1300034 | t | 57638 | -2147483648 | -1610612737
table1_groupd | 1300035 | t | 57638 | -1610612736 | -1073741825
table1_groupd | 1300035 | t | 57637 | -1610612736 | -1073741825 table1_groupd | 1300035 | t | 57637 | -1610612736 | -1073741825
table1_groupd | 1300035 | t | 57638 | -1610612736 | -1073741825
table1_groupd | 1300036 | t | 57637 | -1073741824 | -536870913 table1_groupd | 1300036 | t | 57637 | -1073741824 | -536870913
table1_groupd | 1300036 | t | 57638 | -1073741824 | -536870913 table1_groupd | 1300036 | t | 57638 | -1073741824 | -536870913
table1_groupd | 1300037 | t | 57638 | -536870912 | -1
table1_groupd | 1300037 | t | 57637 | -536870912 | -1 table1_groupd | 1300037 | t | 57637 | -536870912 | -1
table1_groupd | 1300037 | t | 57638 | -536870912 | -1
table1_groupd | 1300038 | t | 57637 | 0 | 536870911 table1_groupd | 1300038 | t | 57637 | 0 | 536870911
table1_groupd | 1300038 | t | 57638 | 0 | 536870911 table1_groupd | 1300038 | t | 57638 | 0 | 536870911
table1_groupd | 1300039 | t | 57638 | 536870912 | 1073741823
table1_groupd | 1300039 | t | 57637 | 536870912 | 1073741823 table1_groupd | 1300039 | t | 57637 | 536870912 | 1073741823
table1_groupd | 1300039 | t | 57638 | 536870912 | 1073741823
table1_groupd | 1300040 | t | 57637 | 1073741824 | 1610612735 table1_groupd | 1300040 | t | 57637 | 1073741824 | 1610612735
table1_groupd | 1300040 | t | 57638 | 1073741824 | 1610612735 table1_groupd | 1300040 | t | 57638 | 1073741824 | 1610612735
table1_groupd | 1300041 | t | 57638 | 1610612736 | 2147483647
table1_groupd | 1300041 | t | 57637 | 1610612736 | 2147483647 table1_groupd | 1300041 | t | 57637 | 1610612736 | 2147483647
table2_groupd | 1300042 | t | 57638 | -2147483648 | -1610612737 table1_groupd | 1300041 | t | 57638 | 1610612736 | 2147483647
table2_groupd | 1300042 | t | 57637 | -2147483648 | -1610612737 table2_groupd | 1300042 | t | 57637 | -2147483648 | -1610612737
table2_groupd | 1300042 | t | 57638 | -2147483648 | -1610612737
table2_groupd | 1300043 | t | 57637 | -1610612736 | -1073741825 table2_groupd | 1300043 | t | 57637 | -1610612736 | -1073741825
table2_groupd | 1300043 | t | 57638 | -1610612736 | -1073741825 table2_groupd | 1300043 | t | 57638 | -1610612736 | -1073741825
table2_groupd | 1300044 | t | 57638 | -1073741824 | -536870913
table2_groupd | 1300044 | t | 57637 | -1073741824 | -536870913 table2_groupd | 1300044 | t | 57637 | -1073741824 | -536870913
table2_groupd | 1300044 | t | 57638 | -1073741824 | -536870913
table2_groupd | 1300045 | t | 57637 | -536870912 | -1 table2_groupd | 1300045 | t | 57637 | -536870912 | -1
table2_groupd | 1300045 | t | 57638 | -536870912 | -1 table2_groupd | 1300045 | t | 57638 | -536870912 | -1
table2_groupd | 1300046 | t | 57638 | 0 | 536870911
table2_groupd | 1300046 | t | 57637 | 0 | 536870911 table2_groupd | 1300046 | t | 57637 | 0 | 536870911
table2_groupd | 1300046 | t | 57638 | 0 | 536870911
table2_groupd | 1300047 | t | 57637 | 536870912 | 1073741823 table2_groupd | 1300047 | t | 57637 | 536870912 | 1073741823
table2_groupd | 1300047 | t | 57638 | 536870912 | 1073741823 table2_groupd | 1300047 | t | 57638 | 536870912 | 1073741823
table2_groupd | 1300048 | t | 57638 | 1073741824 | 1610612735
table2_groupd | 1300048 | t | 57637 | 1073741824 | 1610612735 table2_groupd | 1300048 | t | 57637 | 1073741824 | 1610612735
table2_groupd | 1300048 | t | 57638 | 1073741824 | 1610612735
table2_groupd | 1300049 | t | 57637 | 1610612736 | 2147483647 table2_groupd | 1300049 | t | 57637 | 1610612736 | 2147483647
table2_groupd | 1300049 | t | 57638 | 1610612736 | 2147483647 table2_groupd | 1300049 | t | 57638 | 1610612736 | 2147483647
table3_groupd | 1300050 | f | 57637 | -2147483648 | -1610612737 table3_groupd | 1300050 | f | 57637 | -2147483648 | -1610612737
table3_groupd | 1300050 | f | 57638 | -2147483648 | -1610612737 table3_groupd | 1300050 | f | 57638 | -2147483648 | -1610612737
table3_groupd | 1300051 | f | 57638 | -1610612736 | -1073741825
table3_groupd | 1300051 | f | 57637 | -1610612736 | -1073741825 table3_groupd | 1300051 | f | 57637 | -1610612736 | -1073741825
table3_groupd | 1300051 | f | 57638 | -1610612736 | -1073741825
table3_groupd | 1300052 | f | 57637 | -1073741824 | -536870913 table3_groupd | 1300052 | f | 57637 | -1073741824 | -536870913
table3_groupd | 1300052 | f | 57638 | -1073741824 | -536870913 table3_groupd | 1300052 | f | 57638 | -1073741824 | -536870913
table3_groupd | 1300053 | f | 57638 | -536870912 | -1
table3_groupd | 1300053 | f | 57637 | -536870912 | -1 table3_groupd | 1300053 | f | 57637 | -536870912 | -1
table3_groupd | 1300053 | f | 57638 | -536870912 | -1
table3_groupd | 1300054 | f | 57637 | 0 | 536870911 table3_groupd | 1300054 | f | 57637 | 0 | 536870911
table3_groupd | 1300054 | f | 57638 | 0 | 536870911 table3_groupd | 1300054 | f | 57638 | 0 | 536870911
table3_groupd | 1300055 | f | 57638 | 536870912 | 1073741823
table3_groupd | 1300055 | f | 57637 | 536870912 | 1073741823 table3_groupd | 1300055 | f | 57637 | 536870912 | 1073741823
table3_groupd | 1300055 | f | 57638 | 536870912 | 1073741823
table3_groupd | 1300056 | f | 57637 | 1073741824 | 1610612735 table3_groupd | 1300056 | f | 57637 | 1073741824 | 1610612735
table3_groupd | 1300056 | f | 57638 | 1073741824 | 1610612735 table3_groupd | 1300056 | f | 57638 | 1073741824 | 1610612735
table3_groupd | 1300057 | f | 57638 | 1610612736 | 2147483647
table3_groupd | 1300057 | f | 57637 | 1610612736 | 2147483647 table3_groupd | 1300057 | f | 57637 | 1610612736 | 2147483647
table3_groupd | 1300057 | f | 57638 | 1610612736 | 2147483647
table1_groupe | 1300058 | t | 57637 | -2147483648 | -1 table1_groupe | 1300058 | t | 57637 | -2147483648 | -1
table1_groupe | 1300058 | t | 57638 | -2147483648 | -1 table1_groupe | 1300058 | t | 57638 | -2147483648 | -1
table1_groupe | 1300059 | t | 57638 | 0 | 2147483647
table1_groupe | 1300059 | t | 57637 | 0 | 2147483647 table1_groupe | 1300059 | t | 57637 | 0 | 2147483647
table2_groupe | 1300060 | t | 57638 | -2147483648 | -1 table1_groupe | 1300059 | t | 57638 | 0 | 2147483647
table2_groupe | 1300060 | t | 57637 | -2147483648 | -1 table2_groupe | 1300060 | t | 57637 | -2147483648 | -1
table2_groupe | 1300060 | t | 57638 | -2147483648 | -1
table2_groupe | 1300061 | t | 57637 | 0 | 2147483647 table2_groupe | 1300061 | t | 57637 | 0 | 2147483647
table2_groupe | 1300061 | t | 57638 | 0 | 2147483647 table2_groupe | 1300061 | t | 57638 | 0 | 2147483647
table3_groupe | 1300062 | t | 57637 | -2147483648 | -1 table3_groupe | 1300062 | t | 57637 | -2147483648 | -1
table3_groupe | 1300062 | t | 57638 | -2147483648 | -1 table3_groupe | 1300062 | t | 57638 | -2147483648 | -1
table3_groupe | 1300063 | t | 57638 | 0 | 2147483647
table3_groupe | 1300063 | t | 57637 | 0 | 2147483647 table3_groupe | 1300063 | t | 57637 | 0 | 2147483647
schema_collocation.table4_groupe | 1300064 | t | 57638 | -2147483648 | -1 table3_groupe | 1300063 | t | 57638 | 0 | 2147483647
schema_collocation.table4_groupe | 1300064 | t | 57637 | -2147483648 | -1 schema_collocation.table4_groupe | 1300064 | t | 57637 | -2147483648 | -1
schema_collocation.table4_groupe | 1300064 | t | 57638 | -2147483648 | -1
schema_collocation.table4_groupe | 1300065 | t | 57637 | 0 | 2147483647 schema_collocation.table4_groupe | 1300065 | t | 57637 | 0 | 2147483647
schema_collocation.table4_groupe | 1300065 | t | 57638 | 0 | 2147483647 schema_collocation.table4_groupe | 1300065 | t | 57638 | 0 | 2147483647
table1_group_none_1 | 1300066 | t | 57637 | -2147483648 | -1 table1_group_none_1 | 1300066 | t | 57637 | -2147483648 | -1
table1_group_none_1 | 1300066 | t | 57638 | -2147483648 | -1 table1_group_none_1 | 1300066 | t | 57638 | -2147483648 | -1
table1_group_none_1 | 1300067 | t | 57638 | 0 | 2147483647
table1_group_none_1 | 1300067 | t | 57637 | 0 | 2147483647 table1_group_none_1 | 1300067 | t | 57637 | 0 | 2147483647
table2_group_none_1 | 1300068 | t | 57638 | -2147483648 | -1 table1_group_none_1 | 1300067 | t | 57638 | 0 | 2147483647
table2_group_none_1 | 1300068 | t | 57637 | -2147483648 | -1 table2_group_none_1 | 1300068 | t | 57637 | -2147483648 | -1
table2_group_none_1 | 1300068 | t | 57638 | -2147483648 | -1
table2_group_none_1 | 1300069 | t | 57637 | 0 | 2147483647 table2_group_none_1 | 1300069 | t | 57637 | 0 | 2147483647
table2_group_none_1 | 1300069 | t | 57638 | 0 | 2147483647 table2_group_none_1 | 1300069 | t | 57638 | 0 | 2147483647
table1_group_none_2 | 1300070 | t | 57637 | -2147483648 | -1 table1_group_none_2 | 1300070 | t | 57637 | -2147483648 | -1
table1_group_none_2 | 1300070 | t | 57638 | -2147483648 | -1 table1_group_none_2 | 1300070 | t | 57638 | -2147483648 | -1
table1_group_none_2 | 1300071 | t | 57638 | 0 | 2147483647
table1_group_none_2 | 1300071 | t | 57637 | 0 | 2147483647 table1_group_none_2 | 1300071 | t | 57637 | 0 | 2147483647
table1_group_none_2 | 1300071 | t | 57638 | 0 | 2147483647
table4_groupe | 1300072 | t | 57637 | -2147483648 | -1 table4_groupe | 1300072 | t | 57637 | -2147483648 | -1
table4_groupe | 1300072 | t | 57638 | -2147483648 | -1 table4_groupe | 1300072 | t | 57638 | -2147483648 | -1
table4_groupe | 1300073 | t | 57638 | 0 | 2147483647
table4_groupe | 1300073 | t | 57637 | 0 | 2147483647 table4_groupe | 1300073 | t | 57637 | 0 | 2147483647
table4_groupe | 1300073 | t | 57638 | 0 | 2147483647
table1_group_none_3 | 1300074 | t | 57637 | -2147483648 | -715827884 table1_group_none_3 | 1300074 | t | 57637 | -2147483648 | -715827884
table1_group_none_3 | 1300074 | t | 57638 | -2147483648 | -715827884 table1_group_none_3 | 1300074 | t | 57638 | -2147483648 | -715827884
table1_group_none_3 | 1300075 | t | 57638 | -715827883 | 715827881
table1_group_none_3 | 1300075 | t | 57637 | -715827883 | 715827881 table1_group_none_3 | 1300075 | t | 57637 | -715827883 | 715827881
table1_group_none_3 | 1300075 | t | 57638 | -715827883 | 715827881
table1_group_none_3 | 1300076 | t | 57637 | 715827882 | 2147483647 table1_group_none_3 | 1300076 | t | 57637 | 715827882 | 2147483647
table1_group_none_3 | 1300076 | t | 57638 | 715827882 | 2147483647 table1_group_none_3 | 1300076 | t | 57638 | 715827882 | 2147483647
table1_group_default | 1300077 | t | 57637 | -2147483648 | -715827884 table1_group_default | 1300077 | t | 57637 | -2147483648 | -715827884
table1_group_default | 1300077 | t | 57638 | -2147483648 | -715827884 table1_group_default | 1300077 | t | 57638 | -2147483648 | -715827884
table1_group_default | 1300078 | t | 57638 | -715827883 | 715827881
table1_group_default | 1300078 | t | 57637 | -715827883 | 715827881 table1_group_default | 1300078 | t | 57637 | -715827883 | 715827881
table1_group_default | 1300078 | t | 57638 | -715827883 | 715827881
table1_group_default | 1300079 | t | 57637 | 715827882 | 2147483647 table1_group_default | 1300079 | t | 57637 | 715827882 | 2147483647
table1_group_default | 1300079 | t | 57638 | 715827882 | 2147483647 table1_group_default | 1300079 | t | 57638 | 715827882 | 2147483647
table1_groupf | 1300080 | t | 57637 | | table1_groupf | 1300080 | t | 57637 | |

14
src/test/regress/input/multi_copy.source
View File

@ -755,20 +755,20 @@ SELECT * FROM run_command_on_workers('DROP USER test_user');
DROP USER test_user; DROP USER test_user;
-- Test copy with built-in type without binary output function -- Test copy with built-in type without binary output function
CREATE TABLE test_smgr ( CREATE TABLE test_binaryless_builtin (
col1 smgr NOT NULL, col1 aclitem NOT NULL,
col2 character varying(255) NOT NULL col2 character varying(255) NOT NULL
); );
SELECT create_reference_table('test_smgr'); SELECT create_reference_table('test_binaryless_builtin');
\COPY test_smgr FROM STDIN WITH (format CSV) \COPY test_binaryless_builtin FROM STDIN WITH (format CSV)
magnetic disk, test user postgres=r/postgres, test
\. \.
SELECT * FROM test_smgr; SELECT * FROM test_binaryless_builtin;
DROP TABLE test_smgr; DROP TABLE test_binaryless_builtin;
-- Test drop table with copy in the same transaction -- Test drop table with copy in the same transaction
BEGIN; BEGIN;

16
src/test/regress/output/multi_copy.source
View File

@ -1017,24 +1017,24 @@ SELECT * FROM run_command_on_workers('DROP USER test_user');
DROP USER test_user; DROP USER test_user;
-- Test copy with built-in type without binary output function -- Test copy with built-in type without binary output function
CREATE TABLE test_smgr ( CREATE TABLE test_binaryless_builtin (
col1 smgr NOT NULL, col1 aclitem NOT NULL,
col2 character varying(255) NOT NULL col2 character varying(255) NOT NULL
); );
SELECT create_reference_table('test_smgr'); SELECT create_reference_table('test_binaryless_builtin');
create_reference_table create_reference_table
------------------------ ------------------------
(1 row) (1 row)
\COPY test_smgr FROM STDIN WITH (format CSV) \COPY test_binaryless_builtin FROM STDIN WITH (format CSV)
SELECT * FROM test_smgr; SELECT * FROM test_binaryless_builtin;
col1 | col2 col1 | col2
---------------+------- ---------------------+-------
magnetic disk | test postgres=r/postgres | test
(1 row) (1 row)
DROP TABLE test_smgr; DROP TABLE test_binaryless_builtin;
-- Test drop table with copy in the same transaction -- Test drop table with copy in the same transaction
BEGIN; BEGIN;
CREATE TABLE tt1(id int); CREATE TABLE tt1(id int);

2
src/test/regress/sql/multi_colocation_utils.sql
View File

@ -339,7 +339,7 @@ ORDER BY
logicalrelid, logicalrelid,
shardmaxvalue::integer, shardmaxvalue::integer,
shardid, shardid,
placementid; nodeport;
-- reset colocation ids to test mark_tables_colocated -- reset colocation ids to test mark_tables_colocated
ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1;