Chris Browne cbbrowne at lists.slony.info
Wed Feb 6 12:23:54 PST 2008
Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv4617

Modified Files:
      Tag: REL_1_2_STABLE
	remote_worker.c 
Log Message:
Remove  "notify \"_%s_Confirm\"; " requests; these are entirely spurious,
as there is nothing listening for this, as of the 1.2 branch.

There was a problem reported where this *might* conceivably be a
contributing factor.

<http://www.slony.info/bugzilla/show_bug.cgi?id=32>


Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.124.2.30
retrieving revision 1.124.2.31
diff -C2 -d -r1.124.2.30 -r1.124.2.31
*** remote_worker.c	13 Dec 2007 17:19:17 -0000	1.124.2.30
--- remote_worker.c	6 Feb 2008 20:23:52 -0000	1.124.2.31
***************
*** 2144,2154 ****
  
  	slon_appendquery(dsp,
! 					 "notify \"_%s_Event\"; "
! 					 "notify \"_%s_Confirm\"; "
! 					 "insert into %s.sl_event "
! 					 "    (ev_origin, ev_seqno, ev_timestamp, "
! 					 "     ev_minxid, ev_maxxid, ev_xip, ev_type ",
! 					 rtcfg_cluster_name, rtcfg_cluster_name,
! 					 rtcfg_namespace);
  	if (event->ev_data1 != NULL)
  		dstring_append(dsp, ", ev_data1");
--- 2144,2153 ----
  
  	slon_appendquery(dsp,
! 			 "notify \"_%s_Event\"; "
! 			 "insert into %s.sl_event "
! 			 "    (ev_origin, ev_seqno, ev_timestamp, "
! 			 "     ev_minxid, ev_maxxid, ev_xip, ev_type ",
! 			 rtcfg_cluster_name,
! 			 rtcfg_namespace);
  	if (event->ev_data1 != NULL)
  		dstring_append(dsp, ", ev_data1");
***************
*** 2168,2175 ****
  		dstring_append(dsp, ", ev_data8");
  	slon_appendquery(dsp,
! 					 "    ) values ('%d', '%s', '%s', '%s', '%s', '%q', '%s'",
! 					 event->ev_origin, seqbuf, event->ev_timestamp_c,
! 					 event->ev_minxid_c, event->ev_maxxid_c, event->ev_xip,
! 					 event->ev_type);
  	if (event->ev_data1 != NULL)
  		slon_appendquery(dsp, ", '%q'", event->ev_data1);
--- 2167,2174 ----
  		dstring_append(dsp, ", ev_data8");
  	slon_appendquery(dsp,
! 			 "    ) values ('%d', '%s', '%s', '%s', '%s', '%q', '%s'",
! 			 event->ev_origin, seqbuf, event->ev_timestamp_c,
! 			 event->ev_minxid_c, event->ev_maxxid_c, event->ev_xip,
! 			 event->ev_type);
  	if (event->ev_data1 != NULL)
  		slon_appendquery(dsp, ", '%q'", event->ev_data1);
***************
*** 2189,2198 ****
  		slon_appendquery(dsp, ", '%q'", event->ev_data8);
  	slon_appendquery(dsp,
! 					 "); "
! 					 "insert into %s.sl_confirm "
! 					 "	(con_origin, con_received, con_seqno, con_timestamp) "
! 					 "   values (%d, %d, '%s', now()); ",
! 					 rtcfg_namespace,
! 					 event->ev_origin, rtcfg_nodeid, seqbuf);
  }
  
--- 2188,2197 ----
  		slon_appendquery(dsp, ", '%q'", event->ev_data8);
  	slon_appendquery(dsp,
! 			 "); "
! 			 "insert into %s.sl_confirm "
! 			 "	(con_origin, con_received, con_seqno, con_timestamp) "
! 			 "   values (%d, %d, '%s', now()); ",
! 			 rtcfg_namespace,
! 			 event->ev_origin, rtcfg_nodeid, seqbuf);
  }
  



More information about the Slony1-commit mailing list