aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-04-16 17:26:41 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-04-16 17:26:41 -0400
commit2d3320d3d256eed7ea3deb8383348f2021e6a247 (patch)
tree86ec092a878f1fedcc95a53553664e67f270cf9a /src/backend/commands
parent121f49a00e432ee9cfad7270d99504350cd1015f (diff)
downloadpostgresql-2d3320d3d256eed7ea3deb8383348f2021e6a247.tar.gz
postgresql-2d3320d3d256eed7ea3deb8383348f2021e6a247.zip
Simplify reindex_relation's API.
For what seem entirely historical reasons, a bitmask "flags" argument was recently added to reindex_relation without subsuming its existing boolean argument into that bitmask. This seems a bit bizarre, so fold them together.
Diffstat (limited to 'src/backend/commands')
-rw-r--r--src/backend/commands/cluster.c6
-rw-r--r--src/backend/commands/indexcmds.c4
-rw-r--r--src/backend/commands/tablecmds.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 2cc2aaa8f64..10ec32c05de 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -1399,10 +1399,10 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
* so no chance to reclaim disk space before commit. We do not need a
* final CommandCounterIncrement() because reindex_relation does it.
*/
- reindex_flags = REINDEX_SUPPRESS_INDEX_USE;
+ reindex_flags = REINDEX_REL_SUPPRESS_INDEX_USE;
if (check_constraints)
- reindex_flags |= REINDEX_CHECK_CONSTRAINTS;
- reindex_relation(OIDOldHeap, false, reindex_flags);
+ reindex_flags |= REINDEX_REL_CHECK_CONSTRAINTS;
+ reindex_relation(OIDOldHeap, reindex_flags);
/* Destroy new heap with old filenode */
object.classId = RelationRelationId;
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 05e8234a0f2..2f4e751100d 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -1566,7 +1566,7 @@ ReindexTable(RangeVar *relation)
ReleaseSysCache(tuple);
- if (!reindex_relation(heapOid, true, 0))
+ if (!reindex_relation(heapOid, REINDEX_REL_PROCESS_TOAST))
ereport(NOTICE,
(errmsg("table \"%s\" has no indexes",
relation->relname)));
@@ -1679,7 +1679,7 @@ ReindexDatabase(const char *databaseName, bool do_system, bool do_user)
StartTransactionCommand();
/* functions in indexes may want a snapshot set */
PushActiveSnapshot(GetTransactionSnapshot());
- if (reindex_relation(relid, true, 0))
+ if (reindex_relation(relid, REINDEX_REL_PROCESS_TOAST))
ereport(NOTICE,
(errmsg("table \"%s.%s\" was reindexed",
get_namespace_name(get_rel_namespace(relid)),
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index fb39006e15f..35929b20d53 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -1080,7 +1080,7 @@ ExecuteTruncate(TruncateStmt *stmt)
/*
* Reconstruct the indexes to match, and we're done.
*/
- reindex_relation(heap_relid, true, 0);
+ reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST);
}
}