mirror of
https://github.com/postgres/postgres.git
synced 2025-07-12 21:01:52 +03: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 e3860ffa4d 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
75 lines
2.7 KiB
C
75 lines
2.7 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* queryenvironment.h
|
|
* Access to functions to mutate the query environment and retrieve the
|
|
* actual data related to entries (if any).
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/queryenvironment.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef QUERYENVIRONMENT_H
|
|
#define QUERYENVIRONMENT_H
|
|
|
|
#include "access/tupdesc.h"
|
|
|
|
|
|
typedef enum EphemeralNameRelationType
|
|
{
|
|
ENR_NAMED_TUPLESTORE /* named tuplestore relation; e.g., deltas */
|
|
} EphemeralNameRelationType;
|
|
|
|
/*
|
|
* Some ephemeral named relations must match some relation (e.g., trigger
|
|
* transition tables), so to properly handle cached plans and DDL, we should
|
|
* carry the OID of that relation. In other cases an ENR might be independent
|
|
* of any relation which is stored in the system catalogs, so we need to be
|
|
* able to directly store the TupleDesc. We never need both.
|
|
*/
|
|
typedef struct EphemeralNamedRelationMetadataData
|
|
{
|
|
char *name; /* name used to identify the relation */
|
|
|
|
/* only one of the next two fields should be used */
|
|
Oid reliddesc; /* oid of relation to get tupdesc */
|
|
TupleDesc tupdesc; /* description of result rows */
|
|
|
|
EphemeralNameRelationType enrtype; /* to identify type of relation */
|
|
double enrtuples; /* estimated number of tuples */
|
|
} EphemeralNamedRelationMetadataData;
|
|
|
|
typedef EphemeralNamedRelationMetadataData *EphemeralNamedRelationMetadata;
|
|
|
|
/*
|
|
* Ephemeral Named Relation data; used for parsing named relations not in the
|
|
* catalog, like transition tables in AFTER triggers.
|
|
*/
|
|
typedef struct EphemeralNamedRelationData
|
|
{
|
|
EphemeralNamedRelationMetadataData md;
|
|
void *reldata; /* structure for execution-time access to data */
|
|
} EphemeralNamedRelationData;
|
|
|
|
typedef EphemeralNamedRelationData *EphemeralNamedRelation;
|
|
|
|
/*
|
|
* This is an opaque structure outside of queryenvironment.c itself. The
|
|
* intention is to be able to change the implementation or add new context
|
|
* features without needing to change existing code for use of existing
|
|
* features.
|
|
*/
|
|
typedef struct QueryEnvironment QueryEnvironment;
|
|
|
|
|
|
extern QueryEnvironment *create_queryEnv(void);
|
|
extern EphemeralNamedRelationMetadata get_visible_ENR_metadata(QueryEnvironment *queryEnv, const char *refname);
|
|
extern void register_ENR(QueryEnvironment *queryEnv, EphemeralNamedRelation enr);
|
|
extern void unregister_ENR(QueryEnvironment *queryEnv, const char *name);
|
|
extern EphemeralNamedRelation get_ENR(QueryEnvironment *queryEnv, const char *name);
|
|
extern TupleDesc ENRMetadataGetTupDesc(EphemeralNamedRelationMetadata enrmd);
|
|
|
|
#endif /* QUERYENVIRONMENT_H */
|