10000 Fix pg_restore's processing of old-style BLOB COMMENTS data. · larkly/postgres-docker@6adddac · GitHub
[go: up one dir, main page]
Skip to content

Commit 6adddac

Browse files
tglsfdctglsfdc
committed
Fix pg_restore's processing of old-style BLOB COMMENTS data.
Prior to 9.0, pg_dump handled comments on large objects by dumping a bunch of COMMENT commands into a single BLOB COMMENTS archive object. With sufficiently many such comments, some of the commands would likely get split across bufferloads when restoring, causing failures in direct-to-database restores (though no problem would be evident in text output). This is the same type of issue we have with table data dumped as INSERT commands, and it can be fixed in the same way, by using a mini SQL lexer to figure out where the command boundaries are. Fortunately, the COMMENT commands are no more complex to lex than INSERTs, so we can just re-use the existing lexer for INSERTs. Per bug #10611 from Jacek Zalewski. Back-patch to all active branches.
1 parent 4671c30 commit 6adddac

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,13 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
547547

548548
_selectOutputSchema(AH, "pg_catalog");
549549

550+
/* Send BLOB COMMENTS data to ExecuteSimpleCommands() */
551+
if (strcmp(te->desc, "BLOB COMMENTS") == 0)
552+
AH->outputKind = OUTPUT_OTHERDATA;
553+
550554
(*AH->PrintTocDataPtr) (AH, te, ropt);
555+
556+
AH->outputKind = OUTPUT_SQLCMDS;
551557
}
552558
else
553559
{

‎src/bin/pg_dump/pg_backup_db.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,14 @@ ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
333333
* identifiers, so that we can recognize statement-terminating semicolons.
334334
* We assume that INSERT data will not contain SQL comments, E'' literals,
335335
* or dollar-quoted strings, so this is much simpler than a full SQL lexer.
336+
*
337+
* Note: when restoring from a pre-9.0 dump file, this code is also used to
338+
* process BLOB COMMENTS data, which has the same problem of containing
339+
* multiple SQL commands that might be split across bufferloads. Fortunately,
340+
* that data won't contain anything complicated to lex either.
336341
*/
337342
static void
338-
ExecuteInsertCommands(ArchiveHandle *AH, const char *buf, size_t bufLen)
343+
ExecuteSimpleCommands(ArchiveHandle *AH, const char *buf, size_t bufLen)
339344
{
340345
const char *qry = buf;
341346
const char *eos = buf + bufLen;
@@ -419,9 +424,10 @@ ExecuteSqlCommandBuf(ArchiveHandle *AH, const char *buf, size_t bufLen)
419424
else if (AH->outputKind == OUTPUT_OTHERDATA)
420425
{
421426
/*
422-
* Table data expressed as INSERT commands.
427+
* Table data expressed as INSERT commands; or, in old dump files,
428+
* BLOB COMMENTS data (which is expressed as COMMENT ON commands).
423429
*/
424-
ExecuteInsertCommands(AH, buf, bufLen);
430+
ExecuteSimpleCommands(AH, buf, bufLen);
425431
}
426432
else
427433
{

‎src/bin/pg_dump/pg_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ dumpTableData_copy(Archive *fout, void *dcontext)
12191219
*
12201220
* Caution: when we restore from an archive file direct to database, the
12211221
* INSERT commands emitted by this function have to be parsed by
1222-
* pg_backup_db.c's ExecuteInsertCommands(), which will not handle comments,
1222+
* pg_backup_db.c's ExecuteSimpleCommands(), which will not handle comments,
12231223
* E'' strings, or dollar-quoted strings. So don't emit anything like that.
12241224
*/
12251225
static int

0 commit comments

Comments
 (0)
0