opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Support multiple -t/--table arguments for more commands 

On top of the previous support in pg_dump, add support to specify
multiple tables (by using the -t option multiple times) to
pg_restore, clsuterdb, reindexdb and vacuumdb.

Josh Kupershmidt, reviewed by Karl O. Pinc
This commit is contained in:
Magnus Hagander 2013-01-17 11:24:47 +01:00
parent 36bdfa52a0
commit f3af53441e
15 changed files with 191 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/src/sgml/ref/clusterdb.sgml
View File

@ -24,7 +24,17 @@ PostgreSQL documentation
<command>clusterdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<group choice="opt"><arg choice="plain"><option>--verbose</option></arg><arg choice="plain"><option>-v</option></arg></group>
<arg choice="opt"><group choice="plain"><arg choice="plain"><option>--table</option></arg><arg choice="plain"><option>-t</option></arg></group> <replaceable>table</replaceable> </arg>
<arg choice="plain" rep="repeat">
<arg choice="opt">
<group choice="plain">
<arg choice="plain"><option>--table</option></arg>
<arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
</arg>
</arg>
<arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
@ -117,6 +127,8 @@ PostgreSQL documentation
<listitem>
<para>
Cluster <replaceable class="parameter">table</replaceable> only.
Multiple tables can be clustered by writing multiple
<option>-t</> switches.
</para>
</listitem>
</varlistentry>

3
doc/src/sgml/ref/pg_restore.sgml
View File

@ -400,7 +400,8 @@
<term><option>--table=<replaceable class="parameter">table</replaceable></option></term>
<listitem>
<para>
Restore definition and/or data of named table only. This can be
Restore definition and/or data of named table only. Multiple tables
may be specified with multiple <option>-t</> switches. This can be
combined with the <option>-n</option> option to specify a schema.
</para>
</listitem>

39
doc/src/sgml/ref/reindexdb.sgml
View File

@ -23,20 +23,27 @@ PostgreSQL documentation
<cmdsynopsis>
<command>reindexdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<group choice="opt">
<group choice="plain">
<arg choice="plain"><option>--table</option></arg>
<arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
</group>
<group choice="opt">
<group choice="plain">
<arg choice="plain"><option>--index</option></arg>
<arg choice="plain"><option>-i</option></arg>
</group>
<replaceable>index</replaceable>
</group>
<arg choice="plain" rep="repeat">
<arg choice="opt">
<group choice="plain">
<arg choice="plain"><option>--table</option></arg>
<arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
</arg>
</arg>
<arg choice="plain" rep="repeat">
<arg choice="opt">
<group choice="plain">
<arg choice="plain"><option>--index</option></arg>
<arg choice="plain"><option>-i</option></arg>
</group>
<replaceable>index</replaceable>
</arg>
</arg>
<arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
@ -128,6 +135,8 @@ PostgreSQL documentation
<listitem>
<para>
Recreate <replaceable class="parameter">index</replaceable> only.
Multiple indexes can be recreated by writing multiple
<option>-i</> switches.
</para>
</listitem>
</varlistentry>
@ -158,6 +167,8 @@ PostgreSQL documentation
<listitem>
<para>
Reindex <replaceable class="parameter">table</replaceable> only.
Multiple tables can be reindexed by writing multiple
<option>-t</> switches.
</para>
</listitem>
</varlistentry>

20
doc/src/sgml/ref/vacuumdb.sgml
View File

@ -24,14 +24,18 @@ PostgreSQL documentation
<command>vacuumdb</command>
<arg rep="repeat"><replaceable>connection-option</replaceable></arg>
<arg rep="repeat"><replaceable>option</replaceable></arg>
<arg choice="opt">
<group choice="plain">
<arg choice="plain"><option>--table</option></arg>
<arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
<arg choice="opt">( <replaceable class="parameter">column</replaceable> [,...] )</arg>
<arg choice="plain" rep="repeat">
<arg choice="opt">
<group choice="plain">
<arg choice="plain"><option>--table</option></arg>
<arg choice="plain"><option>-t</option></arg>
</group>
<replaceable>table</replaceable>
<arg choice="opt">( <replaceable class="parameter">column</replaceable> [,...] )</arg>
</arg>
</arg>
<arg choice="opt"><replaceable>dbname</replaceable></arg>
</cmdsynopsis>
@ -147,6 +151,8 @@ PostgreSQL documentation
Clean or analyze <replaceable class="parameter">table</replaceable> only.
Column names can be specified only in conjunction with
the <option>--analyze</option> or <option>--analyze-only</option> options.
Multiple tables can be vacuumed by writing multiple
<option>-t</> switches.
</para>
<tip>
<para>

31
src/bin/pg_dump/common.c
View File

@ -898,24 +898,6 @@ simple_oid_list_append(SimpleOidList *list, Oid val)
list->tail = cell;
}
void
simple_string_list_append(SimpleStringList *list, const char *val)
{
SimpleStringListCell *cell;
/* this calculation correctly accounts for the null trailing byte */
cell = (SimpleStringListCell *)
pg_malloc(sizeof(SimpleStringListCell) + strlen(val));
cell->next = NULL;
strcpy(cell->val, val);
if (list->tail)
list->tail->next = cell;
else
list->head = cell;
list->tail = cell;
}
bool
simple_oid_list_member(SimpleOidList *list, Oid val)
{
@ -928,16 +910,3 @@ simple_oid_list_member(SimpleOidList *list, Oid val)
}
return false;
}
bool
simple_string_list_member(SimpleStringList *list, const char *val)
{
SimpleStringListCell *cell;
for (cell = list->head; cell; cell = cell->next)
{
if (strcmp(cell->val, val) == 0)
return true;
}
return false;
}

33
src/bin/pg_dump/dumputils.c
View File

@ -17,6 +17,7 @@
#include <ctype.h>
#include "dumputils.h"
#include "dumpmem.h"
#include "parser/keywords.h"
@ -1352,3 +1353,35 @@ exit_nicely(int code)
exit(code);
}
void
simple_string_list_append(SimpleStringList *list, const char *val)
{
SimpleStringListCell *cell;
/* this calculation correctly accounts for the null trailing byte */
cell = (SimpleStringListCell *)
pg_malloc(sizeof(SimpleStringListCell) + strlen(val));
cell->next = NULL;
strcpy(cell->val, val);
if (list->tail)
list->tail->next = cell;
else
list->head = cell;
list->tail = cell;
}
bool
simple_string_list_member(SimpleStringList *list, const char *val)
{
SimpleStringListCell *cell;
for (cell = list->head; cell; cell = cell->next)
{
if (strcmp(cell->val, val) == 0)
return true;
}
return false;
}

17
src/bin/pg_dump/dumputils.h
View File

@ -27,6 +27,19 @@ typedef enum /* bits returned by set_dump_section */
DUMP_UNSECTIONED = 0xff
} DumpSections;
typedef struct SimpleStringListCell
{
struct SimpleStringListCell *next;
char val[1]; /* VARIABLE LENGTH FIELD */
} SimpleStringListCell;
typedef struct SimpleStringList
{
SimpleStringListCell *head;
SimpleStringListCell *tail;
} SimpleStringList;
typedef void (*on_exit_nicely_callback) (int code, void *arg);
extern int quote_all_identifiers;
@ -75,4 +88,8 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3), noreturn));
extern void on_exit_nicely(on_exit_nicely_callback function, void *arg);
extern void exit_nicely(int code) __attribute__((noreturn));
extern void simple_string_list_append(SimpleStringList *list, const char *val);
extern bool simple_string_list_member(SimpleStringList *list, const char *val);
#endif /* DUMPUTILS_H */

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

@ -26,6 +26,7 @@
#include "postgres_fe.h"
#include "pg_dump.h"
#include "dumputils.h"
#include "libpq-fe.h"
@ -125,9 +126,9 @@ typedef struct _restoreOptions
int selTable;
char *indexNames;
char *functionNames;
char *tableNames;
char *schemaNames;
char *triggerNames;
SimpleStringList tableNames;
int useDB;
char *dbname;

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

@ -2493,7 +2493,7 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
{
if (!ropt->selTable)
return 0;
if (ropt->tableNames && strcmp(ropt->tableNames, te->tag) != 0)
if (ropt->tableNames.head != NULL && (!(simple_string_list_member(&ropt->tableNames, te->tag))))
return 0;
}
else if (strcmp(te->desc, "INDEX") == 0)

13
src/bin/pg_dump/pg_dump.h
View File

@ -58,17 +58,6 @@ typedef struct SimpleOidList
SimpleOidListCell *tail;
} SimpleOidList;
typedef struct SimpleStringListCell
{
struct SimpleStringListCell *next;
char val[1]; /* VARIABLE LENGTH FIELD */
} SimpleStringListCell;
typedef struct SimpleStringList
{
SimpleStringListCell *head;
SimpleStringListCell *tail;
} SimpleStringList;
/*
* The data structures used to store system catalog information. Every
@ -533,9 +522,7 @@ extern CollInfo *findCollationByOid(Oid oid);
extern NamespaceInfo *findNamespaceByOid(Oid oid);
extern void simple_oid_list_append(SimpleOidList *list, Oid val);
extern void simple_string_list_append(SimpleStringList *list, const char *val);
extern bool simple_oid_list_member(SimpleOidList *list, Oid val);
extern bool simple_string_list_member(SimpleStringList *list, const char *val);
extern void parseOidArray(const char *str, Oid *array, int arraysize);

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

@ -234,7 +234,7 @@ main(int argc, char **argv)
case 't': /* Dump data for this table only */
opts->selTypes = 1;
opts->selTable = 1;
opts->tableNames = pg_strdup(optarg);
simple_string_list_append(&opts->tableNames, optarg);
break;
case 'U':
@ -424,7 +424,7 @@ usage(const char *progname)
printf(_(" -P, --function=NAME(args) restore named function\n"));
printf(_(" -s, --schema-only restore only the schema, no data\n"));
printf(_(" -S, --superuser=NAME superuser user name to use for disabling triggers\n"));
printf(_(" -t, --table=NAME restore named table\n"));
printf(_(" -t, --table=NAME restore named table(s)\n"));
printf(_(" -T, --trigger=NAME restore named trigger\n"));
printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n"));
printf(_(" -1, --single-transaction restore as a single transaction\n"));

2
src/bin/scripts/Makefile
View File

@ -32,7 +32,7 @@ dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq
droplang: droplang.o common.o print.o mbprint.o | submake-libpq
dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq
clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq
vacuumdb: vacuumdb.o common.o | submake-libpq
vacuumdb: vacuumdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq
reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq
dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%

29
src/bin/scripts/clusterdb.c
View File

@ -58,8 +58,8 @@ main(int argc, char *argv[])
bool echo = false;
bool quiet = false;
bool alldb = false;
char *table = NULL;
bool verbose = false;
SimpleStringList tables = {NULL, NULL};
progname = get_progname(argv[0]);
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pgscripts"));
@ -98,7 +98,7 @@ main(int argc, char *argv[])
alldb = true;
break;
case 't':
table = pg_strdup(optarg);
simple_string_list_append(&tables, optarg);
break;
case 'v':
verbose = true;
@ -140,9 +140,10 @@ main(int argc, char *argv[])
progname);
exit(1);
}
if (table)
if (tables.head != NULL)
{
fprintf(stderr, _("%s: cannot cluster a specific table in all databases\n"),
fprintf(stderr, _("%s: cannot cluster specific table(s) in all databases\n"),
progname);
exit(1);
}
@ -162,9 +163,21 @@ main(int argc, char *argv[])
dbname = get_user_name(progname);
}
cluster_one_database(dbname, verbose, table,
host, port, username, prompt_password,
progname, echo);
if (tables.head != NULL)
{
SimpleStringListCell *cell;
for (cell = tables.head; cell; cell = cell->next)
{
cluster_one_database(dbname, verbose, cell->val,
host, port, username, prompt_password,
progname, echo);
}
}
else
cluster_one_database(dbname, verbose, NULL,
host, port, username, prompt_password,
progname, echo);
}
exit(0);
@ -253,7 +266,7 @@ help(const char *progname)
printf(_(" -d, --dbname=DBNAME database to cluster\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" -t, --table=TABLE cluster specific table only\n"));
printf(_(" -t, --table=TABLE cluster specific table(s) only\n"));
printf(_(" -v, --verbose write a lot of output\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n"));

58
src/bin/scripts/reindexdb.c
View File

@ -64,8 +64,8 @@ main(int argc, char *argv[])
bool alldb = false;
bool echo = false;
bool quiet = false;
const char *table = NULL;
const char *index = NULL;
SimpleStringList indexes = {NULL, NULL};
SimpleStringList tables = {NULL, NULL};
progname = get_progname(argv[0]);
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pgscripts"));
@ -108,10 +108,10 @@ main(int argc, char *argv[])
syscatalog = true;
break;
case 't':
table = pg_strdup(optarg);
simple_string_list_append(&tables, optarg);
break;
case 'i':
index = pg_strdup(optarg);
simple_string_list_append(&indexes, optarg);
break;
case 2:
maintenance_db = pg_strdup(optarg);
@ -154,14 +154,14 @@ main(int argc, char *argv[])
fprintf(stderr, _("%s: cannot reindex all databases and system catalogs at the same time\n"), progname);
exit(1);
}
if (table)
if (tables.head != NULL)
{
fprintf(stderr, _("%s: cannot reindex a specific table in all databases\n"), progname);
fprintf(stderr, _("%s: cannot reindex specific table(s) in all databases\n"), progname);
exit(1);
}
if (index)
if (indexes.head != NULL)
{
fprintf(stderr, _("%s: cannot reindex a specific index in all databases\n"), progname);
fprintf(stderr, _("%s: cannot reindex specific index(es) in all databases\n"), progname);
exit(1);
}
@ -170,14 +170,14 @@ main(int argc, char *argv[])
}
else if (syscatalog)
{
if (table)
if (tables.head != NULL)
{
fprintf(stderr, _("%s: cannot reindex a specific table and system catalogs at the same time\n"), progname);
fprintf(stderr, _("%s: cannot reindex specific table(s) and system catalogs at the same time\n"), progname);
exit(1);
}
if (index)
if (indexes.head != NULL)
{
fprintf(stderr, _("%s: cannot reindex a specific index and system catalogs at the same time\n"), progname);
fprintf(stderr, _("%s: cannot reindex specific index(es) and system catalogs at the same time\n"), progname);
exit(1);
}
@ -206,14 +206,28 @@ main(int argc, char *argv[])
dbname = get_user_name(progname);
}
if (index)
reindex_one_database(index, dbname, "INDEX", host, port,
username, prompt_password, progname, echo);
if (table)
reindex_one_database(table, dbname, "TABLE", host, port,
username, prompt_password, progname, echo);
/* reindex database only if index or table is not specified */
if (index == NULL && table == NULL)
if (indexes.head != NULL)
{
SimpleStringListCell *cell;
for (cell = indexes.head; cell; cell = cell->next)
{
reindex_one_database(cell->val, dbname, "INDEX", host, port,
username, prompt_password, progname, echo);
}
}
if (tables.head != NULL)
{
SimpleStringListCell *cell;
for (cell = tables.head; cell; cell = cell->next)
{
reindex_one_database(cell->val, dbname, "TABLE", host, port,
username, prompt_password, progname, echo);
}
}
/* reindex database only if neither index nor table is specified */
if (indexes.head == NULL && tables.head == NULL)
reindex_one_database(dbname, dbname, "DATABASE", host, port,
username, prompt_password, progname, echo);
}
@ -331,10 +345,10 @@ help(const char *progname)
printf(_(" -a, --all reindex all databases\n"));
printf(_(" -d, --dbname=DBNAME database to reindex\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
printf(_(" -i, --index=INDEX recreate specific index only\n"));
printf(_(" -i, --index=INDEX recreate specific index(es) only\n"));
printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" -s, --system reindex system catalogs\n"));
printf(_(" -t, --table=TABLE reindex specific table only\n"));
printf(_(" -t, --table=TABLE reindex specific table(s) only\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nConnection options:\n"));

34
src/bin/scripts/vacuumdb.c
View File

@ -12,6 +12,7 @@
#include "postgres_fe.h"
#include "common.h"
#include "dumputils.h"
static void vacuum_one_database(const char *dbname, bool full, bool verbose,
@ -68,9 +69,9 @@ main(int argc, char *argv[])
bool analyze_only = false;
bool freeze = false;
bool alldb = false;
char *table = NULL;
bool full = false;
bool verbose = false;
SimpleStringList tables = {NULL, NULL};
progname = get_progname(argv[0]);
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pgscripts"));
@ -118,7 +119,7 @@ main(int argc, char *argv[])
alldb = true;
break;
case 't':
table = pg_strdup(optarg);
simple_string_list_append(&tables, optarg);
break;
case 'f':
full = true;
@ -181,9 +182,9 @@ main(int argc, char *argv[])
progname);
exit(1);
}
if (table)
if (tables.head != NULL)
{
fprintf(stderr, _("%s: cannot vacuum a specific table in all databases\n"),
fprintf(stderr, _("%s: cannot vacuum specific table(s) in all databases\n"),
progname);
exit(1);
}
@ -204,10 +205,25 @@ main(int argc, char *argv[])
dbname = get_user_name(progname);
}
vacuum_one_database(dbname, full, verbose, and_analyze, analyze_only,
freeze, table,
host, port, username, prompt_password,
progname, echo);
if (tables.head != NULL)
{
SimpleStringListCell *cell;
for (cell = tables.head; cell; cell = cell->next)
{
vacuum_one_database(dbname, full, verbose, and_analyze,
analyze_only,
freeze, cell->val,
host, port, username, prompt_password,
progname, echo);
}
}
else
vacuum_one_database(dbname, full, verbose, and_analyze,
analyze_only,
freeze, NULL,
host, port, username, prompt_password,
progname, echo);
}
exit(0);
@ -348,7 +364,7 @@ help(const char *progname)
printf(_(" -f, --full do full vacuuming\n"));
printf(_(" -F, --freeze freeze row transaction information\n"));
printf(_(" -q, --quiet don't write any messages\n"));
printf(_(" -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"));
printf(_(" -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"));
printf(_(" -v, --verbose write a lot of output\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -z, --analyze update optimizer statistics\n"));