Fix typos and inconsistencies in code and comments

This change is a cocktail of harmonization of function argument names,
grammar typos, renames for better consistency and unused code (see
ltree).  All of these have been spotted by the author.

Author: Alexander Lakhin <exclusion@gmail.com>
Discussion: https://postgr.es/m/b2c0d0b7-3944-487d-a03d-d155851958ff@gmail.com

diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index 3a2aa223c3ed5658c4e416b9603523a0f522e1a6..91a2222eaa9544a95c8c9f84fe16b94e6de03394 100644 (file)
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -338,11 +338,6 @@ queryin(char *buf, struct Node *escontext)
        NODE       *tmp;
        int32           pos = 0;
 
-#ifdef BS_DEBUG
-       char            pbuf[16384],
-                          *cur;
-#endif
-
        /* init state */
        state.buf = buf;
        state.state = WAITOPERAND;

diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml
index 197be0c6f6b308544369f9b20ba1f9bc8bc92669..b7dd361294bbdc6506d293454cacdb84456b7792 100644 (file)
--- a/doc/src/sgml/ref/create_subscription.sgml
+++ b/doc/src/sgml/ref/create_subscription.sgml
@@ -562,7 +562,7 @@ CREATE SUBSCRIPTION <replaceable class="parameter">subscription_name</replaceabl
          </para>
          <para>
           This option is effective only when
-          <literal>retain_conflict_info</literal> is enabled and the apply
+          <literal>retain_dead_tuples</literal> is enabled and the apply
           worker associated with the subscription is active.
          </para>
          <warning>

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index bc7e352193fdeb19d0fdc920434fad2e3a98ca7e..a555b7b250821513410b3f9f1b0cab4224882358 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -87,7 +87,7 @@ static void compute_new_xmax_infomask(TransactionId xmax, uint16 old_infomask,
                                                                          uint16 *result_infomask2);
 static TM_Result heap_lock_updated_tuple(Relation rel,
                                                                                 uint16 prior_infomask,
-                                                                                TransactionId prior_rawxmax,
+                                                                                TransactionId prior_raw_xmax,
                                                                                 const ItemPointerData *prior_ctid,
                                                                                 TransactionId xid,
                                                                                 LockTupleMode mode);

diff --git a/src/backend/access/heap/heapam_xlog.c b/src/backend/access/heap/heapam_xlog.c
index 57b6749533f6ee2b56268866e93263be28e7019b..f765345e9e44d04aced07ef39835e151f74c1dbd 100644 (file)
--- a/src/backend/access/heap/heapam_xlog.c
+++ b/src/backend/access/heap/heapam_xlog.c
@@ -191,7 +191,7 @@ heap_xlog_prune_freeze(XLogReaderState *record)
         * unlogged and maintained heuristically, it often becomes stale on
         * standbys. If such a standby is later promoted and runs VACUUM, it will
         * skip recalculating free space for pages that were marked
-        * all-visible/all-forzen. FreeSpaceMapVacuum() can then propagate overly
+        * all-visible/all-frozen. FreeSpaceMapVacuum() can then propagate overly
         * optimistic free space values upward, causing future insertions to
         * select pages that turn out to be unusable. In bulk, this can lead to
         * long stalls.

diff --git a/src/backend/access/rmgrdesc/gindesc.c b/src/backend/access/rmgrdesc/gindesc.c
index 4eb21366e25d6baed0458d1a7bcf9501cab7d6b4..66a0bf0e0e7672c50ecf2576ce5471dc5a5d310c 100644 (file)
--- a/src/backend/access/rmgrdesc/gindesc.c
+++ b/src/backend/access/rmgrdesc/gindesc.c
@@ -161,7 +161,7 @@ gin_desc(StringInfo buf, XLogReaderState *record)
                                        appendStringInfo(buf, " prevTail: %u",
                                                                         xlrec->prevTail);
                                if (xlrec->newRightlink != InvalidBlockNumber)
-                                       appendStringInfo(buf, " newRightLink: %u",
+                                       appendStringInfo(buf, " newRightlink: %u",
                                                                         xlrec->newRightlink);
                        }
                        break;

diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 4ae3fb2c04aa20790ebf0a24432ad9b1c869ca29..d6674f20fc2f50193cef63caadb4a069b4954ce0 100644 (file)
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -1287,7 +1287,7 @@ CheckAlterSubOption(Subscription *sub, const char *option,
         * retreat in the calculated xmin, necessitating additional handling.
         *
         * XXX To address the above race conditions, we can define
-        * oldest_nonremovable_xid as FullTransactionID and adds the check to
+        * oldest_nonremovable_xid as FullTransactionId and adds the check to
         * disallow retreating the conflict slot's xmin. For now, we kept the
         * implementation simple by disallowing change to the retain_dead_tuples,
         * but in the future we can change this after some more analysis.

diff --git a/src/backend/nodes/queryjumblefuncs.c b/src/backend/nodes/queryjumblefuncs.c
index a46b1fdadbe4e3ef118d7e3dcc9a4c446da0f0fd..87db8dc1a32f1c3d86e52cd9fd416488dd726272 100644 (file)
--- a/src/backend/nodes/queryjumblefuncs.c
+++ b/src/backend/nodes/queryjumblefuncs.c
@@ -684,7 +684,7 @@ _jumbleParam(JumbleState *jstate, Node *node)
        JUMBLE_FIELD(paramkind);
        JUMBLE_FIELD(paramid);
        JUMBLE_FIELD(paramtype);
-       /* paramtypmode and paramcollid are ignored */
+       /* paramtypmod and paramcollid are ignored */
 
        if (expr->paramkind == PARAM_EXTERN)
        {

diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c
index 4eecb4f901ed23acd76f2998f707c3eb3b1d8d2c..12e9ed0d0c755596d1494620f71d997d946b2f2a 100644 (file)
--- a/src/backend/optimizer/plan/analyzejoins.c
+++ b/src/backend/optimizer/plan/analyzejoins.c
@@ -2285,7 +2285,7 @@ remove_self_joins_one_group(PlannerInfo *root, Relids relids)
                                continue;
 
                        /*
-                        * Remove rrel ReloptInfo from the planner structures and the
+                        * Remove rrel RelOptInfo from the planner structures and the
                         * corresponding row mark.
                         */
                        remove_self_join_rel(root, kmark, rmark, krel, rrel, restrictlist);

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 615c823c67d939d1d76438a69e7b401d608d3d31..da6e7fd34b0a4dcff2b852c1ed68afa59e56268d 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7922,8 +7922,8 @@ apply_scanjoin_target_to_paths(PlannerInfo *root,
         * However, there are several cases when this optimization is not safe. If
         * the rel isn't partitioned, then none of the paths will be Append or
         * MergeAppend paths, so we should definitely not do this. If it is
-        * parititoned but is a joinrel, it may have Append and MergeAppend paths,
-        * but it can also have join paths that we can't afford to discard.
+        * partititoned but is a joinrel, it may have Append and MergeAppend
+        * paths, but it can also have join paths that we can't afford to discard.
         *
         * Some care is needed, because we have to allow
         * generate_useful_gather_paths to see the old partial paths in the next

diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index f412e217f8bdc7fe7899594592e24edc5ea874be..a90e1c9ee6bff6c5b8f041353dd5c631b508f142 100644 (file)
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -937,7 +937,7 @@ infer_arbiter_indexes(PlannerInfo *root)
                                Assert(idxForm->indisready);
 
                                /*
-                                * Set up inferElems and inferPredExprs to match the
+                                * Set up inferElems and inferIndexExprs to match the
                                 * constraint index, so that we can match them in the loop
                                 * below.
                                 */

diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 5269d3f01976d9344311793a26d66a3a8445091f..0ca312ac27dad0775f5127a7f30552525d1234f6 100644 (file)
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -4989,7 +4989,7 @@ satisfies_hash_partition(PG_FUNCTION_ARGS)
  * second_name:                name of the second partition
  * second_bound:       bound of the second partition
  * defaultPart:                true if one of the new partitions is DEFAULT
- * is_merge:           true ndicates the operation is MERGE PARTITIONS;
+ * is_merge:           true indicates the operation is MERGE PARTITIONS;
  *                                     false indicates the operation is SPLIT PARTITION.
  * pstate:                     pointer to ParseState struct for determining error position
  */

diff --git a/src/backend/replication/logical/slotsync.c b/src/backend/replication/logical/slotsync.c
index 8731ca81915edda703c2b099f9adfd267a089857..73fc51ea53e4bde69a3e244f35dfe0cdc7854b1c 100644 (file)
--- a/src/backend/replication/logical/slotsync.c
+++ b/src/backend/replication/logical/slotsync.c
@@ -173,7 +173,7 @@ update_slotsync_skip_stats(SlotSyncSkipReason skip_reason)
        slot = MyReplicationSlot;
 
        /*
-        * Update the slot sync related stats in pg_stat_replication_slot when a
+        * Update the slot sync related stats in pg_stat_replication_slots when a
         * slot sync is skipped
         */
        if (skip_reason != SS_SKIP_NONE)

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index ea5cb30fed0c220e371150d65e7b5e80e5f06edb..a036c2aa275cac927a3a7e222abd6a60310ddb3e 100644 (file)
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -4280,7 +4280,7 @@ DebugPrintBufferRefcount(Buffer buffer)
                backend = INVALID_PROC_NUMBER;
        }
 
-       /* theoretically we should lock the bufhdr here */
+       /* theoretically we should lock the bufHdr here */
        buf_state = pg_atomic_read_u32(&buf->state);
 
        result = psprintf("[%03d] (rel=%s, blockNum=%u, flags=0x%x, refcount=%u %d)",

diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index f775d1327f0953b9be1f4f7f6ceee393bac38779..fe75ead350106bccaa9f55c372546a50cb68e314 100644 (file)
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -190,7 +190,7 @@
  * two-phase commit support
  *             AtPrepare_PredicateLocks(void);
  *             PostPrepare_PredicateLocks(TransactionId xid);
- *             PredicateLockTwoPhaseFinish(TransactionId xid, bool isCommit);
+ *             PredicateLockTwoPhaseFinish(FullTransactionId fxid, bool isCommit);
  *             predicatelock_twophase_recover(FullTransactionId fxid, uint16 info,
  *                                                                        void *recdata, uint32 len);
  */

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 719709cfd58dc4f9faa3c7e160a69b431a6d3ae9..52c05a9d1d594f6c6525d8a61dd53394832f46f2 100644 (file)
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -418,7 +418,7 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
        ctype = TextDatumGetCString(datum);
 
        /*
-        * Historcally, we set LC_COLLATE from datcollate, as well. That's no
+        * Historically, we set LC_COLLATE from datcollate, as well. That's no
         * longer necessary because all collation behavior is handled through
         * pg_locale_t.
         */

diff --git a/src/backend/utils/misc/guc_parameters.dat b/src/backend/utils/misc/guc_parameters.dat
index cf87c09ca3bdac2d23000bc57595c5e8ed6f8365..7c60b12556464110e7b0657e832aa8c685004cfd 100644 (file)
--- a/src/backend/utils/misc/guc_parameters.dat
+++ b/src/backend/utils/misc/guc_parameters.dat
@@ -694,7 +694,7 @@
   short_desc => 'Set this to force all parse and plan trees to be passed through outfuncs.c/readfuncs.c, to facilitate catching errors and omissions in those modules.',
   flags => 'GUC_NOT_IN_SAMPLE',
   variable => 'Debug_write_read_parse_plan_trees',
-  boot_val => 'DEFAULT_DEBUG_READ_WRITE_PARSE_PLAN_TREES',
+  boot_val => 'DEFAULT_DEBUG_WRITE_READ_PARSE_PLAN_TREES',
   ifdef => 'DEBUG_NODE_TESTS_ENABLED',
 },
 

diff --git a/src/bin/pg_upgrade/t/007_multixact_conversion.pl b/src/bin/pg_upgrade/t/007_multixact_conversion.pl
index 82774d9f2a1492d9d5adcb33440b2f03472003a3..d18c50830d5c09ff3cbaa1ac0a90da08e22c7fd2 100644 (file)
--- a/src/bin/pg_upgrade/t/007_multixact_conversion.pl
+++ b/src/bin/pg_upgrade/t/007_multixact_conversion.pl
@@ -228,7 +228,7 @@ sub read_multixid_fields
 
 # Reset a cluster's next multixid and mxoffset to given values.
 #
-# Note: This is used on the old insallation, so the command arguments
+# Note: This is used on the old installation, so the command arguments
 # and the output parsing used here must work with all pre-v19
 # PostgreSQL versions supported by the test.
 sub reset_mxid_mxoffset_pre_v19

diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 71e0ac1de92bf455337a4ecc525b3a7b95047c60..ce48fac42ba58dcf27c53091685e6e69c7b929f3 100644 (file)
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -293,7 +293,7 @@ typedef struct PruneFreezeResult
         * is only valid if we froze some tuples (nfrozen > 0), and all_frozen is
         * true.
         *
-        * These are only set if the HEAP_PRUNE_FREEZE option is set.
+        * These are only set if the HEAP_PAGE_PRUNE_FREEZE option is set.
         */
        bool            all_visible;
        bool            all_frozen;

diff --git a/src/include/c.h b/src/include/c.h
index 77c754a904a248c7f25ea45b3b1c5f9674a49dc2..5c4d769d451af4c3ee784b860cce95084be3c30b 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -1262,7 +1262,7 @@ typedef struct PGAlignedXLogBlock
  */
 
 #if !HAVE_DECL_FDATASYNC
-extern int     fdatasync(int fildes);
+extern int     fdatasync(int fd);
 #endif
 
 /*

diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index d078a65d31f3e7a86bf5292c8411b0d26e5a5a04..2c3c4a3f074b9f83a1a86b5b81cb9024dfbc0b5e 100644 (file)
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -47,7 +47,7 @@ extern ObjectAddress AlterSequence(ParseState *pstate, AlterSeqStmt *stmt);
 extern void SequenceChangePersistence(Oid relid, char newrelpersistence);
 extern void DeleteSequenceTuple(Oid relid);
 extern void ResetSequence(Oid seq_relid);
-extern void SetSequence(Oid relid, int64 next, bool is_called);
+extern void SetSequence(Oid relid, int64 next, bool iscalled);
 extern void ResetSequenceCaches(void);
 
 #endif                                                 /* SEQUENCE_H */

diff --git a/src/include/common/int128.h b/src/include/common/int128.h
index 3ecd41483431b313de9ffa3ab5bc0de8b77c5c2b..7db8aff94d35cf8c77c25ac1f760a0a010553e8f 100644 (file)
--- a/src/include/common/int128.h
+++ b/src/include/common/int128.h
@@ -346,7 +346,7 @@ int128_div_mod_int32(INT128 *i128, int32 v, int32 *remainder)
                n_lo = i128->lo;
        }
 
-       /* denomimator: absolute value of v */
+       /* denominator: absolute value of v */
        d = abs(v);
 
        /* quotient and remainder of high 64 bits */

diff --git a/src/include/jit/llvmjit.h b/src/include/jit/llvmjit.h
index 056118fb01aed9227fff8e81ab6383faa52f3cea..a647dd65ba2e3a261b87b7046ebe6690db3005eb 100644 (file)
--- a/src/include/jit/llvmjit.h
+++ b/src/include/jit/llvmjit.h
@@ -114,7 +114,7 @@ extern void llvm_split_symbol_name(const char *name, char **modname, char **func
 extern LLVMTypeRef llvm_pg_var_type(const char *varname);
 extern LLVMTypeRef llvm_pg_var_func_type(const char *varname);
 extern LLVMValueRef llvm_pg_func(LLVMModuleRef mod, const char *funcname);
-extern void llvm_copy_attributes(LLVMValueRef from, LLVMValueRef to);
+extern void llvm_copy_attributes(LLVMValueRef v_from, LLVMValueRef v_to);
 extern LLVMValueRef llvm_function_reference(LLVMJitContext *context,
                                                LLVMBuilderRef builder,
                                                LLVMModuleRef mod,

diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index b72f000d2ac7e15f349db0d25499617f4d7c7f57..449885b9319ebc3ef938124b1957c3c371f9604f 100644 (file)
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -404,7 +404,7 @@ struct PlannerInfo
        /* list of AggClauseInfos */
        List       *agg_clause_list;
 
-       /* list of GroupExprInfos */
+       /* list of GroupingExprInfos */
        List       *group_expr_list;
 
        /* list of plain Vars contained in targetlist and havingQual */

diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index b955c581fecc26819ade40660235074480b36f3c..1c07c92349006ffdff83a323789ee9c96bf69dea 100644 (file)
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -79,11 +79,11 @@ extern void px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
                           int num_gene, City * city_table);
 
 /* order crossover [OX1] according to Davis */
-extern void ox1(PlannerInfo *root, Gene *mom, Gene *dad, Gene *offspring,
+extern void ox1(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
                                int num_gene, City * city_table);
 
 /* order crossover [OX2] according to Syswerda */
-extern void ox2(PlannerInfo *root, Gene *mom, Gene *dad, Gene *offspring,
+extern void ox2(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
                                int num_gene, City * city_table);
 
 #endif                                                 /* GEQO_RECOMBINATION_H */

diff --git a/src/include/port.h b/src/include/port.h
index 11b21098a3926812ec1614b7c53ccae6d06280c8..ae43620c7e7d81801f8c1f5af0f39e5f135e5625 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -485,7 +485,7 @@ extern char *strsep(char **stringp, const char *delim);
 #endif
 
 #if !HAVE_DECL_TIMINGSAFE_BCMP
-extern int     timingsafe_bcmp(const void *b1, const void *b2, size_t len);
+extern int     timingsafe_bcmp(const void *b1, const void *b2, size_t n);
 #endif
 
 /*

diff --git a/src/include/port/win32/sys/socket.h b/src/include/port/win32/sys/socket.h
index f2b475df5e5e0122f98d8eb009d8e2445c5af4fd..4fe7693ad14e96a9904b2b346b7ce03709a148d5 100644 (file)
--- a/src/include/port/win32/sys/socket.h
+++ b/src/include/port/win32/sys/socket.h
@@ -29,6 +29,6 @@
  */
 #undef gai_strerror
 
-extern const char *gai_strerror(int ecode);
+extern const char *gai_strerror(int errcode);
 
 #endif                                                 /* WIN32_SYS_SOCKET_H */

diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index a37f23fadd7872edddb12ca5012facf4bed33f1a..956c0b4b4c34637115093d784feacf6d3a16d86d 100644 (file)
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -505,7 +505,7 @@ extern SOCKET pgwin32_socket(int af, int type, int protocol);
 extern int     pgwin32_bind(SOCKET s, struct sockaddr *addr, int addrlen);
 extern int     pgwin32_listen(SOCKET s, int backlog);
 extern SOCKET pgwin32_accept(SOCKET s, struct sockaddr *addr, int *addrlen);
-extern int     pgwin32_connect(SOCKET s, const struct sockaddr *name, int namelen);
+extern int     pgwin32_connect(SOCKET s, const struct sockaddr *addr, int addrlen);
 extern int     pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout);
 extern int     pgwin32_recv(SOCKET s, char *buf, int len, int flags);
 extern int     pgwin32_send(SOCKET s, const void *buf, int len, int flags);
@@ -581,9 +581,9 @@ typedef unsigned short mode_t;
 #endif
 
 /* in port/win32pread.c */
-extern ssize_t pg_pread(int fd, void *buf, size_t nbyte, pgoff_t offset);
+extern ssize_t pg_pread(int fd, void *buf, size_t size, pgoff_t offset);
 
 /* in port/win32pwrite.c */
-extern ssize_t pg_pwrite(int fd, const void *buf, size_t nbyte, pgoff_t offset);
+extern ssize_t pg_pwrite(int fd, const void *buf, size_t size, pgoff_t offset);
 
 #endif                                                 /* PG_WIN32_PORT_H */

diff --git a/src/include/replication/logicalctl.h b/src/include/replication/logicalctl.h
index 777c054c5aaa19cc347f0106889a74c84bb47af8..495554c532ce1acc3e15b7fb7aef312f9427cad9 100644 (file)
--- a/src/include/replication/logicalctl.h
+++ b/src/include/replication/logicalctl.h
@@ -16,12 +16,11 @@
 
 extern Size LogicalDecodingCtlShmemSize(void);
 extern void LogicalDecodingCtlShmemInit(void);
-extern void StartupLogicalDecodingStatus(bool status_in_control_file);
+extern void StartupLogicalDecodingStatus(bool last_status);
 extern void InitializeProcessXLogLogicalInfo(void);
 extern bool ProcessBarrierUpdateXLogLogicalInfo(void);
 extern bool IsLogicalDecodingEnabled(void);
 extern bool IsXLogLogicalInfoEnabled(void);
-extern bool CheckXLogLogicalInfo(void);
 extern void AtEOXact_LogicalCtl(void);
 extern void EnsureLogicalDecodingEnabled(void);
 extern void EnableLogicalDecoding(void);

diff --git a/src/include/replication/worker_internal.h b/src/include/replication/worker_internal.h
index 6973a7423f9b8bc48923fa98110bf3867e543cdc..c1285fdd1bc15666820488ba5c49fb95226af202 100644 (file)
--- a/src/include/replication/worker_internal.h
+++ b/src/include/replication/worker_internal.h
@@ -294,7 +294,7 @@ extern void launch_sync_worker(LogicalRepWorkerType wtype, int nsyncworkers,
                                                           Oid relid, TimestampTz *last_start_time);
 extern void ProcessSyncingRelations(XLogRecPtr current_lsn);
 extern void FetchRelationStates(bool *has_pending_subtables,
-                                                               bool *has_pending_sequences, bool *started_tx);
+                                                               bool *has_pending_subsequences, bool *started_tx);
 
 extern void stream_start_internal(TransactionId xid, bool first_segment);
 extern void stream_stop_internal(TransactionId xid);

diff --git a/src/include/statistics/stat_utils.h b/src/include/statistics/stat_utils.h
index 04215db13ab9c3d5fdd6d55b13a83c78d5cac8d6..74da7790579692a82451a1a3c32fecf850262c00 100644 (file)
--- a/src/include/statistics/stat_utils.h
+++ b/src/include/statistics/stat_utils.h
@@ -35,7 +35,7 @@ extern bool stats_check_arg_pair(FunctionCallInfo fcinfo,
                                                                 int argnum1, int argnum2);
 
 extern void RangeVarCallbackForStats(const RangeVar *relation,
-                                                                        Oid relId, Oid oldRelid, void *arg);
+                                                                        Oid relId, Oid oldRelId, void *arg);
 
 extern bool stats_fill_fcinfo_from_arg_pairs(FunctionCallInfo pairs_fcinfo,
                                                                                         FunctionCallInfo positional_fcinfo,

diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h
index 997866acad11f2dfa805a9fd576ffe3186739094..607d7d84596c6c4ad5aede1b9e7a5c57128a52ee 100644 (file)
--- a/src/include/storage/predicate.h
+++ b/src/include/storage/predicate.h
@@ -73,7 +73,7 @@ extern void PreCommit_CheckForSerializationFailure(void);
 /* two-phase commit support */
 extern void AtPrepare_PredicateLocks(void);
 extern void PostPrepare_PredicateLocks(FullTransactionId fxid);
-extern void PredicateLockTwoPhaseFinish(FullTransactionId xid, bool isCommit);
+extern void PredicateLockTwoPhaseFinish(FullTransactionId fxid, bool isCommit);
 extern void predicatelock_twophase_recover(FullTransactionId fxid, uint16 info,
                                                                                   void *recdata, uint32 len);
 

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 489e814a4978f12b589f348bfed81c8fb8d2f28f..bf39878c43eadda0d7c680f50b2607cac94e78c1 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -266,10 +266,10 @@ extern PGDLLIMPORT bool Debug_raw_expression_coverage_test;
 #define DEFAULT_DEBUG_COPY_PARSE_PLAN_TREES false
 #endif
 
-#ifdef READ_WRITE_PARSE_PLAN_TREES
-#define DEFAULT_DEBUG_READ_WRITE_PARSE_PLAN_TREES true
+#ifdef WRITE_READ_PARSE_PLAN_TREES
+#define DEFAULT_DEBUG_WRITE_READ_PARSE_PLAN_TREES true
 #else
-#define DEFAULT_DEBUG_READ_WRITE_PARSE_PLAN_TREES false
+#define DEFAULT_DEBUG_WRITE_READ_PARSE_PLAN_TREES false
 #endif
 
 #ifdef RAW_EXPRESSION_COVERAGE_TEST

diff --git a/src/test/modules/brin/t/01_workitems.pl b/src/test/modules/brin/t/01_workitems.pl
index 9e8c05fd6e69399f68dfed21b0f90598e7dd31e6..ffcca3d71323b5fbd00f9c9713ce49a6d687e653 100644 (file)
--- a/src/test/modules/brin/t/01_workitems.pl
+++ b/src/test/modules/brin/t/01_workitems.pl
@@ -39,7 +39,7 @@ $node->safe_psql(
 my $count = $node->safe_psql('postgres',
        "select count(*) from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)"
 );
-is($count, '1', "initial brin_wi_index index state is correct");
+is($count, '1', "initial brin_wi_idx index state is correct");
 $count = $node->safe_psql('postgres',
        "select count(*) from brin_page_items(get_raw_page('brin_packdate_idx', 2), 'brin_packdate_idx'::regclass)"
 );

diff --git a/src/test/recovery/t/048_vacuum_horizon_floor.pl b/src/test/recovery/t/048_vacuum_horizon_floor.pl
index 255a20739a87e1b4a7bc5ae5917af7250ab67e32..52acb5561d6a5629b14077e166266d161600b4fb 100644 (file)
--- a/src/test/recovery/t/048_vacuum_horizon_floor.pl
+++ b/src/test/recovery/t/048_vacuum_horizon_floor.pl
@@ -54,7 +54,7 @@ my $psql_primaryB =
 
 # Our test relies on two rounds of index vacuuming for reasons elaborated
 # later. To trigger two rounds of index vacuuming, we must fill up the
-# TIDStore with dead items partway through a vacuum of the table. The number
+# TidStore with dead items partway through a vacuum of the table. The number
 # of rows is just enough to ensure we exceed maintenance_work_mem on all
 # supported platforms, while keeping test runtime as short as we can.
 my $nrows = 2000;
@@ -225,7 +225,7 @@ $node_primary->poll_query_until(
 
 # Move the cursor forward to the next 7. We inserted the 7 much later, so
 # advancing the cursor should allow vacuum to proceed vacuuming most pages of
-# the relation. Because we set maintanence_work_mem sufficiently low, we
+# the relation. Because we set maintenance_work_mem sufficiently low, we
 # expect that a round of index vacuuming has happened and that the vacuum is
 # now waiting for the cursor to release its pin on the last page of the
 # relation.

diff --git a/src/tools/valgrind.supp b/src/tools/valgrind.supp
index 3880007dfb3bbaf3d2c52e85370a586437091a01..d56794b4f7e28618d76ad00e0820ee83d8cfa13b 100644 (file)
--- a/src/tools/valgrind.supp
+++ b/src/tools/valgrind.supp
@@ -182,7 +182,7 @@
 }
 
 # NUMA introspection requires touching memory first, and some of it may
-# be marked as noacess (e.g. unpinned buffers). So just ignore that.
+# be marked as noaccess (e.g. unpinned buffers). So just ignore that.
 {
    pg_numa_touch_mem_if_required
    Memcheck:Addr4