From 2d7dcf52b41800f6f1ab512c34e401aea197dfad Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Wed, 8 Jul 2009 18:09:04 +0300 Subject: [PATCH] sql/londiste: refresh regtests for table_attrs --- sql/londiste/expected/londiste_merge.out | 78 +++++++++---------- sql/londiste/expected/londiste_provider.out | 27 +++++-- sql/londiste/expected/londiste_seqs.out | 12 +-- sql/londiste/expected/londiste_subscriber.out | 25 ++++-- 4 files changed, 85 insertions(+), 57 deletions(-) diff --git a/sql/londiste/expected/londiste_merge.out b/sql/londiste/expected/londiste_merge.out index 0f9114a1..39892e32 100644 --- a/sql/londiste/expected/londiste_merge.out +++ b/sql/londiste/expected/londiste_merge.out @@ -86,21 +86,21 @@ select * from londiste.local_add_table('part2_set', 'tblmerge'); (1 row) select * from londiste.get_table_list('part1_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | | | | | (1 row) select * from londiste.get_table_list('part2_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | | | | | (1 row) select * from londiste.get_table_list('combined_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | ok | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | ok | | | | (1 row) select * from londiste.local_set_table_state('part1_set', 'public.tblmerge', null, 'in-copy'); @@ -116,15 +116,15 @@ select * from londiste.local_set_table_state('part2_set', 'public.tblmerge', nul (1 row) select * from londiste.get_table_list('part1_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | in-copy | | | | lead + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | in-copy | | | | lead (1 row) select * from londiste.get_table_list('part2_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | in-copy | | | | wait-copy + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | in-copy | | | | wait-copy (1 row) select * from londiste.local_set_table_struct('part1_set', 'public.tblmerge', 'create index;'); @@ -134,15 +134,15 @@ select * from londiste.local_set_table_struct('part1_set', 'public.tblmerge', 'c (1 row) select * from londiste.get_table_list('part1_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+---------------+----------- - public.tblmerge | t | in-copy | | | create index; | lead + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+---------------+----------- + public.tblmerge | t | in-copy | | | create index; | lead (1 row) select * from londiste.get_table_list('part2_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+------------- - public.tblmerge | t | in-copy | | | | wait-replay + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+------------- + public.tblmerge | t | in-copy | | | | wait-replay (1 row) select * from londiste.local_set_table_state('part1_set', 'public.tblmerge', null, 'in-copy'); @@ -158,15 +158,15 @@ select * from londiste.local_set_table_state('part2_set', 'public.tblmerge', nul (1 row) select * from londiste.get_table_list('part1_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+---------------+----------- - public.tblmerge | t | in-copy | | | create index; | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+---------------+----------- + public.tblmerge | t | in-copy | | | create index; | (1 row) select * from londiste.get_table_list('part2_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+------------- - public.tblmerge | t | catching-up | | | | wait-replay + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+------------- + public.tblmerge | t | catching-up | | | | wait-replay (1 row) select * from londiste.local_set_table_struct('part1_set', 'public.tblmerge', null); @@ -176,15 +176,15 @@ select * from londiste.local_set_table_struct('part1_set', 'public.tblmerge', nu (1 row) select * from londiste.get_table_list('part1_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | in-copy | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | in-copy | | | | (1 row) select * from londiste.get_table_list('part2_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+------------- - public.tblmerge | t | catching-up | | | | wait-replay + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+------------- + public.tblmerge | t | catching-up | | | | wait-replay (1 row) select * from londiste.local_set_table_state('part1_set', 'public.tblmerge', null, 'catching-up'); @@ -200,14 +200,14 @@ select * from londiste.local_set_table_state('part2_set', 'public.tblmerge', nul (1 row) select * from londiste.get_table_list('part1_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | catching-up | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | catching-up | | | | (1 row) select * from londiste.get_table_list('part2_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.tblmerge | t | catching-up | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.tblmerge | t | catching-up | | | | (1 row) diff --git a/sql/londiste/expected/londiste_provider.out b/sql/londiste/expected/londiste_provider.out index 600403a5..840d650a 100644 --- a/sql/londiste/expected/londiste_provider.out +++ b/sql/londiste/expected/londiste_provider.out @@ -43,11 +43,19 @@ select * from londiste.local_add_table('aset', 'public.testdata'); insert into testdata (data) values ('test-data'); select * from londiste.get_table_list('aset'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role ------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.testdata | t | ok | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +-----------------+-------+-------------+-----------------+-------------+-------------+----------- + public.testdata | t | ok | | | | (1 row) +select * from londiste.local_show_missing('aset'); + obj_kind | obj_name +----------+----------------------------- + S | public.testdata_id_seq + S | public.testdata_nopk_id_seq + r | public.testdata_nopk +(3 rows) + select * from londiste.local_remove_table('aset', 'public.testdata'); ret_code | ret_note ----------+-------------------------------- @@ -61,8 +69,8 @@ select * from londiste.local_remove_table('aset', 'public.testdata'); (1 row) select * from londiste.get_table_list('aset'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role -------------+-------+-------------+-----------------+---------------+-------------+----------- + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +------------+-------+-------------+-----------------+-------------+-------------+----------- (0 rows) select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template; @@ -73,3 +81,12 @@ select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template; 3 | londiste.remove-table | public.testdata | (3 rows) +select * from londiste.local_show_missing('aset'); + obj_kind | obj_name +----------+----------------------------- + S | public.testdata_id_seq + S | public.testdata_nopk_id_seq + r | public.testdata + r | public.testdata_nopk +(4 rows) + diff --git a/sql/londiste/expected/londiste_seqs.out b/sql/londiste/expected/londiste_seqs.out index c53461ae..365cde2f 100644 --- a/sql/londiste/expected/londiste_seqs.out +++ b/sql/londiste/expected/londiste_seqs.out @@ -18,9 +18,9 @@ select * from pgq_node.create_node('seqroot', 'root', 'rnode', 'londiste_root', (1 row) select * from londiste.local_add_seq('seqroot', 'masterseq'); - ret_code | ret_note -----------+---------------- - 200 | Sequence added + ret_code | ret_note +----------+---------------------------------- + 200 | Sequence added: public.masterseq (1 row) select * from londiste.local_add_seq('seqroot', 'masterseq'); @@ -96,9 +96,9 @@ select * from londiste.global_update_seq('seqbranch', 'masterseq', 5); (1 row) select * from londiste.local_add_seq('seqbranch', 'masterseq'); - ret_code | ret_note -----------+---------------- - 200 | Sequence added + ret_code | ret_note +----------+---------------------------------- + 200 | Sequence added: public.masterseq (1 row) select * from londiste.root_check_seqs('seqbranch'); diff --git a/sql/londiste/expected/londiste_subscriber.out b/sql/londiste/expected/londiste_subscriber.out index 30020f85..04280ab6 100644 --- a/sql/londiste/expected/londiste_subscriber.out +++ b/sql/londiste/expected/londiste_subscriber.out @@ -31,6 +31,11 @@ select * from pgq_node.create_node('branch_set', 'branch', 'snode', 'londiste_br 200 | Node "snode" initialized for queue "branch_set" with type "branch" (1 row) +select * from londiste.local_show_missing('branch_set'); + obj_kind | obj_name +----------+---------- +(0 rows) + select * from londiste.local_add_table('branch_set', 'public.slavedata'); ret_code | ret_note ----------+------------------------------------------------ @@ -56,10 +61,10 @@ select * from londiste.global_add_table('branch_set', 'public.tmp'); (1 row) select * from londiste.get_table_list('branch_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role -------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.slavedata | t | | | | | - public.tmp | f | | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +------------------+-------+-------------+-----------------+-------------+-------------+----------- + public.slavedata | t | | | | | + public.tmp | f | | | | | (2 rows) select * from londiste.global_remove_table('branch_set', 'public.tmp'); @@ -81,8 +86,14 @@ select * from londiste.local_remove_table('branch_set', 'public.slavedata'); (1 row) select * from londiste.get_table_list('branch_set'); - table_name | local | merge_state | custom_snapshot | skip_truncate | dropped_ddl | copy_role -------------------+-------+-------------+-----------------+---------------+-------------+----------- - public.slavedata | f | | | | | + table_name | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role +------------------+-------+-------------+-----------------+-------------+-------------+----------- + public.slavedata | f | | | | | +(1 row) + +select * from londiste.local_show_missing('branch_set'); + obj_kind | obj_name +----------+------------------ + r | public.slavedata (1 row) -- 2.39.5