diff options
Diffstat (limited to 'src/backend/commands')
-rw-r--r-- | src/backend/commands/indexcmds.c | 14 | ||||
-rw-r--r-- | src/backend/commands/opclasscmds.c | 10 | ||||
-rw-r--r-- | src/backend/commands/operatorcmds.c | 8 | ||||
-rw-r--r-- | src/backend/commands/tablecmds.c | 16 | ||||
-rw-r--r-- | src/backend/commands/tablespace.c | 4 | ||||
-rw-r--r-- | src/backend/commands/vacuumlazy.c | 13 |
6 files changed, 35 insertions, 30 deletions
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 86871e26a40..780dbc23ede 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.197 2010/06/01 00:33:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.198 2010/07/06 19:18:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -785,14 +785,14 @@ CheckMutability(Expr *expr) { /* * First run the expression through the planner. This has a couple of - * important consequences. First, function default arguments will get + * important consequences. First, function default arguments will get * inserted, which may affect volatility (consider "default now()"). * Second, inline-able functions will get inlined, which may allow us to - * conclude that the function is really less volatile than it's marked. - * As an example, polymorphic functions must be marked with the most - * volatile behavior that they have for any input type, but once we - * inline the function we may be able to conclude that it's not so - * volatile for the particular input type we're dealing with. + * conclude that the function is really less volatile than it's marked. As + * an example, polymorphic functions must be marked with the most volatile + * behavior that they have for any input type, but once we inline the + * function we may be able to conclude that it's not so volatile for the + * particular input type we're dealing with. * * We assume here that expression_planner() won't scribble on its input. */ diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 1cd7223095a..cae1a31546f 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.67 2010/07/03 13:53:13 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.68 2010/07/06 19:18:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1954,8 +1954,8 @@ AlterOpClassOwner(List *name, const char *access_method, Oid newOwnerId) void AlterOpClassOwner_oid(Oid opclassOid, Oid newOwnerId) { - HeapTuple tup; - Relation rel; + HeapTuple tup; + Relation rel; rel = heap_open(OperatorClassRelationId, RowExclusiveLock); @@ -2097,8 +2097,8 @@ AlterOpFamilyOwner(List *name, const char *access_method, Oid newOwnerId) void AlterOpFamilyOwner_oid(Oid opfamilyOid, Oid newOwnerId) { - HeapTuple tup; - Relation rel; + HeapTuple tup; + Relation rel; rel = heap_open(OperatorFamilyRelationId, RowExclusiveLock); diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index 2936c92a94e..fa84a9b9c82 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.46 2010/06/22 11:36:16 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.47 2010/07/06 19:18:56 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -89,9 +89,9 @@ DefineOperator(List *names, List *parameters) oprNamespace = QualifiedNameGetCreationNamespace(names, &oprName); /* - * The SQL standard committee has decided that => should be used for - * named parameters; therefore, a future release of PostgreSQL may - * disallow it as the name of a user-defined operator. + * The SQL standard committee has decided that => should be used for named + * parameters; therefore, a future release of PostgreSQL may disallow it + * as the name of a user-defined operator. */ if (strcmp(oprName, "=>") == 0) ereport(WARNING, diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 2ed8125fd6b..5f6e6fb0059 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.331 2010/07/01 14:10:21 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.332 2010/07/06 19:18:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1959,8 +1959,8 @@ renameatt(Oid myrelid, /* * Renaming the columns of sequences or toast tables doesn't actually * break anything from the system's point of view, since internal - * references are by attnum. But it doesn't seem right to allow users - * to change names that are hardcoded into the system, hence the following + * references are by attnum. But it doesn't seem right to allow users to + * change names that are hardcoded into the system, hence the following * restriction. */ relkind = RelationGetForm(targetrelation)->relkind; @@ -1970,8 +1970,8 @@ renameatt(Oid myrelid, relkind != RELKIND_INDEX) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("\"%s\" is not a table, view, composite type or index", - RelationGetRelationName(targetrelation)))); + errmsg("\"%s\" is not a table, view, composite type or index", + RelationGetRelationName(targetrelation)))); /* * permissions checking. only the owner of a class can change its schema. @@ -7049,9 +7049,9 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst, for (blkno = 0; blkno < nblocks; blkno++) { - /* If we got a cancel signal during the copy of the data, quit */ - CHECK_FOR_INTERRUPTS(); - + /* If we got a cancel signal during the copy of the data, quit */ + CHECK_FOR_INTERRUPTS(); + smgrread(src, forkNum, blkno, buf); /* XLOG stuff */ diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 24d15304f58..93f6fa03942 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -40,7 +40,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.75 2010/07/02 02:44:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.76 2010/07/06 19:18:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -554,7 +554,7 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid) (errcode(ERRCODE_UNDEFINED_FILE), errmsg("directory \"%s\" does not exist", location), InRecovery ? errhint("Create directory \"%s\" for this tablespace before " - "restarting the server.", location) : 0)); + "restarting the server.", location) : 0)); else ereport(ERROR, (errcode_for_file_access(), diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index 8a135f34af5..b3e74a62171 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -29,7 +29,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.135 2010/04/22 02:15:45 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.136 2010/07/06 19:18:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -399,9 +399,11 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats, vacrelstats); /* Remove tuples from heap */ lazy_vacuum_heap(onerel, vacrelstats); + /* * Forget the now-vacuumed tuples, and press on, but be careful - * not to reset latestRemovedXid since we want that value to be valid. + * not to reset latestRemovedXid since we want that value to be + * valid. */ vacrelstats->num_dead_tuples = 0; vacrelstats->num_index_scans++; @@ -491,7 +493,8 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats, * We count tuples removed by the pruning step as removed by VACUUM. */ tups_vacuumed += heap_page_prune(onerel, buf, OldestXmin, false, - &vacrelstats->latestRemovedXid); + &vacrelstats->latestRemovedXid); + /* * Now scan the page to collect vacuumable items and check for tuples * requiring freezing. @@ -682,9 +685,11 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats, { /* Remove tuples from heap */ lazy_vacuum_page(onerel, blkno, buf, 0, vacrelstats); + /* * Forget the now-vacuumed tuples, and press on, but be careful - * not to reset latestRemovedXid since we want that value to be valid. + * not to reset latestRemovedXid since we want that value to be + * valid. */ vacrelstats->num_dead_tuples = 0; vacuumed_pages++; |