From f858524ee4f0e7249959ee0ee8dd9f00b3e8d107 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 6 Dec 2016 12:36:44 -0300 Subject: 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. --- src/backend/commands/copy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/commands/copy.c') diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index c4a2c0fda92..96ed21aae93 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -400,7 +400,7 @@ ReceiveCopyBegin(CopyState cstate) pq_sendint(&buf, format, 2); /* per-column formats */ pq_endmessage(&buf); cstate->copy_dest = COPY_NEW_FE; - cstate->fe_msgbuf = makeLongStringInfo(); + cstate->fe_msgbuf = makeStringInfo(); } else if (PG_PROTOCOL_MAJOR(FrontendProtocol) >= 2) { @@ -1865,7 +1865,7 @@ CopyTo(CopyState cstate) cstate->null_print_client = cstate->null_print; /* default */ /* We use fe_msgbuf as a per-row buffer regardless of copy_dest */ - cstate->fe_msgbuf = makeLongStringInfo(); + cstate->fe_msgbuf = makeStringInfo(); /* Get info about the columns we need to process. */ cstate->out_functions = (FmgrInfo *) palloc(num_phys_attrs * sizeof(FmgrInfo)); @@ -2681,8 +2681,8 @@ BeginCopyFrom(Relation rel, cstate->cur_attval = NULL; /* Set up variables to avoid per-attribute overhead. */ - initLongStringInfo(&cstate->attribute_buf); - initLongStringInfo(&cstate->line_buf); + initStringInfo(&cstate->attribute_buf); + initStringInfo(&cstate->line_buf); cstate->line_buf_converted = false; cstate->raw_buf = (char *) palloc(RAW_BUF_SIZE + 1); cstate->raw_buf_index = cstate->raw_buf_len = 0; -- cgit v1.2.3