database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-27 00:12:01 +03:00
Code Activity

Code review for --no-data-for-failed-tables patch. Instead of trashing

Browse Source 
one of the program's core data structures, make use of the existing
ability to selectively exclude TOC items by ID.  Slightly more code but
much less likely to create future maintenance problems.
This commit is contained in:
Tom Lane
2006-10-14 23:07:22 +00:00
parent f58eac82ee
commit 1314983fd3
4 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/pg_dump/pg_backup.h
View File

@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup.h,v 1.43 2006/10/04 00:30:05 momjian Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup.h,v 1.44 2006/10/14 23:07:22 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -112,15 +112,12 @@ typedef struct _restoreOptions
int noDataForFailedTables;
int requirePassword;
int exit_on_error;
bool *idWanted;
bool limitToList;
int compression;
int suppressDumpWarnings; /* Suppress output of WARNING entries
* to stderr */
bool single_txn;
bool *idWanted; /* array showing which dump IDs to emit */
} RestoreOptions;
/*
@@ -176,8 +173,9 @@ extern void PrintTOCSummary(Archive *AH, RestoreOptions *ropt);
extern RestoreOptions *NewRestoreOptions(void);
/* Rearrange TOC entries */
extern void SortTocFromFile(Archive *AH, RestoreOptions *ropt);
/* Rearrange and filter TOC entries */
extern void SortTocFromFile(Archive *AHX, RestoreOptions *ropt);
extern void InitDummyWantedList(Archive *AHX, RestoreOptions *ropt);
/* Convenience functions used only when writing DATA */
extern int archputs(const char *s, Archive *AH);

46
src/bin/pg_dump/pg_backup_archiver.c
View File

@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.136 2006/10/04 00:30:05 momjian Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.137 2006/10/14 23:07:22 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -279,23 +279,27 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
defnDumped = true;
/*
* If we could not create a table, ignore the respective TABLE
* DATA if -X no-data-for-failed-tables is given
* If we could not create a table and --no-data-for-failed-tables
* was given, ignore the corresponding TABLE DATA
*/
if (ropt->noDataForFailedTables && AH->lastErrorTE == te && strcmp(te->desc, "TABLE") == 0)
if (ropt->noDataForFailedTables &&
AH->lastErrorTE == te &&
strcmp(te->desc, "TABLE") == 0)
{
TocEntry *tes,
*last;
TocEntry *tes;
ahlog(AH, 1, "table %s could not be created, will not restore its data\n", te->tag);
ahlog(AH, 1, "table \"%s\" could not be created, will not restore its data\n",
te->tag);
for (last = te, tes = te->next; tes != AH->toc; last = tes, tes = tes->next)
for (tes = te->next; tes != AH->toc; tes = tes->next)
{
if (strcmp(tes->desc, "TABLE DATA") == 0 && strcmp(tes->tag, te->tag) == 0 &&
strcmp(tes->namespace ? tes->namespace : "", te->namespace ? te->namespace : "") == 0)
if (strcmp(tes->desc, "TABLE DATA") == 0 &&
strcmp(tes->tag, te->tag) == 0 &&
strcmp(tes->namespace ? tes->namespace : "",
te->namespace ? te->namespace : "") == 0)
{
/* remove this node */
last->next = tes->next;
/* mark it unwanted */
ropt->idWanted[tes->dumpId - 1] = false;
break;
}
}
@@ -789,7 +793,6 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
/* Allocate space for the 'wanted' array, and init it */
ropt->idWanted = (bool *) malloc(sizeof(bool) * AH->maxDumpId);
memset(ropt->idWanted, 0, sizeof(bool) * AH->maxDumpId);
ropt->limitToList = true;
/* Set prev entry as head of list */
tePrev = AH->toc;
@@ -837,6 +840,19 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
strerror(errno));
}
/*
* Set up a dummy ID filter that selects all dump IDs
*/
void
InitDummyWantedList(Archive *AHX, RestoreOptions *ropt)
{
ArchiveHandle *AH = (ArchiveHandle *) AHX;
/* Allocate space for the 'wanted' array, and init it to 1's */
ropt->idWanted = (bool *) malloc(sizeof(bool) * AH->maxDumpId);
memset(ropt->idWanted, 1, sizeof(bool) * AH->maxDumpId);
}
/**********************
* 'Convenience functions that look like standard IO functions
* for writing data when in dump mode.
@@ -2066,8 +2082,8 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
if (!te->defn || strlen(te->defn) == 0)
res = res & ~REQ_SCHEMA;
/* Finally, if we used a list, limit based on that as well */
if (ropt->limitToList && !ropt->idWanted[te->dumpId - 1])
/* Finally, if there's a per-ID filter, limit based on that as well */
if (ropt->idWanted && !ropt->idWanted[te->dumpId - 1])
return 0;
return res;

10
src/bin/pg_dump/pg_restore.c
View File

@@ -34,7 +34,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.83 2006/10/07 20:59:05 petere Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.84 2006/10/14 23:07:22 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -338,6 +338,14 @@ main(int argc, char **argv)
if (opts->tocFile)
SortTocFromFile(AH, opts);
else if (opts->noDataForFailedTables)
{
/*
* we implement this option by clearing idWanted entries, so must
* create a dummy idWanted array if there wasn't a tocFile
*/
InitDummyWantedList(AH, opts);
}
if (opts->tocSummary)
PrintTOCSummary(AH, opts);