mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-13 01:47:05 +08:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments to the right of code, and remove pgindent hack that caused comments following #endif to not obey the general rule. Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using the published version of pg_bsd_indent, but a hacked-up version that tried to minimize the amount of movement of comments to the right of code. The situation of interest is where such a comment has to be moved to the right of its default placement at column 33 because there's code there. BSD indent has always moved right in units of tab stops in such cases --- but in the previous incarnation, indent was working in 8-space tab stops, while now it knows we use 4-space tabs. So the net result is that in about half the cases, such comments are placed one tab stop left of before. This is better all around: it leaves more room on the line for comment text, and it means that in such cases the comment uniformly starts at the next 4-space tab stop after the code, rather than sometimes one and sometimes two tabs after. Also, ensure that comments following #endif are indented the same as comments following other preprocessor commands such as #else. That inconsistency turns out to have been self-inflicted damage from a poorly-thought-through post-indent "fixup" in pgindent. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
71 lines
2.3 KiB
C
71 lines
2.3 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* execdesc.h
|
|
* plan and query descriptor accessor macros used by the executor
|
|
* and related modules.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/executor/execdesc.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef EXECDESC_H
|
|
#define EXECDESC_H
|
|
|
|
#include "nodes/execnodes.h"
|
|
#include "tcop/dest.h"
|
|
|
|
|
|
/* ----------------
|
|
* query descriptor:
|
|
*
|
|
* a QueryDesc encapsulates everything that the executor
|
|
* needs to execute the query.
|
|
*
|
|
* For the convenience of SQL-language functions, we also support QueryDescs
|
|
* containing utility statements; these must not be passed to the executor
|
|
* however.
|
|
* ---------------------
|
|
*/
|
|
typedef struct QueryDesc
|
|
{
|
|
/* These fields are provided by CreateQueryDesc */
|
|
CmdType operation; /* CMD_SELECT, CMD_UPDATE, etc. */
|
|
PlannedStmt *plannedstmt; /* planner's output (could be utility, too) */
|
|
const char *sourceText; /* source text of the query */
|
|
Snapshot snapshot; /* snapshot to use for query */
|
|
Snapshot crosscheck_snapshot; /* crosscheck for RI update/delete */
|
|
DestReceiver *dest; /* the destination for tuple output */
|
|
ParamListInfo params; /* param values being passed in */
|
|
QueryEnvironment *queryEnv; /* query environment passed in */
|
|
int instrument_options; /* OR of InstrumentOption flags */
|
|
|
|
/* These fields are set by ExecutorStart */
|
|
TupleDesc tupDesc; /* descriptor for result tuples */
|
|
EState *estate; /* executor's query-wide state */
|
|
PlanState *planstate; /* tree of per-plan-node state */
|
|
|
|
/* This field is set by ExecutorRun */
|
|
bool already_executed; /* true if previously executed */
|
|
|
|
/* This is always set NULL by the core system, but plugins can change it */
|
|
struct Instrumentation *totaltime; /* total time spent in ExecutorRun */
|
|
} QueryDesc;
|
|
|
|
/* in pquery.c */
|
|
extern QueryDesc *CreateQueryDesc(PlannedStmt *plannedstmt,
|
|
const char *sourceText,
|
|
Snapshot snapshot,
|
|
Snapshot crosscheck_snapshot,
|
|
DestReceiver *dest,
|
|
ParamListInfo params,
|
|
QueryEnvironment *queryEnv,
|
|
int instrument_options);
|
|
|
|
extern void FreeQueryDesc(QueryDesc *qdesc);
|
|
|
|
#endif /* EXECDESC_H */
|