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

Modified Files:
	remote_listen.c remote_worker.c 
Log Message:
Update txid functions to indicate that they live in pg_catalog, not the
public schema.


Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** remote_worker.c	25 Oct 2007 18:32:00 -0000	1.159
--- remote_worker.c	3 Dec 2007 23:53:42 -0000	1.160
***************
*** 2440,2444 ****
  					 "start transaction; "
  					 "set transaction isolation level serializable; "
! 					 "select \"public\".txid_snapshot_xmin(\"public\".txid_current_snapshot()) <= '%s'; ",
  					 event->ev_maxtxid_c);
  		res1 = PQexec(pro_dbconn, dstring_data(&query1));
--- 2440,2444 ----
  					 "start transaction; "
  					 "set transaction isolation level serializable; "
! 					 "select \"pg_catalog\".txid_snapshot_xmin(\"pg_catalog\".txid_current_snapshot()) <= '%s'; ",
  					 event->ev_maxtxid_c);
  		res1 = PQexec(pro_dbconn, dstring_data(&query1));
***************
*** 3258,3265 ****
  
  			(void) slon_mkquery(&query2,
! 						 "log_txid >= \"public\".txid_snapshot_xmax('%s') "
! 						 "or (log_txid >= \"public\".txid_snapshot_xmin('%s')",
  						 ssy_snapshot, ssy_snapshot);
! 			slon_appendquery(&query2, " and log_txid in (select * from \"public\".txid_snapshot_xip('%s')))", ssy_snapshot);
  
  			slon_log(SLON_INFO, "remoteWorkerThread_%d: "
--- 3258,3265 ----
  
  			(void) slon_mkquery(&query2,
! 						 "log_txid >= \"pg_catalog\".txid_snapshot_xmax('%s') "
! 						 "or (log_txid >= \"pg_catalog\".txid_snapshot_xmin('%s')",
  						 ssy_snapshot, ssy_snapshot);
! 			slon_appendquery(&query2, " and log_txid in (select * from \"pg_catalog\".txid_snapshot_xip('%s')))", ssy_snapshot);
  
  			slon_log(SLON_INFO, "remoteWorkerThread_%d: "
***************
*** 3607,3611 ****
  	(void) slon_mkquery(&new_qual,
  				 "(log_txid < '%s' and "
! 				 "\"public\".txid_visible_in_snapshot(log_txid, '%s'))",
  				 event->ev_maxtxid_c, event->ev_snapshot_c);
  
--- 3607,3611 ----
  	(void) slon_mkquery(&new_qual,
  				 "(log_txid < '%s' and "
! 				 "\"pg_catalog\".txid_visible_in_snapshot(log_txid, '%s'))",
  				 event->ev_maxtxid_c, event->ev_snapshot_c);
  
***************
*** 3633,3637 ****
  		(void) slon_mkquery(&query,
  					 "select SSY.ssy_setid, SSY.ssy_seqno, "
! 					 "    \"public\".txid_snapshot_xmax(SSY.ssy_snapshot), "
  					 "    SSY.ssy_snapshot, "
  					 "    SSY.ssy_action_list "
--- 3633,3637 ----
  		(void) slon_mkquery(&query,
  					 "select SSY.ssy_setid, SSY.ssy_seqno, "
! 					 "    \"pg_catalog\".txid_snapshot_xmax(SSY.ssy_snapshot), "
  					 "    SSY.ssy_snapshot, "
  					 "    SSY.ssy_action_list "
***************
*** 3807,3811 ****
  			slon_appendquery(provider_qual,
  							 "(log_txid >= '%s' or "
! 							 "log_txid IN (select * from \"public\".txid_snapshot_xip('%s')))",
  							 ssy_maxxid, ssy_snapshot);
  			actionlist_len = strlen(ssy_action_list);
--- 3807,3811 ----
  			slon_appendquery(provider_qual,
  							 "(log_txid >= '%s' or "
! 							 "log_txid IN (select * from \"pg_catalog\".txid_snapshot_xip('%s')))",
  							 ssy_maxxid, ssy_snapshot);
  			actionlist_len = strlen(ssy_action_list);

Index: remote_listen.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_listen.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** remote_listen.c	19 Oct 2007 18:38:35 -0000	1.37
--- remote_listen.c	3 Dec 2007 23:53:42 -0000	1.38
***************
*** 678,683 ****
  				 "select ev_origin, ev_seqno, ev_timestamp, "
  				 "       ev_snapshot, "
! 				 "       \"public\".txid_snapshot_xmin(ev_snapshot), "
! 				 "       \"public\".txid_snapshot_xmax(ev_snapshot), "
  				 "       ev_type, "
  				 "       ev_data1, ev_data2, "
--- 678,683 ----
  				 "select ev_origin, ev_seqno, ev_timestamp, "
  				 "       ev_snapshot, "
! 				 "       \"pg_catalog\".txid_snapshot_xmin(ev_snapshot), "
! 				 "       \"pg_catalog\".txid_snapshot_xmax(ev_snapshot), "
  				 "       ev_type, "
  				 "       ev_data1, ev_data2, "