diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-05-10 18:41:27 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-05-10 18:41:27 -0300 |
| commit | b66adb7b0c83e632e0f881f828fa6f4233d01d06 (patch) | |
| tree | fbc6b9a10c2c522a146818dfc5f590ea01c3c345 /src/include/lib/stringinfo.h | |
| parent | b83f4e4a25394b964a7fadc6429c7de82d62b58a (diff) | |
| download | postgresql-b66adb7b0c83e632e0f881f828fa6f4233d01d06.tar.gz postgresql-b66adb7b0c83e632e0f881f828fa6f4233d01d06.zip | |
Revert "Permit dump/reload of not-too-large >1GB tuples"
This reverts commits fa2fa9955280 and 42f50cb8fa98.
While the functionality that was intended to be provided by these
commits is desired, the patch didn't actually solve as many of the
problematic situations as we hoped, and it created a bunch of its own
problems. Since we're going to require more extensive changes soon for
other reasons and users have been working around these problems for a
long time already, there is no point in spending effort in fixing this
halfway measure.
Per complaint from Tom Lane.
Discussion: https://postgr.es/m/21407.1484606922@sss.pgh.pa.us
(Commit fa2fa9955280 had already been reverted in branches 9.5 as
f858524ee4f and 9.6 as e9e44a0953, so this touches master only.
Commit 42f50cb8fa98 was not present in the older branches.)
Diffstat (limited to 'src/include/lib/stringinfo.h')
| -rw-r--r-- | src/include/lib/stringinfo.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index 75ff5041bbb..316c196565b 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -30,8 +30,6 @@ * cursor is initialized to zero by makeStringInfo or initStringInfo, * but is not otherwise touched by the stringinfo.c routines. * Some routines use it to scan through a StringInfo. - * long_ok whether this StringInfo can allocate more than MaxAllocSize - * bytes (but still up to 2GB). *------------------------- */ typedef struct StringInfoData @@ -40,7 +38,6 @@ typedef struct StringInfoData int len; int maxlen; int cursor; - bool long_ok; } StringInfoData; typedef StringInfoData *StringInfo; @@ -49,11 +46,11 @@ typedef StringInfoData *StringInfo; /*------------------------ * There are two ways to create a StringInfo object initially: * - * StringInfo stringptr = makeStringInfo(); // or makeLongStringInfo(); + * StringInfo stringptr = makeStringInfo(); * Both the StringInfoData and the data buffer are palloc'd. * * StringInfoData string; - * initStringInfo(&string); // or initLongStringInfo(); + * initStringInfo(&string); * The data buffer is palloc'd but the StringInfoData is just local. * This is the easiest approach for a StringInfo object that will * only live as long as the current routine. @@ -70,26 +67,21 @@ typedef StringInfoData *StringInfo; /*------------------------ * makeStringInfo - * makeLongStringInfo - * Create an empty 'StringInfoData' & return a pointer to it. The former - * allows up to 1 GB in size, per palloc(); the latter allows up to 2 GB. + * Create an empty 'StringInfoData' & return a pointer to it. */ extern StringInfo makeStringInfo(void); -extern StringInfo makeLongStringInfo(void); /*------------------------ * initStringInfo - * initLongStringInfo * Initialize a StringInfoData struct (with previously undefined contents) - * to describe an empty string. Size limits as above. + * to describe an empty string. */ extern void initStringInfo(StringInfo str); -extern void initLongStringInfo(StringInfo str); /*------------------------ * resetStringInfo * Clears the current content of the StringInfo, if any. The - * StringInfo remains valid. The long_ok flag is not reset. + * StringInfo remains valid. */ extern void resetStringInfo(StringInfo str); |