diff options
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 89de154bc60..51b6df54f4c 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -350,9 +350,9 @@ SocketBackend(StringInfo inBuf) else { /* - * Can't send DEBUG log messages to client at this point. - * Since we're disconnecting right away, we don't need to - * restore whereToSendOutput. + * Can't send DEBUG log messages to client at this point. Since + * we're disconnecting right away, we don't need to restore + * whereToSendOutput. */ whereToSendOutput = DestNone; ereport(DEBUG1, @@ -393,7 +393,7 @@ SocketBackend(StringInfo inBuf) whereToSendOutput = DestNone; ereport(DEBUG1, (errcode(ERRCODE_CONNECTION_DOES_NOT_EXIST), - errmsg("unexpected EOF on client connection"))); + errmsg("unexpected EOF on client connection"))); } return EOF; } @@ -999,12 +999,12 @@ exec_simple_query(const char *query_string) /* * Start the portal. - * - * If we took a snapshot for parsing/planning, the portal may be - * able to reuse it for the execution phase. Currently, this will only + * + * If we took a snapshot for parsing/planning, the portal may be able + * to reuse it for the execution phase. Currently, this will only * happen in PORTAL_ONE_SELECT mode. But even if PortalStart doesn't - * end up being able to do this, keeping the parse/plan snapshot around - * until after we start the portal doesn't cost much. + * end up being able to do this, keeping the parse/plan snapshot + * around until after we start the portal doesn't cost much. */ PortalStart(portal, NULL, 0, snapshot_set); @@ -1263,8 +1263,8 @@ exec_parse_message(const char *query_string, /* string to execute */ errdetail_abort())); /* - * Create the CachedPlanSource before we do parse analysis, since - * it needs to see the unmodified raw parse tree. + * Create the CachedPlanSource before we do parse analysis, since it + * needs to see the unmodified raw parse tree. */ psrc = CreateCachedPlan(raw_parse_tree, query_string, commandTag); @@ -1325,8 +1325,8 @@ exec_parse_message(const char *query_string, /* string to execute */ /* * CachedPlanSource must be a direct child of MessageContext before we * reparent unnamed_stmt_context under it, else we have a disconnected - * circular subgraph. Klugy, but less so than flipping contexts even - * more above. + * circular subgraph. Klugy, but less so than flipping contexts even more + * above. */ if (unnamed_stmt_context) MemoryContextSetParent(psrc->context, MessageContext); @@ -1549,9 +1549,9 @@ exec_bind_message(StringInfo input_message) /* * Set a snapshot if we have parameters to fetch (since the input * functions might need it) or the query isn't a utility command (and - * hence could require redoing parse analysis and planning). We keep - * the snapshot active till we're done, so that plancache.c doesn't have - * to take new ones. + * hence could require redoing parse analysis and planning). We keep the + * snapshot active till we're done, so that plancache.c doesn't have to + * take new ones. */ if (numParams > 0 || analyze_requires_snapshot(psrc->raw_parse_tree)) { @@ -1687,8 +1687,8 @@ exec_bind_message(StringInfo input_message) params->params[paramno].isnull = isNull; /* - * We mark the params as CONST. This ensures that any custom - * plan makes full use of the parameter values. + * We mark the params as CONST. This ensures that any custom plan + * makes full use of the parameter values. */ params->params[paramno].pflags = PARAM_FLAG_CONST; params->params[paramno].ptype = ptype; @@ -1736,9 +1736,9 @@ exec_bind_message(StringInfo input_message) /* * And we're ready to start portal execution. * - * If we took a snapshot for parsing/planning, we'll try to reuse it - * for query execution (currently, reuse will only occur if - * PORTAL_ONE_SELECT mode is chosen). + * If we took a snapshot for parsing/planning, we'll try to reuse it for + * query execution (currently, reuse will only occur if PORTAL_ONE_SELECT + * mode is chosen). */ PortalStart(portal, params, 0, snapshot_set); @@ -2601,7 +2601,7 @@ die(SIGNAL_ARGS) /* bump holdoff count to make ProcessInterrupts() a no-op */ /* until we are done getting ready for it */ InterruptHoldoffCount++; - LockErrorCleanup(); /* prevent CheckDeadLock from running */ + LockErrorCleanup(); /* prevent CheckDeadLock from running */ DisableNotifyInterrupt(); DisableCatchupInterrupt(); InterruptHoldoffCount--; @@ -2643,7 +2643,7 @@ StatementCancelHandler(SIGNAL_ARGS) /* bump holdoff count to make ProcessInterrupts() a no-op */ /* until we are done getting ready for it */ InterruptHoldoffCount++; - LockErrorCleanup(); /* prevent CheckDeadLock from running */ + LockErrorCleanup(); /* prevent CheckDeadLock from running */ DisableNotifyInterrupt(); DisableCatchupInterrupt(); InterruptHoldoffCount--; @@ -2802,7 +2802,7 @@ RecoveryConflictInterrupt(ProcSignalReason reason) /* bump holdoff count to make ProcessInterrupts() a no-op */ /* until we are done getting ready for it */ InterruptHoldoffCount++; - LockErrorCleanup(); /* prevent CheckDeadLock from running */ + LockErrorCleanup(); /* prevent CheckDeadLock from running */ DisableNotifyInterrupt(); DisableCatchupInterrupt(); InterruptHoldoffCount--; @@ -3269,9 +3269,12 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx) } #ifdef HAVE_INT_OPTERR - /* Turn this off because it's either printed to stderr and not the log - * where we'd want it, or argv[0] is now "--single", which would make for a - * weird error message. We print our own error message below. */ + + /* + * Turn this off because it's either printed to stderr and not the log + * where we'd want it, or argv[0] is now "--single", which would make for + * a weird error message. We print our own error message below. + */ opterr = 0; #endif @@ -3471,7 +3474,7 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx) if (IsUnderPostmaster) ereport(FATAL, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("invalid command-line argument for server process: %s", argv[optind]), + errmsg("invalid command-line argument for server process: %s", argv[optind]), errhint("Try \"%s --help\" for more information.", progname))); else ereport(FATAL, |