From f65d396470c2b035cbe8aac3536496e9a02b5966 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 7 Jun 2019 09:53:11 +0530 Subject: [PATCH] Fix assorted inconsistencies. There were a number of issues in the recent commits which include typos, code and comments mismatch, leftover function declarations. Fix them. Reported-by: Alexander Lakhin Author: Alexander Lakhin, Amit Kapila and Amit Langote Reviewed-by: Amit Kapila Discussion: https://postgr.es/m/ef0c0232-0c1d-3a35-63d4-0ebd06e31387@gmail.com --- src/backend/access/common/reloptions.c | 3 --- src/backend/access/heap/heapam.c | 15 +++------------ src/backend/access/heap/heapam_handler.c | 2 +- src/backend/access/heap/rewriteheap.c | 2 +- src/backend/access/transam/xact.c | 4 ++-- src/backend/access/transam/xlog.c | 2 -- src/backend/access/transam/xloginsert.c | 2 +- src/backend/commands/copy.c | 1 - src/backend/commands/tablecmds.c | 6 +++--- src/backend/executor/execTuples.c | 2 +- src/backend/executor/nodeModifyTable.c | 4 +++- src/backend/lib/integerset.c | 2 +- src/backend/postmaster/postmaster.c | 2 +- src/backend/storage/smgr/md.c | 2 +- src/include/access/heapam.h | 2 -- src/include/access/tableam.h | 4 ++-- src/include/executor/executor.h | 1 - src/include/storage/sync.h | 2 +- src/test/modules/test_integerset/test_integerset.c | 2 +- 19 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 4d0d24b..de06c92 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -52,9 +52,6 @@ * (v) make sure the lock level is set correctly for that operation * (vi) don't forget to document the option * - * Note that we don't handle "oids" in relOpts because it is handled by - * interpretOidsOption(). - * * The default choice for any new option should be AccessExclusiveLock. * In some cases the lock level can be reduced from there, but the lock * level chosen should always conflict with itself to ensure that multiple diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index bf82304..8ac0f8a 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -239,8 +239,8 @@ initscan(HeapScanDesc scan, ScanKey key, bool keep_startblock) * behaviors, independently of the size of the table; also there is a GUC * variable that can disable synchronized scanning.) * - * Note that heap_parallelscan_initialize has a very similar test; if you - * change this, consider changing that one, too. + * Note that table_block_parallelscan_initialize has a very similar test; + * if you change this, consider changing that one, too. */ if (!RelationUsesLocalBuffers(scan->rs_base.rs_rd) && scan->rs_nblocks > NBuffers / 4) @@ -1396,15 +1396,6 @@ heap_getnextslot(TableScanDesc sscan, ScanDirection direction, TupleTableSlot *s * If the tuple is found but fails the time qual check, then false is returned * but tuple->t_data is left pointing to the tuple. * - * keep_buf determines what is done with the buffer in the false-result cases. - * When the caller specifies keep_buf = true, we retain the pin on the buffer - * and return it in *userbuf (so the caller must eventually unpin it); when - * keep_buf = false, the pin is released and *userbuf is set to InvalidBuffer. - * - * stats_relation is the relation to charge the heap_fetch operation against - * for statistical purposes. (This could be the heap rel itself, an - * associated index, or NULL to not count the fetch at all.) - * * heap_fetch does not follow HOT chains: only the exact TID requested will * be fetched. * @@ -7085,7 +7076,7 @@ heap_compute_xid_horizon_for_tuples(Relation rel, * Conjecture: if hitemid is dead then it had xids before the xids * marked on LP_NORMAL items. So we just ignore this item and move * onto the next, for the purposes of calculating - * latestRemovedxids. + * latestRemovedXid. */ } else diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index 92ea1d1..b7d2ddb 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -286,7 +286,7 @@ heapam_tuple_insert_speculative(Relation relation, TupleTableSlot *slot, static void heapam_tuple_complete_speculative(Relation relation, TupleTableSlot *slot, - uint32 spekToken, bool succeeded) + uint32 specToken, bool succeeded) { bool shouldFree = true; HeapTuple tuple = ExecFetchSlotHeapTuple(slot, true, &shouldFree); diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 131ec7b..369694f 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -350,7 +350,7 @@ end_heap_rewrite(RewriteState state) * * It's obvious that we must do this when not WAL-logging. It's less * obvious that we have to do it even if we did WAL-log the pages. The - * reason is the same as in tablecmds.c's copy_relation_data(): we're + * reason is the same as in storage.c's RelationCopyStorage(): we're * writing data that's not in shared buffers, and so a CHECKPOINT * occurring during the rewriteheap operation won't have fsync'd data we * wrote before the checkpoint. diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index f1108cc..821652b 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -91,8 +91,8 @@ int synchronous_commit = SYNCHRONOUS_COMMIT_ON; * need to return the same answers in the parallel worker as they would have * in the user backend, so we need some additional bookkeeping. * - * XactTopTransactionId stores the XID of our toplevel transaction, which - * will be the same as TopTransactionState.transactionId in an ordinary + * XactTopFullTransactionId stores the XID of our toplevel transaction, which + * will be the same as TopTransactionState.fullTransactionId in an ordinary * backend; but in a parallel backend, which does not have the entire * transaction state, it will instead be copied from the backend that started * the parallel operation. diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 1c7dd51..e08320e 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -314,8 +314,6 @@ static bool recoveryStopAfter; * * recoveryTargetTLI: the currently understood target timeline; changes * - * recoveryTargetIsLatest: was the requested target timeline 'latest'? - * * expectedTLEs: a list of TimeLineHistoryEntries for recoveryTargetTLI and the timelines of * its known parents, newest first (so recoveryTargetTLI is always the * first list member). Only these TLIs are expected to be seen in the WAL diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c index d3c0a93..3ec67d4 100644 --- a/src/backend/access/transam/xloginsert.c +++ b/src/backend/access/transam/xloginsert.c @@ -1024,7 +1024,7 @@ log_newpage_buffer(Buffer buffer, bool page_std) /* * WAL-log a range of blocks in a relation. * - * An image of all pages with block numbers 'startblk' <= X < 'endblock' is + * An image of all pages with block numbers 'startblk' <= X < 'endblk' is * written to the WAL. If the range is large, this is done in multiple WAL * records. * diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 2593732..84c54fb 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -177,7 +177,6 @@ typedef struct CopyStateData */ AttrNumber num_defaults; FmgrInfo oid_in_function; - Oid oid_typioparam; FmgrInfo *in_functions; /* array of input functions for each attrs */ Oid *typioparams; /* array of element types for in_functions */ int *defmap; /* array of default att numbers */ diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index e13b96d..27b4cb2 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -379,7 +379,7 @@ static void ATExecCheckNotNull(AlteredTableInfo *tab, Relation rel, const char *colName, LOCKMODE lockmode); static bool NotNullImpliedByRelConstraints(Relation rel, Form_pg_attribute attr); static bool ConstraintImpliedByRelConstraint(Relation scanrel, - List *partConstraint, List *existedConstraints); + List *testConstraint, List *provenConstraint); static ObjectAddress ATExecColumnDefault(Relation rel, const char *colName, Node *newDefault, LOCKMODE lockmode); static ObjectAddress ATExecAddIdentity(Relation rel, const char *colName, @@ -5518,8 +5518,8 @@ ATPrepAddColumn(List **wqueue, Relation rel, bool recurse, bool recursing, } /* - * Add a column to a table; this handles the AT_AddOids cases as well. The - * return value is the address of the new column in the parent relation. + * Add a column to a table. The return value is the address of the + * new column in the parent relation. */ static ObjectAddress ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index f785efa..a5cb7bb 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -1867,7 +1867,7 @@ void slot_getsomeattrs_int(TupleTableSlot *slot, int attnum) { /* Check for caller errors */ - Assert(slot->tts_nvalid < attnum); /* slot_getsomeattr checked */ + Assert(slot->tts_nvalid < attnum); /* checked in slot_getsomeattrs */ Assert(attnum > 0); if (unlikely(attnum > slot->tts_tupleDescriptor->natts)) diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index a3c0e91..da6da06 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -2316,7 +2316,9 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) * verify that the proposed target relations are valid and open their * indexes for insertion of new index entries. Note we *must* set * estate->es_result_relation_info correctly while we initialize each - * sub-plan; ExecContextForcesOids depends on that! + * sub-plan; external modules such as FDWs may depend on that (see + * contrib/postgres_fdw/postgres_fdw.c: postgresBeginDirectModify() + * as one example.) */ saved_resultRelInfo = estate->es_result_relation_info; diff --git a/src/backend/lib/integerset.c b/src/backend/lib/integerset.c index 6921955..6d51c79 100644 --- a/src/backend/lib/integerset.c +++ b/src/backend/lib/integerset.c @@ -236,7 +236,7 @@ struct IntegerSet * * 'iter_values' is an array of integers ready to be returned to the * caller; 'iter_num_values' is the length of that array, and - * 'iter_valueno' is the next index. 'iter_node' and 'item_itemno' point + * 'iter_valueno' is the next index. 'iter_node' and 'iter_itemno' point * to the leaf node, and item within the leaf node, to get the next batch * of values from. * diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 8e098e4..dd16938 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -404,7 +404,7 @@ static void BackendRun(Port *port) pg_attribute_noreturn(); static void ExitPostmaster(int status) pg_attribute_noreturn(); static int ServerLoop(void); static int BackendStartup(Port *port); -static int ProcessStartupPacket(Port *port, bool SSLdone); +static int ProcessStartupPacket(Port *port, bool secure_done); static void SendNegotiateProtocolVersion(List *unrecognized_protocol_options); static void processCancelRequest(Port *port, void *pkt); static int initMasks(fd_set *rmask); diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index bbcd18d..64acc3f 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -921,7 +921,7 @@ register_dirty_segment(SMgrRelation reln, ForkNumber forknum, MdfdVec *seg) } /* - * register_unlink() -- Schedule a file to be deleted after next checkpoint + * register_unlink_segment() -- Schedule a file to be deleted after next checkpoint */ static void register_unlink_segment(RelFileNodeBackend rnode, ForkNumber forknum, diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index b88bd8a..dffb57b 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -116,8 +116,6 @@ extern void heap_setscanlimits(TableScanDesc scan, BlockNumber startBlk, extern void heapgetpage(TableScanDesc scan, BlockNumber page); extern void heap_rescan(TableScanDesc scan, ScanKey key, bool set_params, bool allow_strat, bool allow_sync, bool allow_pagemode); -extern void heap_rescan_set_params(TableScanDesc scan, ScanKey key, - bool allow_strat, bool allow_sync, bool allow_pagemode); extern void heap_endscan(TableScanDesc scan); extern HeapTuple heap_getnext(TableScanDesc scan, ScanDirection direction); extern bool heap_getnextslot(TableScanDesc sscan, diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index c4e43b0..585c120 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -690,7 +690,7 @@ typedef struct TableAmRoutine * block using the TsmRoutine's NextSampleTuple() callback. * * The callback needs to perform visibility checks, and only return - * visible tuples. That obviously can mean calling NextSampletuple() + * visible tuples. That obviously can mean calling NextSampleTuple() * multiple times. * * The TsmRoutine interface assumes that there's a maximum offset on a @@ -1596,7 +1596,7 @@ table_relation_size(Relation rel, ForkNumber forkNumber) } /* - * table_needs_toast_table - does this relation need a toast table? + * table_relation_needs_toast_table - does this relation need a toast table? */ static inline bool table_relation_needs_toast_table(Relation rel) diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 88134bc..d056fd6 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -514,7 +514,6 @@ extern ExprContext *MakePerTupleExprContext(EState *estate); extern void ExecAssignExprContext(EState *estate, PlanState *planstate); extern TupleDesc ExecGetResultType(PlanState *planstate); -extern TupleTableSlot ExecGetResultSlot(PlanState *planstate); extern const TupleTableSlotOps *ExecGetResultSlotOps(PlanState *planstate, bool *isfixed); extern void ExecAssignProjectionInfo(PlanState *planstate, diff --git a/src/include/storage/sync.h b/src/include/storage/sync.h index 1e453a5..16428c5 100644 --- a/src/include/storage/sync.h +++ b/src/include/storage/sync.h @@ -44,7 +44,7 @@ typedef enum SyncRequestHandler */ typedef struct FileTag { - int16 handler; /* SyncRequstHandler value, saving space */ + int16 handler; /* SyncRequestHandler value, saving space */ int16 forknum; /* ForkNumber, saving space */ RelFileNode rnode; uint32 segno; diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c index 346bb77..15b9ce1 100644 --- a/src/test/modules/test_integerset/test_integerset.c +++ b/src/test/modules/test_integerset/test_integerset.c @@ -581,7 +581,7 @@ test_huge_distances(void) intset_add_member(intset, values[i]); /* - * Test iterset_is_member() around each of these values + * Test intset_is_member() around each of these values */ for (int i = 0; i < num_values; i++) { -- 1.8.3.1