Chris Browne cbbrowne at lists.slony.info
Tue Apr 3 14:55:06 PDT 2007
Update of /home/cvsd/slony1/slony1-engine/tests/testddl
In directory main.slony.info:/tmp/cvs-serv3668/tests/testddl

Modified Files:
      Tag: REL_1_2_STABLE
	ddl_update_part2.sql generate_dml.sh individual_ddl.sh 
	init_subscribe_set.ik 
Log Message:
Update to DDL handling - when a script is specified with "EXECUTE ONLY ON"
a specific node, it should be invoked, by slonik, only on that node.


Index: init_subscribe_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/init_subscribe_set.ik,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** init_subscribe_set.ik	30 Mar 2007 22:43:04 -0000	1.1.4.1
--- init_subscribe_set.ik	3 Apr 2007 21:55:04 -0000	1.1.4.2
***************
*** 1,2 ****
--- 1,4 ----
+ echo 'sleep a couple seconds';
+ sleep (seconds = 2);
  subscribe set ( id = 1, provider = 1, receiver = 2, forward = no);
  sync(id=1);

Index: individual_ddl.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/individual_ddl.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** individual_ddl.sh	2 Apr 2007 18:51:56 -0000	1.1.2.2
--- individual_ddl.sh	3 Apr 2007 21:55:04 -0000	1.1.2.3
***************
*** 5,9 ****
         SET ID = 1,
         FILENAME = '${testname}/ddl_update_part2.sql',
!        EVENT NODE = 1,
         EXECUTE ONLY ON = ${node}
      );
--- 5,9 ----
         SET ID = 1,
         FILENAME = '${testname}/ddl_update_part2.sql',
!        EVENT NODE = ${node},
         EXECUTE ONLY ON = ${node}
      );

Index: ddl_update_part2.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/ddl_update_part2.sql,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ddl_update_part2.sql	30 Mar 2007 22:43:04 -0000	1.1.2.1
--- ddl_update_part2.sql	3 Apr 2007 21:55:04 -0000	1.1.2.2
***************
*** 4,5 ****
--- 4,6 ----
  update table1 set seqed = nextval('t1seq');
  alter table table1 add constraint seqed_unique UNIQUE(seqed);
+ 

Index: generate_dml.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/generate_dml.sh,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -d -r1.3.2.4 -r1.3.2.5
*** generate_dml.sh	30 Mar 2007 22:43:04 -0000	1.3.2.4
--- generate_dml.sh	3 Apr 2007 21:55:04 -0000	1.3.2.5
***************
*** 23,27 ****
  generate_initdata()
  {
!   numrows=$(random_number 50 1000)
    i=0;
    trippoint=`expr $numrows / 20`
--- 23,27 ----
  generate_initdata()
  {
!   numrows=$(random_number 150 350)
    i=0;
    trippoint=`expr $numrows / 20`
***************
*** 93,97 ****
        init_preamble
        sh ${testname}/individual_ddl.sh ${testname} ${node} >> ${SCRIPT}
!       status "execute DDL script only on node ${node}"
        do_ik
    done
--- 93,97 ----
        init_preamble
        sh ${testname}/individual_ddl.sh ${testname} ${node} >> ${SCRIPT}
!       status "execute DDL script on node ${node}"
        do_ik
    done



More information about the Slony1-commit mailing list