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

Modified Files:
	cleanup_thread.c remote_worker.c 
Log Message:
Removed all support for STORE/DROP TRIGGER commands. Users are supposed
to use the ALTER TABLE [ENABLE|DISABLE] TRIGGER functionality in
Postgres from now on.

Jan


Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** remote_worker.c	3 Jul 2007 12:45:23 -0000	1.147
--- remote_worker.c	5 Jul 2007 18:19:04 -0000	1.148
***************
*** 958,981 ****
  								 seq_id, new_set_id);
  			}
- 			else if (strcmp(event->ev_type, "STORE_TRIGGER") == 0)
- 			{
- 				int			trig_tabid = (int)strtol(event->ev_data1, NULL, 10);
- 				char	   *trig_tgname = event->ev_data2;
- 
- 				slon_appendquery(&query1,
- 								 "select %s.storeTrigger_int(%d, '%q'); ",
- 								 rtcfg_namespace,
- 								 trig_tabid, trig_tgname);
- 			}
- 			else if (strcmp(event->ev_type, "DROP_TRIGGER") == 0)
- 			{
- 				int			trig_tabid = (int)strtol(event->ev_data1, NULL, 10);
- 				char	   *trig_tgname = event->ev_data2;
- 
- 				slon_appendquery(&query1,
- 								 "select %s.dropTrigger_int(%d, '%q'); ",
- 								 rtcfg_namespace,
- 								 trig_tabid, trig_tgname);
- 			}
  			else if (strcmp(event->ev_type, "ACCEPT_SET") == 0)
  			{
--- 958,961 ----
***************
*** 2357,2363 ****
  	SlonDString indexregenquery;
  	int			ntuples1;
- 	int			ntuples2;
  	int			tupno1;
- 	int			tupno2;
  	PGresult   *res1;
  	PGresult   *res2;
--- 2337,2341 ----
***************
*** 2779,2829 ****
  
  		/*
- 		 * Copy the content of sl_trigger for this table
- 		 */
- 		(void) slon_mkquery(&query1,
- 					 "select trig_tgname from %s.sl_trigger "
- 					 "where trig_tabid = %d; ",
- 					 rtcfg_namespace, tab_id);
- 		res2 = PQexec(pro_dbconn, dstring_data(&query1));
- 		if (PQresultStatus(res2) != PGRES_TUPLES_OK)
- 		{
- 			slon_log(SLON_ERROR, "remoteWorkerThread_%d: \"%s\" %s\n",
- 					 node->no_id, dstring_data(&query1),
- 					 PQresultErrorMessage(res2));
- 			PQclear(res2);
- 			PQclear(res1);
- 			slon_disconnectdb(pro_conn);
- 			dstring_free(&query1);
- 			dstring_free(&query2);
- 			dstring_free(&query3);
- 			dstring_free(&lsquery);
- 			dstring_free(&indexregenquery);
- 			archive_terminate(node);
- 			return -1;
- 		}
- 		ntuples2 = PQntuples(res2);
- 		for (tupno2 = 0; tupno2 < ntuples2; tupno2++)
- 		{
- 			(void) slon_mkquery(&query1,
- 						 "select %s.storeTrigger(%d, '%q'); ",
- 					   rtcfg_namespace, tab_id, PQgetvalue(res2, tupno2, 0));
- 			if (query_execute(node, loc_dbconn, &query1) < 0)
- 			{
- 				PQclear(res2);
- 				PQclear(res1);
- 				slon_disconnectdb(pro_conn);
- 				dstring_free(&query1);
- 				dstring_free(&query2);
- 				dstring_free(&query3);
- 				dstring_free(&lsquery);
- 				dstring_free(&indexregenquery);
- 				archive_terminate(node);
- 				return -1;
- 			}
- 		}
- 		PQclear(res2);
- 
- 
- 		/*
  		 * Begin a COPY from stdin for the table on the local DB
  		 */
--- 2757,2760 ----
***************
*** 3799,3803 ****
  		{
  			int			sub_set = strtol(PQgetvalue(res1, tupno1, 0), NULL, 10);
- 			char	   *ssy_minxid = PQgetvalue(res1, tupno1, 2);
  			char	   *ssy_maxxid = PQgetvalue(res1, tupno1, 3);
  			char	   *ssy_xip = PQgetvalue(res1, tupno1, 4);
--- 3730,3733 ----

Index: cleanup_thread.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/cleanup_thread.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** cleanup_thread.c	27 Jun 2007 15:51:36 -0000	1.38
--- cleanup_thread.c	5 Jul 2007 18:19:04 -0000	1.39
***************
*** 35,56 ****
  static unsigned long get_earliest_xid(PGconn *dbconn);
  
- /* The list of tables that need to be vacuumed by Slony-I */
- /* @-nullassign @*/
- static char *table_list[] = {
- 	"%s.sl_event",
- 	"%s.sl_confirm",
- 	"%s.sl_setsync",
- 	"%s.sl_log_1",
- 	"%s.sl_log_2",
- 	"%s.sl_seqlog",
- 	"pg_catalog.pg_listener",
- 	"pg_catalog.pg_statistic",
- 	NULL  
- };
-  /* @end@ */
- 
- static char tstring[255];		/* string used to store table names for the
- 								 * VACUUM statements */
- 
  /* ----------
   * cleanupThread_main
--- 35,38 ----