Skip to content

P
Postgres FD Implementation
Commit 9adda245 authored by Michael Paquier's avatar Michael Paquier
Browse files
Options

Refactor code of reindexdb for query generation 

This merges the portion related to REINDEX SYSTEM into the routine
already available for all the other reindex types, making the query
generation cleaner.  While on it, change the handling of the reindex
types using an enum, which allows to get rid of the hardcoded strings
used directly in the query generation present for the same purpose (aka
"TABLE", "DATABASE", etc.).

Per discussion with Julien Rouhaud, Tom Lane, Alvaro Herrera and me.

Author: Julien Rouhaud
Discussion: https://postgr.es/m/CAOBaU_bSmSik_WRK9niDnm-3NkNZky6+uKxkmQwvthZvMWpS5A@mail.gmail.com
parent c72f9b95
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 75 deletions
src/bin/scripts/reindexdb.c
View file @ 9adda245
...@@ -15,9 +15,18 @@ ...@@ -15,9 +15,18 @@
#include "fe_utils/simple_list.h" #include "fe_utils/simple_list.h"
#include "fe_utils/string_utils.h" #include "fe_utils/string_utils.h"
typedef enum ReindexType
{
REINDEX_DATABASE,
REINDEX_INDEX,
REINDEX_SCHEMA,
REINDEX_SYSTEM,
REINDEX_TABLE
} ReindexType;
static void reindex_one_database(const char *name, const char *dbname, static void reindex_one_database(const char *name, const char *dbname,
const char *type, const char *host, ReindexType type, const char *host,
const char *port, const char *username, const char *port, const char *username,
enum trivalue prompt_password, const char *progname, enum trivalue prompt_password, const char *progname,
bool echo, bool verbose, bool concurrently); bool echo, bool verbose, bool concurrently);
...@@ -26,11 +35,6 @@ static void reindex_all_databases(const char *maintenance_db, ...@@ -26,11 +35,6 @@ static void reindex_all_databases(const char *maintenance_db,
const char *username, enum trivalue prompt_password, const char *username, enum trivalue prompt_password,
const char *progname, bool echo, const char *progname, bool echo,
bool quiet, bool verbose, bool concurrently); bool quiet, bool verbose, bool concurrently);
static void reindex_system_catalogs(const char *dbname,
const char *host, const char *port,
const char *username, enum trivalue prompt_password,
const char *progname, bool echo, bool verbose,
bool concurrently);
static void help(const char *progname); static void help(const char *progname);
int int
...@@ -220,8 +224,9 @@ main(int argc, char *argv[]) ...@@ -220,8 +224,9 @@ main(int argc, char *argv[])
dbname = get_user_name_or_exit(progname); dbname = get_user_name_or_exit(progname);
} }
reindex_system_catalogs(dbname, host, port, username, prompt_password, reindex_one_database(NULL, dbname, REINDEX_SYSTEM, host,
progname, echo, verbose, concurrently); port, username, prompt_password, progname,
echo, verbose, concurrently);
} }
else else
{ {
...@@ -241,8 +246,9 @@ main(int argc, char *argv[]) ...@@ -241,8 +246,9 @@ main(int argc, char *argv[])
for (cell = schemas.head; cell; cell = cell->next) for (cell = schemas.head; cell; cell = cell->next)
{ {
reindex_one_database(cell->val, dbname, "SCHEMA", host, port, reindex_one_database(cell->val, dbname, REINDEX_SCHEMA, host,
username, prompt_password, progname, echo, verbose, concurrently); port, username, prompt_password, progname,
echo, verbose, concurrently);
} }
} }
...@@ -252,8 +258,9 @@ main(int argc, char *argv[]) ...@@ -252,8 +258,9 @@ main(int argc, char *argv[])
for (cell = indexes.head; cell; cell = cell->next) for (cell = indexes.head; cell; cell = cell->next)
{ {
reindex_one_database(cell->val, dbname, "INDEX", host, port, reindex_one_database(cell->val, dbname, REINDEX_INDEX, host,
username, prompt_password, progname, echo, verbose, concurrently); port, username, prompt_password, progname,
echo, verbose, concurrently);
} }
} }
if (tables.head != NULL) if (tables.head != NULL)
...@@ -262,8 +269,9 @@ main(int argc, char *argv[]) ...@@ -262,8 +269,9 @@ main(int argc, char *argv[])
for (cell = tables.head; cell; cell = cell->next) for (cell = tables.head; cell; cell = cell->next)
{ {
reindex_one_database(cell->val, dbname, "TABLE", host, port, reindex_one_database(cell->val, dbname, REINDEX_TABLE, host,
username, prompt_password, progname, echo, verbose, concurrently); port, username, prompt_password, progname,
echo, verbose, concurrently);
} }
} }
...@@ -272,21 +280,21 @@ main(int argc, char *argv[]) ...@@ -272,21 +280,21 @@ main(int argc, char *argv[])
* specified * specified
*/ */
if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL) if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
reindex_one_database(NULL, dbname, "DATABASE", host, port, reindex_one_database(NULL, dbname, REINDEX_DATABASE, host,
username, prompt_password, progname, echo, verbose, concurrently); port, username, prompt_password, progname,
echo, verbose, concurrently);
} }
exit(0); exit(0);
} }
static void static void
reindex_one_database(const char *name, const char *dbname, const char *type, reindex_one_database(const char *name, const char *dbname, ReindexType type,
const char *host, const char *port, const char *username, const char *host, const char *port, const char *username,
enum trivalue prompt_password, const char *progname, bool echo, enum trivalue prompt_password, const char *progname, bool echo,
bool verbose, bool concurrently) bool verbose, bool concurrently)
{ {
PQExpBufferData sql; PQExpBufferData sql;
PGconn *conn; PGconn *conn;
conn = connectDatabase(dbname, host, port, username, prompt_password, conn = connectDatabase(dbname, host, port, username, prompt_password,
...@@ -300,6 +308,7 @@ reindex_one_database(const char *name, const char *dbname, const char *type, ...@@ -300,6 +308,7 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
exit(1); exit(1);
} }
/* build the REINDEX query */
initPQExpBuffer(&sql); initPQExpBuffer(&sql);
appendPQExpBufferStr(&sql, "REINDEX "); appendPQExpBufferStr(&sql, "REINDEX ");
...@@ -307,33 +316,73 @@ reindex_one_database(const char *name, const char *dbname, const char *type, ...@@ -307,33 +316,73 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
if (verbose) if (verbose)
appendPQExpBufferStr(&sql, "(VERBOSE) "); appendPQExpBufferStr(&sql, "(VERBOSE) ");
appendPQExpBufferStr(&sql, type); /* object type */
appendPQExpBufferChar(&sql, ' '); switch (type)
{
case REINDEX_DATABASE:
appendPQExpBufferStr(&sql, "DATABASE ");
break;
case REINDEX_INDEX:
appendPQExpBufferStr(&sql, "INDEX ");
break;
case REINDEX_SCHEMA:
appendPQExpBufferStr(&sql, "SCHEMA ");
break;
case REINDEX_SYSTEM:
appendPQExpBufferStr(&sql, "SYSTEM ");
break;
case REINDEX_TABLE:
appendPQExpBufferStr(&sql, "TABLE ");
break;
}
if (concurrently) if (concurrently)
appendPQExpBufferStr(&sql, "CONCURRENTLY "); appendPQExpBufferStr(&sql, "CONCURRENTLY ");
if (strcmp(type, "TABLE") == 0 ||
strcmp(type, "INDEX") == 0) /* object name */
appendQualifiedRelation(&sql, name, conn, progname, echo); switch (type)
else if (strcmp(type, "SCHEMA") == 0) {
appendPQExpBufferStr(&sql, name); case REINDEX_DATABASE:
else if (strcmp(type, "DATABASE") == 0) case REINDEX_SYSTEM:
appendPQExpBufferStr(&sql, fmtId(PQdb(conn))); appendPQExpBufferStr(&sql, fmtId(PQdb(conn)));
break;
case REINDEX_INDEX:
case REINDEX_TABLE:
appendQualifiedRelation(&sql, name, conn, progname, echo);
break;
case REINDEX_SCHEMA:
appendPQExpBufferStr(&sql, name);
break;
}
/* finish the query */
appendPQExpBufferChar(&sql, ';'); appendPQExpBufferChar(&sql, ';');
if (!executeMaintenanceCommand(conn, sql.data, echo)) if (!executeMaintenanceCommand(conn, sql.data, echo))
{ {
if (strcmp(type, "TABLE") == 0) switch (type)
pg_log_error("reindexing of table \"%s\" in database \"%s\" failed: %s", {
name, PQdb(conn), PQerrorMessage(conn)); case REINDEX_DATABASE:
else if (strcmp(type, "INDEX") == 0) pg_log_error("reindexing of database \"%s\" failed: %s",
pg_log_error("reindexing of index \"%s\" in database \"%s\" failed: %s", PQdb(conn), PQerrorMessage(conn));
name, PQdb(conn), PQerrorMessage(conn)); break;
else if (strcmp(type, "SCHEMA") == 0) case REINDEX_INDEX:
pg_log_error("reindexing of schema \"%s\" in database \"%s\" failed: %s", pg_log_error("reindexing of index \"%s\" in database \"%s\" failed: %s",
name, PQdb(conn), PQerrorMessage(conn)); name, PQdb(conn), PQerrorMessage(conn));
else break;
pg_log_error("reindexing of database \"%s\" failed: %s", case REINDEX_SCHEMA:
PQdb(conn), PQerrorMessage(conn)); pg_log_error("reindexing of schema \"%s\" in database \"%s\" failed: %s",
name, PQdb(conn), PQerrorMessage(conn));
break;
case REINDEX_SYSTEM:
pg_log_error("reindexing of system catalogs on database \"%s\" failed: %s",
PQdb(conn), PQerrorMessage(conn));
break;
case REINDEX_TABLE:
pg_log_error("reindexing of table \"%s\" in database \"%s\" failed: %s",
name, PQdb(conn), PQerrorMessage(conn));
break;
}
PQfinish(conn); PQfinish(conn);
exit(1); exit(1);
} }
...@@ -374,7 +423,7 @@ reindex_all_databases(const char *maintenance_db, ...@@ -374,7 +423,7 @@ reindex_all_databases(const char *maintenance_db,
appendPQExpBuffer(&connstr, "dbname="); appendPQExpBuffer(&connstr, "dbname=");
appendConnStrVal(&connstr, dbname); appendConnStrVal(&connstr, dbname);
reindex_one_database(NULL, connstr.data, "DATABASE", host, reindex_one_database(NULL, connstr.data, REINDEX_DATABASE, host,
port, username, prompt_password, port, username, prompt_password,
progname, echo, verbose, concurrently); progname, echo, verbose, concurrently);
} }
...@@ -383,41 +432,6 @@ reindex_all_databases(const char *maintenance_db, ...@@ -383,41 +432,6 @@ reindex_all_databases(const char *maintenance_db,
PQclear(result); PQclear(result);
} }
static void
reindex_system_catalogs(const char *dbname, const char *host, const char *port,
const char *username, enum trivalue prompt_password,
const char *progname, bool echo, bool verbose, bool concurrently)
{
PGconn *conn;
PQExpBufferData sql;
conn = connectDatabase(dbname, host, port, username, prompt_password,
progname, echo, false, false);
initPQExpBuffer(&sql);
appendPQExpBuffer(&sql, "REINDEX");
if (verbose)
appendPQExpBuffer(&sql, " (VERBOSE)");
appendPQExpBufferStr(&sql, " SYSTEM ");
if (concurrently)
appendPQExpBuffer(&sql, "CONCURRENTLY ");
appendPQExpBufferStr(&sql, fmtId(PQdb(conn)));
appendPQExpBufferChar(&sql, ';');
if (!executeMaintenanceCommand(conn, sql.data, echo))
{
pg_log_error("reindexing of system catalogs failed: %s",
PQerrorMessage(conn));
PQfinish(conn);
exit(1);
}
PQfinish(conn);
termPQExpBuffer(&sql);
}
static void static void
help(const char *progname) help(const char *progname)
{ {
......
src/tools/pgindent/typedefs.list
View file @ 9adda245
...@@ -1981,6 +1981,7 @@ RegisNode ...@@ -1981,6 +1981,7 @@ RegisNode
RegisteredBgWorker RegisteredBgWorker
ReindexObjectType ReindexObjectType
ReindexStmt ReindexStmt
ReindexType
RelFileNode RelFileNode
RelFileNodeBackend RelFileNodeBackend
RelIdCacheEnt RelIdCacheEnt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment