Daniel Verite wrote:
> And in enlargeStringInfo() the patch adds this:
> /*
> * Maximum size for strings with allow_long=true.
> * It must not exceed INT_MAX, as the StringInfo routines
> * expect offsets into the buffer to fit into an int.
> */
> const int max_alloc_long = 0x7fffffff;
>
> On a 32-bit arch, we can expect max_alloc_long == MaxAllocHugeSize,
> but on a 64-bit arch, it will be much smaller with MaxAllocHugeSize
> at (2^63)-1.
Yeah, you're right. Here's a v4 of this patch, in which I've done some
further very small adjustments to your v3:
* I changed the 0x7fffffff hardcoded value with some arithmetic which
sholud have the same result on most architectures:
/*
* Determine the upper size limit. The fact that the StringInfo API uses
* "int" everywhere limits us to int's width even for "long_ok" strings.
*/
limit = str->long_ok ?
(((Size) 1) << (Min(sizeof(int), sizeof(Size)) * 8 - 1)) - 1 :
MaxAllocSize;
Initially I just had "sizeof(int)" instead of the Min(), and a
StaticAssert for sizeof(int) <= sizeof(Size), on the grounds that no
actual platform is likely to break that (though I think the C standard
does allow it). But I realized that doing it this way is simple enough;
and furthermore, in any platforms where int is 8 bytes (ILP64), this
would automatically allow for 63-bit-sized stringinfos. I don't think
this exists today, but wikipedia[1] lists two obsolete ones, [2] and [3].
[1] https://en.wikipedia.org/wiki/64-bit_computing#64-bit_data_models
[2] https://en.wikipedia.org/wiki/HAL_SPARC64
[3] https://en.wikipedia.org/wiki/UNICOS
* I reverted the enlargement looping logic in enlargeStringInfo() to
pretty much the original code (minus the cast).
* I tweaked a few comments.
The big advantage of your v3 patch is that it can be backpatched without
fear of breaking ABI, so I've struggled to maintain that property in my
changes. We can further tweak in HEAD-only; for example change the API
to use Size instead of int. I think that would be desirable, but let's
not do it until we have backpatched this one.
--
Álvaro Herrera https://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services