diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/access/transam/multixact.c | 8 | ||||
-rw-r--r-- | src/backend/catalog/aclchk.c | 2 | ||||
-rw-r--r-- | src/backend/catalog/namespace.c | 6 | ||||
-rw-r--r-- | src/backend/executor/README | 4 | ||||
-rw-r--r-- | src/backend/executor/execScan.c | 3 | ||||
-rw-r--r-- | src/backend/executor/execTuples.c | 2 | ||||
-rw-r--r-- | src/backend/executor/nodeProjectSet.c | 4 | ||||
-rw-r--r-- | src/backend/executor/nodeRecursiveunion.c | 4 | ||||
-rw-r--r-- | src/backend/lib/dshash.c | 2 | ||||
-rw-r--r-- | src/backend/postmaster/autovacuum.c | 2 | ||||
-rw-r--r-- | src/backend/replication/basebackup.c | 2 | ||||
-rw-r--r-- | src/backend/storage/buffer/localbuf.c | 2 | ||||
-rw-r--r-- | src/backend/storage/ipc/procarray.c | 9 | ||||
-rw-r--r-- | src/backend/storage/lmgr/predicate.c | 2 | ||||
-rw-r--r-- | src/backend/storage/smgr/md.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/tsrank.c | 2 | ||||
-rw-r--r-- | src/backend/utils/misc/tzparser.c | 3 |
17 files changed, 29 insertions, 31 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index fad859a812e..2e169dd3f92 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -367,8 +367,10 @@ static bool SetOffsetVacuumLimit(bool is_startup); static bool find_multixact_start(MultiXactId multi, MultiXactOffset *result); static void WriteMZeroPageXlogRec(int pageno, uint8 info); static void WriteMTruncateXlogRec(Oid oldestMultiDB, - MultiXactId startOff, MultiXactId endOff, - MultiXactOffset startMemb, MultiXactOffset endMemb); + MultiXactId startTruncOff, + MultiXactId endTruncOff, + MultiXactOffset startTruncMemb, + MultiXactOffset endTruncMemb); /* @@ -2784,7 +2786,7 @@ ReadMultiXactCounts(uint32 *multixacts, MultiXactOffset *members) /* * Multixact members can be removed once the multixacts that refer to them - * are older than every datminxmid. autovacuum_multixact_freeze_max_age and + * are older than every datminmxid. autovacuum_multixact_freeze_max_age and * vacuum_multixact_freeze_table_age work together to make sure we never have * too many multixacts; we hope that, at least under normal circumstances, * this will also be sufficient to keep us from using too many offsets. diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 2797af35c3d..291412e305b 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -1641,7 +1641,7 @@ expand_all_col_privileges(Oid table_oid, Form_pg_class classForm, /* * This processes attributes, but expects to be called from - * ExecGrant_Relation, not directly from ExecGrantStmt. + * ExecGrant_Relation, not directly from ExecuteGrantStmt. */ static void ExecGrant_Attribute(InternalGrant *istmt, Oid relOid, const char *relname, diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 97b911679cf..05c6ca81b98 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -504,9 +504,9 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation) * permission on the target namespace, this function will instead signal * an ERROR. * - * If non-NULL, *existing_oid is set to the OID of any existing relation with - * the same name which already exists in that namespace, or to InvalidOid if - * no such relation exists. + * If non-NULL, *existing_relation_id is set to the OID of any existing relation + * with the same name which already exists in that namespace, or to InvalidOid + * if no such relation exists. * * If lockmode != NoLock, the specified lock mode is acquired on the existing * relation, if any, provided that the current user owns the target relation. diff --git a/src/backend/executor/README b/src/backend/executor/README index 05f197bc75b..18b2ac18659 100644 --- a/src/backend/executor/README +++ b/src/backend/executor/README @@ -186,9 +186,9 @@ Expression Evaluation To allow for different methods of expression evaluation, and for better branch/jump target prediction, expressions are evaluated by -calling ExprState->evalfunc (via ExprEvalExpr() and friends). +calling ExprState->evalfunc (via ExecEvalExpr() and friends). -ExprReadyExpr() can choose the method of interpretation by setting +ExecReadyExpr() can choose the method of interpretation by setting evalfunc to an appropriate function. The default execution function, ExecInterpExpr, is implemented in execExprInterp.c; see its header comment for details. Special-case evalfuncs are used for certain diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c index 67c4be5108f..c0e4a5376c3 100644 --- a/src/backend/executor/execScan.c +++ b/src/backend/executor/execScan.c @@ -98,8 +98,7 @@ ExecScanFetch(ScanState *node, * ExecScan * * Scans the relation using the 'access method' indicated and - * returns the next qualifying tuple in the direction specified - * in the global variable ExecDirection. + * returns the next qualifying tuple. * The access method returns the next tuple and ExecScan() is * responsible for checking the tuple returned against the qual-clause. * diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index a5cb7bba0f8..5ee2a464bb4 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -1148,7 +1148,7 @@ ExecAllocTableSlot(List **tupleTable, TupleDesc desc, * This releases any resources (buffer pins, tupdesc refcounts) * held by the tuple table, and optionally releases the memory * occupied by the tuple table data structure. - * It is expected that this routine be called by EndPlan(). + * It is expected that this routine be called by ExecEndPlan(). * -------------------------------- */ void diff --git a/src/backend/executor/nodeProjectSet.c b/src/backend/executor/nodeProjectSet.c index 277d2783711..facdb4232e6 100644 --- a/src/backend/executor/nodeProjectSet.c +++ b/src/backend/executor/nodeProjectSet.c @@ -196,8 +196,8 @@ ExecProjectSRF(ProjectSetState *node, bool continuing) Assert(hassrf); /* - * If all the SRFs returned EndResult, we consider that as no row being - * produced. + * If all the SRFs returned ExprEndResult, we consider that as no row + * being produced. */ if (hasresult) { diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index 9c5eed7def3..81deb61c215 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -160,7 +160,7 @@ ExecRecursiveUnion(PlanState *pstate) } /* ---------------------------------------------------------------- - * ExecInitRecursiveUnionScan + * ExecInitRecursiveUnion * ---------------------------------------------------------------- */ RecursiveUnionState * @@ -263,7 +263,7 @@ ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags) } /* ---------------------------------------------------------------- - * ExecEndRecursiveUnionScan + * ExecEndRecursiveUnion * * frees any storage allocated through C routines. * ---------------------------------------------------------------- diff --git a/src/backend/lib/dshash.c b/src/backend/lib/dshash.c index 24dd3722521..350f8c0a665 100644 --- a/src/backend/lib/dshash.c +++ b/src/backend/lib/dshash.c @@ -409,7 +409,7 @@ dshash_find(dshash_table *hash_table, const void *key, bool exclusive) } else { - /* The caller will free the lock by calling dshash_release. */ + /* The caller will free the lock by calling dshash_release_lock. */ hash_table->find_locked = true; hash_table->find_exclusively_locked = exclusive; return ENTRY_FROM_ITEM(item); diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index fd85b9c8f44..073f313337d 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -1069,7 +1069,7 @@ rebuild_database_list(Oid newdb) current_time = GetCurrentTimestamp(); /* - * move the elements from the array into the dllist, setting the + * move the elements from the array into the dlist, setting the * next_worker while walking the array */ for (i = 0; i < nelems; i++) diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index 7a1b38466b8..57f17e14181 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -1074,7 +1074,7 @@ sendDir(const char *path, int basepathlen, bool sizeonly, List *tablespaces, * error in that case. The error handler further up will call * do_pg_abort_backup() for us. Also check that if the backup was * started while still in recovery, the server wasn't promoted. - * dp_pg_stop_backup() will check that too, but it's better to stop + * do_pg_stop_backup() will check that too, but it's better to stop * the backup early than continue to the end and fail there. */ CHECK_FOR_INTERRUPTS(); diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 391b6d6e16f..f5f6a29222b 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -361,7 +361,7 @@ DropRelFileNodeLocalBuffers(RelFileNode rnode, ForkNumber forkNum, * This function removes from the buffer pool all pages of all forks * of the specified relation. * - * See DropRelFileNodeAllBuffers in bufmgr.c for more notes. + * See DropRelFileNodesAllBuffers in bufmgr.c for more notes. */ void DropRelFileNodeAllLocalBuffers(RelFileNode rnode) diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 18a0f62ba67..ea02973dc73 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -1428,10 +1428,11 @@ GetOldestXmin(Relation rel, int flags) result = replication_slot_xmin; /* - * After locks have been released and defer_cleanup_age has been applied, - * check whether we need to back up further to make logical decoding - * possible. We need to do so if we're computing the global limit (rel = - * NULL) or if the passed relation is a catalog relation of some kind. + * After locks have been released and vacuum_defer_cleanup_age has been + * applied, check whether we need to back up further to make logical + * decoding possible. We need to do so if we're computing the global limit + * (rel = NULL) or if the passed relation is a catalog relation of some + * kind. */ if (!(flags & PROCARRAY_SLOTS_XMIN) && (rel == NULL || diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 2fedbc4c15f..565c3ac4397 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -4360,7 +4360,7 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag) /* * If we found one of our own SIREAD locks to remove, remove it now. * - * At this point our transaction already has an ExclusiveRowLock on the + * At this point our transaction already has a RowExclusiveLock on the * relation, so we are OK to drop the predicate lock on the tuple, if * found, without fearing that another write against the tuple will occur * before the MVCC information makes it to the buffer. diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 64acc3fa433..58c94e9257a 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -1163,9 +1163,6 @@ _mdfd_getseg(SMgrRelation reln, ForkNumber forknum, BlockNumber blkno, * replaying WAL data that has a write into a high-numbered * segment of a relation that was later deleted. We want to go * ahead and create the segments so we can finish out the replay. - * However if the caller has specified - * EXTENSION_REALLY_RETURN_NULL, then extension is not desired - * even in recovery; we won't reach this point in that case. * * We have to maintain the invariant that segments before the last * active segment are of size RELSEG_SIZE; therefore, if diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index 55a96498798..e28859d8e1c 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -738,7 +738,7 @@ get_docrep(TSVector txt, QueryRepresentation *qr, int *doclen) doc = (DocRepresentation *) palloc(sizeof(DocRepresentation) * len); /* - * Iterate through query to make DocRepresentaion for words and it's + * Iterate through query to make DocRepresentation for words and it's * entries satisfied by query */ for (i = 0; i < qr->query->size; i++) diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c index cdb9db475d0..167db84c4de 100644 --- a/src/backend/utils/misc/tzparser.c +++ b/src/backend/utils/misc/tzparser.c @@ -53,8 +53,7 @@ validateTzEntry(tzEntry *tzentry) unsigned char *p; /* - * Check restrictions imposed by datetkntbl storage format (see - * datetime.c) + * Check restrictions imposed by datetktbl storage format (see datetime.c) */ if (strlen(tzentry->abbrev) > TOKMAXLEN) { |