Update of /home/cvsd/slony1/slony1-engine/src/ducttape
In directory main.slony.info:/tmp/cvs-serv8012/src/ducttape

Modified Files:
	test_2_pgbench.in 
Log Message:
Rewrote rebuildListenEntries() from scratch. The goal here is to suppress
listen entries that would cause events to arrive on cascaded subscribers
on a different path around the data provider for the subscription. 


Jan


Index: test_2_pgbench.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/ducttape/test_2_pgbench.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_2_pgbench.in	15 May 2007 14:05:15 -0000	1.3
--- test_2_pgbench.in	29 Jul 2007 20:15:41 -0000	1.4
***************
*** 365,414 ****
  kill $slon3_pid 2>/dev/null
  
! echo -n "**** comparing databases ... "
! psql $DB1 -o dump.tmp.1.$$ <<_EOF_
! 	select 'accounts:'::text, aid, bid, abalance, filler
! 			from accounts order by aid;
! 	select 'branches:'::text, bid, bbalance, filler
! 			from branches order by bid;
! 	select 'tellers:'::text, tid, bid, tbalance, filler
! 			from tellers order by tid;
! 	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
! _EOF_
! psql $DB2 -o dump.tmp.2.$$ <<_EOF_
! 	select 'accounts:'::text, aid, bid, abalance, filler
! 			from accounts order by aid;
! 	select 'branches:'::text, bid, bbalance, filler
! 			from branches order by bid;
! 	select 'tellers:'::text, tid, bid, tbalance, filler
! 			from tellers order by tid;
! 	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
! _EOF_
! psql $DB3 -o dump.tmp.3.$$ <<_EOF_
! 	select 'accounts:'::text, aid, bid, abalance, filler
! 			from accounts order by aid;
! 	select 'branches:'::text, bid, bbalance, filler
! 			from branches order by bid;
! 	select 'tellers:'::text, tid, bid, tbalance, filler
! 			from tellers order by tid;
! 	select 'history:'::text, tid, bid, aid, delta, mtime, filler,
! 			"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
! _EOF_
! 
! if diff dump.tmp.1.$$ dump.tmp.2.$$ >test_2.1-2.diff ; then
! 	echo "success - databases 1 and 2 are equal."
! 	rm dump.tmp.2.$$
! 	rm test_2.1-2.diff
! else
! 	echo "FAILED - see test_2.1-2.diff for database differences"
! fi
! echo -n "**** comparing databases ... "
! if diff dump.tmp.1.$$ dump.tmp.3.$$ >test_2.1-3.diff ; then
! 	echo "success - databases 1 and 3 are equal."
! 	rm dump.tmp.3.$$
! 	rm dump.tmp.1.$$
! 	rm test_2.1-3.diff
! else
! 	echo "FAILED - see test_2.1-3.diff for database differences"
! fi
--- 365,368 ----
  kill $slon3_pid 2>/dev/null
  
! ./compare_pgbench_dumps $DB1 $DB2
! ./compare_pgbench_dumps $DB1 $DB3