aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2020-06-07 16:57:08 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2020-06-07 16:57:08 -0400
commitb5d69b7c22ee4c44b8bb99cfa0466ffaf3b5fab9 (patch)
tree56f15561f5aa454ce69a6f302c83b04f266d83db /src
parent7247e243a803044a79a2828ced51b05765e049a0 (diff)
downloadpostgresql-b5d69b7c22ee4c44b8bb99cfa0466ffaf3b5fab9.tar.gz
postgresql-b5d69b7c22ee4c44b8bb99cfa0466ffaf3b5fab9.zip
pgindent run prior to branching v13.
pgperltidy and reformat-dat-files too, though those didn't find anything to change.
Diffstat (limited to 'src')
-rw-r--r--src/backend/jit/llvm/llvmjit_expr.c4
-rw-r--r--src/backend/optimizer/plan/createplan.c12
-rw-r--r--src/backend/postmaster/autovacuum.c3
-rw-r--r--src/backend/utils/sort/logtape.c2
-rw-r--r--src/include/access/tableam.h2
-rw-r--r--src/tools/pgindent/typedefs.list3
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 4d8836cfb3f..cca5c117a0e 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 744eed187d4..eb9543f6add 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 38dc97de11f..9c7d4b0c60e 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 4984f8ce50a..138da0c1b42 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 30a21c9bc51..eb18739c365 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 05c5e9c752d..c65a55257dd 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