summaryrefslogtreecommitdiff
path: root/src/include/lib/stringinfo.h
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2016-12-06 12:36:44 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2016-12-06 12:45:49 -0300
commitf858524ee4f0e7249959ee0ee8dd9f00b3e8d107 (patch)
tree1e55f648d4a67fa9fe4897d0f0cb108292038c32 /src/include/lib/stringinfo.h
parent8606271640401b5a4efd20c54e2850fa88118eb8 (diff)
Revert "Permit dump/reload of not-too-large >1GB tuples"
This reverts commit 646655d264f17cf7fdbc6425ef8bc9a2f9f9ee41. Per Tom Lane, changing the definition of StringInfoData amounts to an ABI break, which is unacceptable in back branches.
Diffstat (limited to 'src/include/lib/stringinfo.h')
-rw-r--r--src/include/lib/stringinfo.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index 07239dcedfc..00c25b6edd5 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);