database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-21 02:52:47 +03:00
Code Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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"));