Christopher Browne wrote:
>
> Seems to me that in this case, it warrants us using a different
> letter, say, "L".
>
I'm new to this, so I'm not sure of the protocol on these forums, or where
and if I should post this, but I humbly submit the patch I came up with that
combines your patch, and the suggested fix using the L character. This is
working correctly for us now. Please let me know the proper procedure as I
want to do the right thing here. :-)
--- src/slon/dbutils.c 2009-07-20 14:35:19.000000000 -0400
+++ src/slon/dbutils.c 2009-07-21 12:19:09.000000000 -0400
@@ -494,6 +494,12 @@
fmt++;
break;
+ case 'L':
+ sprintf(buf, "%lld", va_arg(ap,
long long));
+ dstring_append(dsp, buf);
+ fmt++;
+ break;
+
default:
dstring_addchar(dsp, '%');
dstring_addchar(dsp, *fmt);
--- src/slon/remote_worker.c 2008-08-29 17:06:45.000000000 -0400
+++ src/slon/remote_worker.c 2009-07-21 12:19:00.000000000 -0400
@@ -3782,7 +3782,7 @@
res1 = PQexec(local_dbconn, dstring_data(&query));
monitor_subscriber_query(&pm);
- slon_log(SLON_INFO, "about to monitor_subscriber_query -
pulling big
actionid list %d\n", provider);
+ 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)
{
@@ -5513,7 +5513,7 @@
compress_actionseq(const char *ssy_actionlist, SlonDString
*action_subquery)
{
CompressState state;
- int curr_number,
+ long long curr_number,
curr_min,
curr_max;
int curr_digit;
@@ -5661,7 +5661,7 @@
if (state == COLLECTING_DIGITS)
{
/* Finished another number... Fold it
into the ranges... */
- slon_log(SLON_DEBUG4, "Finished number:
%d\n", curr_number);
+ slon_log(SLON_DEBUG4, "Finished number: %lld\n", curr_number);
/*
* If we haven't a range, then the
range is the current
@@ -5712,16 +5712,16 @@
}
if (curr_max == curr_min)
{
- slon_log(SLON_DEBUG4,
"simple entry - %d\n", curr_max);
+ slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
slon_appendquery(action_subquery,
-
" log_actionseq <> '%d' ", curr_max);
+ " log_actionseq <> '%L' ", curr_max);
}
else
{
- slon_log(SLON_DEBUG4,
"between entry - %d %d\n",
+ slon_log(SLON_DEBUG4, "between entry - %lld %lld\n",
curr_min, curr_max);
slon_appendquery(action_subquery,
- "
log_actionseq not between '%d' and '%d' ",
+ " log_actionseq not between '%L' and '%L' ",
curr_min, curr_max);
}
curr_min = curr_number;
@@ -5747,17 +5747,15 @@
}
if (curr_max == curr_min)
{
- slon_log(SLON_DEBUG4, "simple entry - %d\n", curr_max);
+ slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
slon_appendquery(action_subquery,
- " log_actionseq <>
'%d' ", curr_max);
+ " log_actionseq <> '%L' ", curr_max);
}
else
{
- slon_log(SLON_DEBUG4, "between entry - %d %d\n",
+ slon_log(SLON_DEBUG4, "between entry - %lld %lld\n",
curr_min, curr_max);
- slon_appendquery(action_subquery,
- " log_actionseq not
between '%d' and '%d' ",
- curr_min, curr_max);
+ slon_appendquery(action_subquery, " log_actionseq not between
'%L' and
'%L' ", curr_min, curr_max);
}
--
View this message in context:
http://www.nabble.com/How-to-downgrade-from-2.0.2-to-2.0.1-tp24540512p24596980.html
Sent from the Slony-I -- General mailing list archive at Nabble.com.
_______________________________________________
Slony1-general mailing list
[email protected]
http://lists.slony.info/mailman/listinfo/slony1-general