diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 0a4c7d4..e0e37fb 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -22,6 +22,11 @@ PostgreSQL documentation REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } name [ FORCE ] +REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } name WITH ( options [, ...] ) + +where option can be one of: + + VERBOSE @@ -159,6 +164,15 @@ REINDEX { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } relpersistence); + reindex_index(indOid, false, indexRelation->relpersistence, verbose); return indOid; } @@ -1761,9 +1777,25 @@ RangeVarCallbackForReindexIndex(const RangeVar *relation, * Recreate all indexes of a table (and of its toast table, if any) */ Oid -ReindexTable(RangeVar *relation) +ReindexTable(RangeVar *relation, List *options) { Oid heapOid; + bool verbose = false; + ListCell *lc; + + /* Parse list of options */ + foreach(lc, options) + { + char *opt = (char *) lfirst(lc); + if (strcmp(opt, "verbose") == 0) + verbose = true; + else if (strcmp(opt, "force") == 0) + { /* Nothing to do */ } + else + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("unrecognized REINDEX option \"%s\"", opt))); + } /* The lock level used here should match reindex_relation(). */ heapOid = RangeVarGetRelidExtended(relation, ShareLock, false, false, @@ -1771,7 +1803,8 @@ ReindexTable(RangeVar *relation) if (!reindex_relation(heapOid, REINDEX_REL_PROCESS_TOAST | - REINDEX_REL_CHECK_CONSTRAINTS)) + REINDEX_REL_CHECK_CONSTRAINTS, + verbose)) ereport(NOTICE, (errmsg("table \"%s\" has no indexes", relation->relname))); @@ -1788,7 +1821,7 @@ ReindexTable(RangeVar *relation) * That means this must not be called within a user transaction block! */ void -ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind) +ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind, List *options) { Oid objectOid; Relation relationRelation; @@ -1800,12 +1833,31 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind) List *relids = NIL; ListCell *l; int num_keys; + bool verbose; + int elevel = DEBUG2; AssertArg(objectName); Assert(objectKind == REINDEX_OBJECT_SCHEMA || objectKind == REINDEX_OBJECT_SYSTEM || objectKind == REINDEX_OBJECT_DATABASE); + /* Parse list of options */ + foreach(l, options) + { + char *opt = (char *) lfirst(l); + if (strcmp(opt, "verbose") == 0) + { + verbose = true; + elevel = INFO; + } + else if (strcmp(opt, "force") == 0) + { /* Nothing to do */ } + else + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("unrecognized REINDEX option \"%s\"", opt))); + } + /* * Get OID of object to reindex, being the database currently being used * by session for a database or for system catalogs, or the schema defined @@ -1924,9 +1976,10 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind) PushActiveSnapshot(GetTransactionSnapshot()); if (reindex_relation(relid, REINDEX_REL_PROCESS_TOAST | - REINDEX_REL_CHECK_CONSTRAINTS)) - ereport(DEBUG1, - (errmsg("table \"%s.%s\" was reindexed", + REINDEX_REL_CHECK_CONSTRAINTS, + verbose)) + ereport(elevel, + (errmsg("indexes of whole table \"%s.%s\" were reindexed", get_namespace_name(get_rel_namespace(relid)), get_rel_name(relid)))); PopActiveSnapshot(); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 6536778..792fc00 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -1225,7 +1225,7 @@ ExecuteTruncate(TruncateStmt *stmt) /* * Reconstruct the indexes to match, and we're done. */ - reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST); + reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST, false); } pgstat_count_truncate(rel); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 581f7a1..e13eb2b 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -456,6 +456,12 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); %type explain_option_arg %type explain_option_elem %type explain_option_list + +%type reindex_option_name +%type reindex_target_type +%type reindex_target_multitable +%type reindex_option_list + %type copy_generic_opt_arg copy_generic_opt_arg_list_item %type copy_generic_opt_elem %type copy_generic_opt_list copy_generic_opt_arg_list @@ -7316,57 +7322,75 @@ opt_if_exists: IF_P EXISTS { $$ = TRUE; } * QUERY: * * REINDEX type [FORCE] + * REINDEX type WITH ( options ) * * FORCE no longer does anything, but we accept it for backwards compatibility *****************************************************************************/ ReindexStmt: - REINDEX INDEX qualified_name opt_force + REINDEX reindex_target_type qualified_name opt_force { ReindexStmt *n = makeNode(ReindexStmt); - n->kind = REINDEX_OBJECT_INDEX; + n->kind = $2; n->relation = $3; n->name = NULL; + n->options = NULL; $$ = (Node *)n; } - | REINDEX TABLE qualified_name opt_force + | REINDEX reindex_target_type qualified_name WITH '(' reindex_option_list ')' { ReindexStmt *n = makeNode(ReindexStmt); - n->kind = REINDEX_OBJECT_TABLE; + n->kind = $2; n->relation = $3; n->name = NULL; + n->options = $6; $$ = (Node *)n; } - | REINDEX SCHEMA name opt_force + | REINDEX reindex_target_multitable name opt_force { ReindexStmt *n = makeNode(ReindexStmt); - n->kind = REINDEX_OBJECT_SCHEMA; + n->kind = $2; n->name = $3; n->relation = NULL; + n->options = NULL; $$ = (Node *)n; } - | REINDEX SYSTEM_P name opt_force + | REINDEX reindex_target_multitable name WITH '(' reindex_option_list ')' { ReindexStmt *n = makeNode(ReindexStmt); - n->kind = REINDEX_OBJECT_SYSTEM; + n->kind = $2; n->name = $3; n->relation = NULL; + n->options = $6; $$ = (Node *)n; } - | REINDEX DATABASE name opt_force + ; +reindex_target_type: + INDEX { $$ = REINDEX_OBJECT_INDEX; } + | TABLE { $$ = REINDEX_OBJECT_TABLE; } +; +reindex_target_multitable: + SCHEMA { $$ = REINDEX_OBJECT_SCHEMA; } + | SYSTEM_P { $$ = REINDEX_OBJECT_SYSTEM; } + | DATABASE { $$ = REINDEX_OBJECT_DATABASE; } +; +opt_force: + FORCE { $$ = TRUE; } + | /* EMPTY */ { $$ = FALSE; } +; +reindex_option_list: + reindex_option_name { - ReindexStmt *n = makeNode(ReindexStmt); - n->kind = REINDEX_OBJECT_DATABASE; - n->name = $3; - n->relation = NULL; - $$ = (Node *)n; + $$ = list_make1($1); } - ; - -opt_force: FORCE { $$ = TRUE; } - | /* EMPTY */ { $$ = FALSE; } - ; - + | reindex_option_list ',' reindex_option_name + { + $$ = lappend($1, $3); + } +; +reindex_option_name: + VERBOSE { $$ = "verbose"; } +; /***************************************************************************** * diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 126e38d..0b41701 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -737,10 +737,10 @@ standard_ProcessUtility(Node *parsetree, switch (stmt->kind) { case REINDEX_OBJECT_INDEX: - ReindexIndex(stmt->relation); + ReindexIndex(stmt->relation, stmt->options); break; case REINDEX_OBJECT_TABLE: - ReindexTable(stmt->relation); + ReindexTable(stmt->relation, stmt->options); break; case REINDEX_OBJECT_SCHEMA: case REINDEX_OBJECT_SYSTEM: @@ -756,7 +756,7 @@ standard_ProcessUtility(Node *parsetree, (stmt->kind == REINDEX_OBJECT_SCHEMA) ? "REINDEX SCHEMA" : (stmt->kind == REINDEX_OBJECT_SYSTEM) ? "REINDEX SYSTEM" : "REINDEX DATABASE"); - ReindexMultipleTables(stmt->name, stmt->kind); + ReindexMultipleTables(stmt->name, stmt->kind, stmt->options); break; default: elog(ERROR, "unrecognized object type: %d", diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index e39a07c..d3835c8 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3342,7 +3342,7 @@ psql_completion(const char *text, int start, int end) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL); else if (pg_strcasecmp(prev_wd, "INDEX") == 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL); - else if (pg_strcasecmp(prev_wd, "SCHEMA") == 0 ) + else if (pg_strcasecmp(prev_wd, "SCHEMA") == 0) COMPLETE_WITH_QUERY(Query_for_list_of_schemas); else if (pg_strcasecmp(prev_wd, "SYSTEM") == 0 || pg_strcasecmp(prev_wd, "DATABASE") == 0) diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index e7cc7a0..48f8660 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -112,7 +112,7 @@ extern void validate_index(Oid heapId, Oid indexId, Snapshot snapshot); extern void index_set_state_flags(Oid indexId, IndexStateFlagsAction action); extern void reindex_index(Oid indexId, bool skip_constraint_checks, - char relpersistence); + char relpersistence, bool verbose); /* Flag bits for reindex_relation(): */ #define REINDEX_REL_PROCESS_TOAST 0x01 @@ -121,7 +121,7 @@ extern void reindex_index(Oid indexId, bool skip_constraint_checks, #define REINDEX_REL_FORCE_INDEXES_UNLOGGED 0x08 #define REINDEX_REL_FORCE_INDEXES_PERMANENT 0x10 -extern bool reindex_relation(Oid relid, int flags); +extern bool reindex_relation(Oid relid, int flags, bool verbose); extern bool ReindexIsProcessingHeap(Oid heapOid); extern bool ReindexIsProcessingIndex(Oid indexOid); diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index a9c6783..0b5d023 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -29,9 +29,9 @@ extern ObjectAddress DefineIndex(Oid relationId, bool check_rights, bool skip_build, bool quiet); -extern Oid ReindexIndex(RangeVar *indexRelation); -extern Oid ReindexTable(RangeVar *relation); -extern void ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind); +extern Oid ReindexIndex(RangeVar *indexRelation, List *options); +extern Oid ReindexTable(RangeVar *relation, List *optionsc); +extern void ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind, List *options); extern char *makeObjectName(const char *name1, const char *name2, const char *label); extern char *ChooseRelationName(const char *name1, const char *name2, diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index ac13302..fb98fa7 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -2747,6 +2747,7 @@ typedef struct ReindexStmt ReindexObjectType kind; /* REINDEX_OBJECT_INDEX, REINDEX_OBJECT_TABLE, etc. */ RangeVar *relation; /* Table or index to reindex */ const char *name; /* name of database to reindex */ + List *options; /* list of options */ } ReindexStmt; /* ----------------------