Log Message:
-----------
* recommit after crash *
The multiplemoveset test doesnt need to have 10 sets to be a good test;
it runs much nicer with just 2...

Modified Files:
--------------
    slony1-engine/tests/testmultiplemoves:
        generate_dml.sh (r1.1 -> r1.2)
        init_add_tables.ik (r1.1 -> r1.2)
        init_create_set.ik (r1.1 -> r1.2)
        init_data.sql (r1.1 -> r1.2)
        init_schema.sql (r1.1 -> r1.2)
        init_subscribe_set.ik (r1.1 -> r1.2)
        move_sets.ik (r1.1 -> r1.2)
        schema.diff (r1.1 -> r1.2)

-------------- next part --------------
Index: init_add_tables.ik
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/init_add_tables.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/init_add_tables.ik -Ltests/testmultiplemoves/init_add_tables.ik -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/init_add_tables.ik
+++ tests/testmultiplemoves/init_add_tables.ik
@@ -2,19 +2,3 @@
 set add table (id=2, set id=1, origin=1, fully qualified name = 'public.table1a', comment='a table');
 set add table (id=3, set id=2, origin=1, fully qualified name = 'public.table2', comment='a table');
 set add table (id=4, set id=2, origin=1, fully qualified name = 'public.table2a', comment='a table');
-set add table (id=5, set id=3, origin=1, fully qualified name = 'public.table3', comment='a table');
-set add table (id=6, set id=3, origin=1, fully qualified name = 'public.table3a', comment='a table');
-set add table (id=7, set id=4, origin=1, fully qualified name = 'public.table4', comment='a table');
-set add table (id=8, set id=4, origin=1, fully qualified name = 'public.table4a', comment='a table');
-set add table (id=9, set id=5, origin=1, fully qualified name = 'public.table5', comment='a table');
-set add table (id=10, set id=5, origin=1, fully qualified name = 'public.table5a', comment='a table');
-set add table (id=11, set id=6, origin=1, fully qualified name = 'public.table6', comment='a table');
-set add table (id=12, set id=6, origin=1, fully qualified name = 'public.table6a', comment='a table');
-set add table (id=13, set id=7, origin=1, fully qualified name = 'public.table7', comment='a table');
-set add table (id=14, set id=7, origin=1, fully qualified name = 'public.table7a', comment='a table');
-set add table (id=15, set id=8, origin=1, fully qualified name = 'public.table8', comment='a table');
-set add table (id=16, set id=8, origin=1, fully qualified name = 'public.table8a', comment='a table');
-set add table (id=17, set id=9, origin=1, fully qualified name = 'public.table9', comment='a table');
-set add table (id=18, set id=9, origin=1, fully qualified name = 'public.table9a', comment='a table');
-set add table (id=19, set id=10, origin=1, fully qualified name = 'public.tablea', comment='a table');
-set add table (id=20, set id=10, origin=1, fully qualified name = 'public.tableaa', comment='a table');
\ No newline at end of file
Index: init_data.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/init_data.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/init_data.sql -Ltests/testmultiplemoves/init_data.sql -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/init_data.sql
+++ tests/testmultiplemoves/init_data.sql
@@ -8,42 +8,3 @@
 INSERT INTO table2a(table2_id,data) VALUES (1,'placeholder a');
 INSERT INTO table2a(table2_id,data) VALUES (2,'placeholder b');
 
-INSERT INTO table3(data) VALUES ('placeholder a');
-INSERT INTO table3(data) VALUES ('placeholder b');
-INSERT INTO table3a(table3_id,data) VALUES (1,'placeholder a');
-INSERT INTO table3a(table3_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO table4(data) VALUES ('placeholder a');
-INSERT INTO table4(data) VALUES ('placeholder b');
-INSERT INTO table4a(table4_id,data) VALUES (1,'placeholder a');
-INSERT INTO table4a(table4_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO table5(data) VALUES ('placeholder a');
-INSERT INTO table5(data) VALUES ('placeholder b');
-INSERT INTO table5a(table5_id,data) VALUES (1,'placeholder a');
-INSERT INTO table5a(table5_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO table6(data) VALUES ('placeholder a');
-INSERT INTO table6(data) VALUES ('placeholder b');
-INSERT INTO table6a(table6_id,data) VALUES (1,'placeholder a');
-INSERT INTO table6a(table6_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO table7(data) VALUES ('placeholder a');
-INSERT INTO table7(data) VALUES ('placeholder b');
-INSERT INTO table7a(table7_id,data) VALUES (1,'placeholder a');
-INSERT INTO table7a(table7_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO table8(data) VALUES ('placeholder a');
-INSERT INTO table8(data) VALUES ('placeholder b');
-INSERT INTO table8a(table8_id,data) VALUES (1,'placeholder a');
-INSERT INTO table8a(table8_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO table9(data) VALUES ('placeholder a');
-INSERT INTO table9(data) VALUES ('placeholder b');
-INSERT INTO table9a(table9_id,data) VALUES (1,'placeholder a');
-INSERT INTO table9a(table9_id,data) VALUES (2,'placeholder b');
-
-INSERT INTO tablea(data) VALUES ('placeholder a');
-INSERT INTO tablea(data) VALUES ('placeholder b');
-INSERT INTO tableaa(tablea_id,data) VALUES (1,'placeholder a');
-INSERT INTO tableaa(tablea_id,data) VALUES (2,'placeholder b');
Index: init_schema.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/init_schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/init_schema.sql -Ltests/testmultiplemoves/init_schema.sql -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/init_schema.sql
+++ tests/testmultiplemoves/init_schema.sql
@@ -2,22 +2,7 @@
 
 create table table1 (id serial primary key, data text);
 create table table2 (id serial primary key, data text);
-create table table3 (id serial primary key, data text);
-create table table4 (id serial primary key, data text);
-create table table5 (id serial primary key, data text);
-create table table6 (id serial primary key, data text);
-create table table7 (id serial primary key, data text);
-create table table8 (id serial primary key, data text);
-create table table9 (id serial primary key, data text);
-create table tableA (id serial primary key, data text);
 
 create table table1a (id serial primary key, table1_id int4 references table1a(id) on update cascade on delete cascade, data text);
 create table table2a (id serial primary key, table2_id int4 references table2a(id) on update cascade on delete cascade, data text);
-create table table3a (id serial primary key, table3_id int4 references table3a(id) on update cascade on delete cascade, data text);
-create table table4a (id serial primary key, table4_id int4 references table4a(id) on update cascade on delete cascade, data text);
-create table table5a (id serial primary key, table5_id int4 references table5a(id) on update cascade on delete cascade, data text);
-create table table6a (id serial primary key, table6_id int4 references table6a(id) on update cascade on delete cascade, data text);
-create table table7a (id serial primary key, table7_id int4 references table7a(id) on update cascade on delete cascade, data text);
-create table table8a (id serial primary key, table8_id int4 references table8a(id) on update cascade on delete cascade, data text);
-create table table9a (id serial primary key, table9_id int4 references table9a(id) on update cascade on delete cascade, data text);
-create table tableAa (id serial primary key, tableA_id int4 references tableAa(id) on update cascade on delete cascade, data text);
+
Index: init_subscribe_set.ik
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/init_subscribe_set.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/init_subscribe_set.ik -Ltests/testmultiplemoves/init_subscribe_set.ik -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/init_subscribe_set.ik
+++ tests/testmultiplemoves/init_subscribe_set.ik
@@ -2,41 +2,8 @@
 wait for event (origin=all, confirmed=all, wait on=1);
 subscribe set (id=2, provider=1, receiver = 2, forward=yes);
 wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=3, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=4, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=5, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=6, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=7, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=8, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=9, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=10, provider=1, receiver = 2, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-
 
 subscribe set (id=1, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
+wait for event (origin=all, confirmed=all, wait on=2);
 subscribe set (id=2, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=3, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=4, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=5, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=6, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=7, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=8, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=9, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
-subscribe set (id=10, provider=2, receiver = 3, forward=yes);
-wait for event (origin=all, confirmed=all, wait on=1);
+wait for event (origin=all, confirmed=all, wait on=2);
Index: init_create_set.ik
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/init_create_set.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/init_create_set.ik -Ltests/testmultiplemoves/init_create_set.ik -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/init_create_set.ik
+++ tests/testmultiplemoves/init_create_set.ik
@@ -1,10 +1,3 @@
 create set (id=1, origin=1, comment='all tables in set 1');
 create set (id=2, origin=1, comment='all tables in set 2');
-create set (id=3, origin=1, comment='all tables in set 3');
-create set (id=4, origin=1, comment='all tables in set 4');
-create set (id=5, origin=1, comment='all tables in set 5');
-create set (id=6, origin=1, comment='all tables in set 6');
-create set (id=7, origin=1, comment='all tables in set 7');
-create set (id=8, origin=1, comment='all tables in set 8');
-create set (id=9, origin=1, comment='all tables in set 9');
-create set (id=10, origin=1, comment='all tables in set 10');
\ No newline at end of file
+
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/generate_dml.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/generate_dml.sh -Ltests/testmultiplemoves/generate_dml.sh -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/generate_dml.sh
+++ tests/testmultiplemoves/generate_dml.sh
@@ -32,7 +32,7 @@
   status "$percent %"
   GENDATA="$mktmp/generate.data"
   while : ; do
-    for set in 1 2 3 4 5 6 7 8 9 A; do
+    for set in 1 2 3; do
 	txtalen=$(random_number 1 100)
 	txta=$(random_string ${txtalen})
 	txta=`echo ${txta} | sed -e "s/\\\\\\\/\\\\\\\\\\\\\\/g" -e "s/'/''/g"`
@@ -79,7 +79,7 @@
   status "Completed moving sets"
 
   ORIGINNODE=3
-  originnode=${ORIGINNODE:-"1"}
+  originnode=3
   eval db=\$DB${originnode}
   eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
@@ -89,6 +89,6 @@
   generate_initdata
   status "loading extra data"
 
-  $pgbindir/psql -h $host -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
+  $pgbindir/psql -h $host -U $user -d $db < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
   status "done"
 }
Index: schema.diff
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/schema.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/schema.diff -Ltests/testmultiplemoves/schema.diff -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/schema.diff
+++ tests/testmultiplemoves/schema.diff
@@ -2,19 +2,3 @@
 select 'table1a', id, table1_id, data from table1a order by id
 select 'table2', id, data from table2 order by id
 select 'table2a', id, table2_id, data from table2a order by id
-select 'table3', id, data from table3 order by id
-select 'table3a', id, table3_id, data from table3a order by id
-select 'table4', id, data from table4 order by id
-select 'table4a', id, table4_id, data from table4a order by id
-select 'table5', id, data from table5 order by id
-select 'table5a', id, table5_id, data from table5a order by id
-select 'table6', id, data from table6 order by id
-select 'table6a', id, table6_id, data from table6a order by id
-select 'table7', id, data from table7 order by id
-select 'table7a', id, table7_id, data from table7a order by id
-select 'table8', id, data from table8 order by id
-select 'table8a', id, table8_id, data from table8a order by id
-select 'table9', id, data from table9 order by id
-select 'table9a', id, table9_id, data from table9a order by id
-select 'tableA', id, data from tableA order by id
-select 'tableAa', id, tableA_id, data from tableAa order by id
\ No newline at end of file
Index: move_sets.ik
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testmultiplemoves/move_sets.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testmultiplemoves/move_sets.ik -Ltests/testmultiplemoves/move_sets.ik -u -w -r1.1 -r1.2
--- tests/testmultiplemoves/move_sets.ik
+++ tests/testmultiplemoves/move_sets.ik
@@ -2,19 +2,3 @@
 move set (id=1, old origin=1, new origin=3);
 lock set (id=2, origin=1);
 move set (id=2, old origin=1, new origin=3);
-lock set (id=3, origin=1);
-move set (id=3, old origin=1, new origin=3);
-lock set (id=4, origin=1);
-move set (id=4, old origin=1, new origin=3);
-lock set (id=5, origin=1);
-move set (id=5, old origin=1, new origin=3);
-lock set (id=6, origin=1);
-move set (id=6, old origin=1, new origin=3);
-lock set (id=7, origin=1);
-move set (id=7, old origin=1, new origin=3);
-lock set (id=8, origin=1);
-move set (id=8, old origin=1, new origin=3);
-lock set (id=9, origin=1);
-move set (id=9, old origin=1, new origin=3);
-lock set (id=10, origin=1);
-move set (id=10, old origin=1, new origin=3);
\ No newline at end of file