From b5d69b7c22ee4c44b8bb99cfa0466ffaf3b5fab9 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 7 Jun 2020 16:57:08 -0400 Subject: [PATCH] pgindent run prior to branching v13. pgperltidy and reformat-dat-files too, though those didn't find anything to change. --- src/backend/jit/llvm/llvmjit_expr.c | 4 ++-- src/backend/optimizer/plan/createplan.c | 12 ++++++------ src/backend/postmaster/autovacuum.c | 3 +-- src/backend/utils/sort/logtape.c | 2 +- src/include/access/tableam.h | 2 +- src/tools/pgindent/typedefs.list | 3 +-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index 4d8836cfb3..cca5c117a0 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -2448,8 +2448,8 @@ BuildV1Call(LLVMJitContext *context, LLVMBuilderRef b, *v_fcinfo_isnull = LLVMBuildLoad(b, v_fcinfo_isnullp, ""); /* - * Add lifetime-end annotation, signaling that writes to memory don't - * have to be retained (important for inlining potential). + * Add lifetime-end annotation, signaling that writes to memory don't have + * to be retained (important for inlining potential). */ { LLVMValueRef v_lifetime = create_LifetimeEnd(mod); diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 744eed187d..eb9543f6ad 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -2118,9 +2118,9 @@ create_agg_plan(PlannerInfo *root, AggPath *best_path) /* * Agg can project, so no need to be terribly picky about child tlist, but * we do need grouping columns to be available. We are a bit more careful - * with hash aggregate, where we explicitly request small tlist to minimize - * I/O needed for spilling (we can't be sure spilling won't be necessary, - * so we just do it every time). + * with hash aggregate, where we explicitly request small tlist to + * minimize I/O needed for spilling (we can't be sure spilling won't be + * necessary, so we just do it every time). */ flags = CP_LABEL_TLIST; @@ -2219,9 +2219,9 @@ create_groupingsets_plan(PlannerInfo *root, GroupingSetsPath *best_path) /* * Agg can project, so no need to be terribly picky about child tlist, but * we do need grouping columns to be available. We are a bit more careful - * with hash aggregate, where we explicitly request small tlist to minimize - * I/O needed for spilling (we can't be sure spilling won't be necessary, - * so we just do it every time). + * with hash aggregate, where we explicitly request small tlist to + * minimize I/O needed for spilling (we can't be sure spilling won't be + * necessary, so we just do it every time). */ flags = CP_LABEL_TLIST; diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 38dc97de11..9c7d4b0c60 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -653,8 +653,7 @@ AutoVacLauncherMain(int argc, char *argv[]) HandleAutoVacLauncherInterrupts(); /* - * a worker finished, or postmaster signaled failure to start a - * worker + * a worker finished, or postmaster signaled failure to start a worker */ if (got_SIGUSR2) { diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c index 4984f8ce50..138da0c1b4 100644 --- a/src/backend/utils/sort/logtape.c +++ b/src/backend/utils/sort/logtape.c @@ -170,7 +170,7 @@ typedef struct LogicalTape * numbers first). */ long *prealloc; - int nprealloc; /* number of elements in list */ + int nprealloc; /* number of elements in list */ int prealloc_size; /* number of elements list can hold */ } LogicalTape; diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index 30a21c9bc5..eb18739c36 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -290,7 +290,7 @@ typedef struct TableAmRoutine * * *call_again is false on the first call to index_fetch_tuple for a tid. * If there potentially is another tuple matching the tid, *call_again - * needs be set to true by index_fetch_tuple, signaling to the caller + * needs to be set to true by index_fetch_tuple, signaling to the caller * that index_fetch_tuple should be called again for the same tid. * * *all_dead, if all_dead is not NULL, should be set to true by diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 05c5e9c752..c65a55257d 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -1459,7 +1459,6 @@ OffsetVarNodes_context Oid OidOptions OkeysState -OldSerXidControl OldSnapshotControlData OldToNewMapping OldToNewMappingData @@ -1659,7 +1658,7 @@ PQconninfoOption PQnoticeProcessor PQnoticeReceiver PQprintOpt -PQsslKeyPassHook_type +PQsslKeyPassHook_OpenSSL_type PREDICATELOCK PREDICATELOCKTAG PREDICATELOCKTARGET