Chris Browne cbbrowne at lists.slony.info
Mon Jul 20 09:42:40 PDT 2009
Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv21093

Modified Files:
      Tag: REL_2_0_STABLE
	remote_worker.c 
Log Message:
Change actionseq values from "int" to "long long" to accomodate large
sequence values - per bug #92



Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.176.2.1
retrieving revision 1.176.2.2
diff -C2 -d -r1.176.2.1 -r1.176.2.2
*** remote_worker.c	17 Jun 2009 21:37:38 -0000	1.176.2.1
--- remote_worker.c	20 Jul 2009 16:42:38 -0000	1.176.2.2
***************
*** 3807,3811 ****
  		monitor_subscriber_query(&pm);
  
! 		slon_log(SLON_INFO, "about to monitor_subscriber_query - pulling big actionid list %d\n", provider);
  
  		if (PQresultStatus(res1) != PGRES_TUPLES_OK)
--- 3807,3811 ----
  		monitor_subscriber_query(&pm);
  
! 		slon_log(SLON_INFO, "about to monitor_subscriber_query - pulling big actionid list for %d\n", provider->no_id);
  
  		if (PQresultStatus(res1) != PGRES_TUPLES_OK)
***************
*** 5538,5542 ****
  {
  	CompressState			state;
! 	int			curr_number,
  				curr_min,
  				curr_max;
--- 5538,5542 ----
  {
  	CompressState			state;
! 	long long			curr_number,
  				curr_min,
  				curr_max;
***************
*** 5686,5690 ****
  				{
  					/* Finished another number... Fold it into the ranges... */
! 					slon_log(SLON_DEBUG4, "Finished number: %d\n", curr_number);
  
  					/*
--- 5686,5690 ----
  				{
  					/* Finished another number... Fold it into the ranges... */
! 					slon_log(SLON_DEBUG4, "Finished number: %lld\n", curr_number);
  
  					/*
***************
*** 5737,5750 ****
  						if (curr_max == curr_min)
  						{
! 							slon_log(SLON_DEBUG4, "simple entry - %d\n", curr_max);
  							slon_appendquery(action_subquery,
! 										" log_actionseq <> '%d' ", curr_max);
  						}
  						else
  						{
! 							slon_log(SLON_DEBUG4, "between entry - %d %d\n",
  									 curr_min, curr_max);
  							slon_appendquery(action_subquery,
! 								 " log_actionseq not between '%d' and '%d' ",
  											 curr_min, curr_max);
  						}
--- 5737,5750 ----
  						if (curr_max == curr_min)
  						{
! 							slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  							slon_appendquery(action_subquery,
! 										" log_actionseq <> '%lld' ", curr_max);
  						}
  						else
  						{
! 							slon_log(SLON_DEBUG4, "between entry - %lld %lld\n",
  									 curr_min, curr_max);
  							slon_appendquery(action_subquery,
! 								 " log_actionseq not between '%lld' and '%lld' ",
  											 curr_min, curr_max);
  						}
***************
*** 5772,5785 ****
  		if (curr_max == curr_min)
  		{
! 			slon_log(SLON_DEBUG4, "simple entry - %d\n", curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq <> '%d' ", curr_max);
  		}
  		else
  		{
! 			slon_log(SLON_DEBUG4, "between entry - %d %d\n",
  					 curr_min, curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq not between '%d' and '%d' ",
  							 curr_min, curr_max);
  		}
--- 5772,5785 ----
  		if (curr_max == curr_min)
  		{
! 			slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq <> '%lld' ", curr_max);
  		}
  		else
  		{
! 			slon_log(SLON_DEBUG4, "between entry - %lld %lld\n",
  					 curr_min, curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq not between '%lld' and '%lld' ",
  							 curr_min, curr_max);
  		}



More information about the Slony1-commit mailing list