mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-09 11:47:36 +08:00
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
213 lines
6.1 KiB
C
213 lines
6.1 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* syscache.h
|
|
* System catalog cache definitions.
|
|
*
|
|
* See also lsyscache.h, which provides convenience routines for
|
|
* common cache-lookup operations.
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/syscache.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef SYSCACHE_H
|
|
#define SYSCACHE_H
|
|
|
|
#include "access/attnum.h"
|
|
#include "access/htup.h"
|
|
/* we intentionally do not include utils/catcache.h here */
|
|
|
|
/*
|
|
* SysCache identifiers.
|
|
*
|
|
* The order of these identifiers must match the order
|
|
* of the entries in the array cacheinfo[] in syscache.c.
|
|
* Keep them in alphabetical order (renumbering only costs a
|
|
* backend rebuild).
|
|
*/
|
|
|
|
enum SysCacheIdentifier
|
|
{
|
|
AGGFNOID = 0,
|
|
AMNAME,
|
|
AMOID,
|
|
AMOPOPID,
|
|
AMOPSTRATEGY,
|
|
AMPROCNUM,
|
|
ATTNAME,
|
|
ATTNUM,
|
|
AUTHMEMMEMROLE,
|
|
AUTHMEMROLEMEM,
|
|
AUTHNAME,
|
|
AUTHOID,
|
|
CASTSOURCETARGET,
|
|
CLAAMNAMENSP,
|
|
CLAOID,
|
|
COLLNAMEENCNSP,
|
|
COLLOID,
|
|
CONDEFAULT,
|
|
CONNAMENSP,
|
|
CONSTROID,
|
|
CONVOID,
|
|
DATABASEOID,
|
|
DEFACLROLENSPOBJ,
|
|
ENUMOID,
|
|
ENUMTYPOIDNAME,
|
|
EVENTTRIGGERNAME,
|
|
EVENTTRIGGEROID,
|
|
FOREIGNDATAWRAPPERNAME,
|
|
FOREIGNDATAWRAPPEROID,
|
|
FOREIGNSERVERNAME,
|
|
FOREIGNSERVEROID,
|
|
FOREIGNTABLEREL,
|
|
INDEXRELID,
|
|
LANGNAME,
|
|
LANGOID,
|
|
NAMESPACENAME,
|
|
NAMESPACEOID,
|
|
OPERNAMENSP,
|
|
OPEROID,
|
|
OPFAMILYAMNAMENSP,
|
|
OPFAMILYOID,
|
|
PARTRELID,
|
|
PROCNAMEARGSNSP,
|
|
PROCOID,
|
|
PUBLICATIONNAME,
|
|
PUBLICATIONOID,
|
|
PUBLICATIONREL,
|
|
PUBLICATIONRELMAP,
|
|
RANGETYPE,
|
|
RELNAMENSP,
|
|
RELOID,
|
|
REPLORIGIDENT,
|
|
REPLORIGNAME,
|
|
RULERELNAME,
|
|
SEQRELID,
|
|
STATEXTNAMENSP,
|
|
STATEXTOID,
|
|
STATRELATTINH,
|
|
SUBSCRIPTIONNAME,
|
|
SUBSCRIPTIONOID,
|
|
SUBSCRIPTIONRELMAP,
|
|
TABLESPACEOID,
|
|
TRFOID,
|
|
TRFTYPELANG,
|
|
TSCONFIGMAP,
|
|
TSCONFIGNAMENSP,
|
|
TSCONFIGOID,
|
|
TSDICTNAMENSP,
|
|
TSDICTOID,
|
|
TSPARSERNAMENSP,
|
|
TSPARSEROID,
|
|
TSTEMPLATENAMENSP,
|
|
TSTEMPLATEOID,
|
|
TYPENAMENSP,
|
|
TYPEOID,
|
|
USERMAPPINGOID,
|
|
USERMAPPINGUSERSERVER
|
|
|
|
#define SysCacheSize (USERMAPPINGUSERSERVER + 1)
|
|
};
|
|
|
|
extern void InitCatalogCache(void);
|
|
extern void InitCatalogCachePhase2(void);
|
|
|
|
extern HeapTuple SearchSysCache(int cacheId,
|
|
Datum key1, Datum key2, Datum key3, Datum key4);
|
|
extern void ReleaseSysCache(HeapTuple tuple);
|
|
|
|
/* convenience routines */
|
|
extern HeapTuple SearchSysCacheCopy(int cacheId,
|
|
Datum key1, Datum key2, Datum key3, Datum key4);
|
|
extern bool SearchSysCacheExists(int cacheId,
|
|
Datum key1, Datum key2, Datum key3, Datum key4);
|
|
extern Oid GetSysCacheOid(int cacheId,
|
|
Datum key1, Datum key2, Datum key3, Datum key4);
|
|
|
|
extern HeapTuple SearchSysCacheAttName(Oid relid, const char *attname);
|
|
extern HeapTuple SearchSysCacheCopyAttName(Oid relid, const char *attname);
|
|
extern bool SearchSysCacheExistsAttName(Oid relid, const char *attname);
|
|
|
|
extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup,
|
|
AttrNumber attributeNumber, bool *isNull);
|
|
|
|
extern uint32 GetSysCacheHashValue(int cacheId,
|
|
Datum key1, Datum key2, Datum key3, Datum key4);
|
|
|
|
/* list-search interface. Users of this must import catcache.h too */
|
|
struct catclist;
|
|
extern struct catclist *SearchSysCacheList(int cacheId, int nkeys,
|
|
Datum key1, Datum key2, Datum key3, Datum key4);
|
|
|
|
extern void SysCacheInvalidate(int cacheId, uint32 hashValue);
|
|
|
|
extern bool RelationInvalidatesSnapshotsOnly(Oid relid);
|
|
extern bool RelationHasSysCache(Oid relid);
|
|
extern bool RelationSupportsSysCache(Oid relid);
|
|
|
|
/*
|
|
* The use of the macros below rather than direct calls to the corresponding
|
|
* functions is encouraged, as it insulates the caller from changes in the
|
|
* maximum number of keys.
|
|
*/
|
|
#define SearchSysCache1(cacheId, key1) \
|
|
SearchSysCache(cacheId, key1, 0, 0, 0)
|
|
#define SearchSysCache2(cacheId, key1, key2) \
|
|
SearchSysCache(cacheId, key1, key2, 0, 0)
|
|
#define SearchSysCache3(cacheId, key1, key2, key3) \
|
|
SearchSysCache(cacheId, key1, key2, key3, 0)
|
|
#define SearchSysCache4(cacheId, key1, key2, key3, key4) \
|
|
SearchSysCache(cacheId, key1, key2, key3, key4)
|
|
|
|
#define SearchSysCacheCopy1(cacheId, key1) \
|
|
SearchSysCacheCopy(cacheId, key1, 0, 0, 0)
|
|
#define SearchSysCacheCopy2(cacheId, key1, key2) \
|
|
SearchSysCacheCopy(cacheId, key1, key2, 0, 0)
|
|
#define SearchSysCacheCopy3(cacheId, key1, key2, key3) \
|
|
SearchSysCacheCopy(cacheId, key1, key2, key3, 0)
|
|
#define SearchSysCacheCopy4(cacheId, key1, key2, key3, key4) \
|
|
SearchSysCacheCopy(cacheId, key1, key2, key3, key4)
|
|
|
|
#define SearchSysCacheExists1(cacheId, key1) \
|
|
SearchSysCacheExists(cacheId, key1, 0, 0, 0)
|
|
#define SearchSysCacheExists2(cacheId, key1, key2) \
|
|
SearchSysCacheExists(cacheId, key1, key2, 0, 0)
|
|
#define SearchSysCacheExists3(cacheId, key1, key2, key3) \
|
|
SearchSysCacheExists(cacheId, key1, key2, key3, 0)
|
|
#define SearchSysCacheExists4(cacheId, key1, key2, key3, key4) \
|
|
SearchSysCacheExists(cacheId, key1, key2, key3, key4)
|
|
|
|
#define GetSysCacheOid1(cacheId, key1) \
|
|
GetSysCacheOid(cacheId, key1, 0, 0, 0)
|
|
#define GetSysCacheOid2(cacheId, key1, key2) \
|
|
GetSysCacheOid(cacheId, key1, key2, 0, 0)
|
|
#define GetSysCacheOid3(cacheId, key1, key2, key3) \
|
|
GetSysCacheOid(cacheId, key1, key2, key3, 0)
|
|
#define GetSysCacheOid4(cacheId, key1, key2, key3, key4) \
|
|
GetSysCacheOid(cacheId, key1, key2, key3, key4)
|
|
|
|
#define GetSysCacheHashValue1(cacheId, key1) \
|
|
GetSysCacheHashValue(cacheId, key1, 0, 0, 0)
|
|
#define GetSysCacheHashValue2(cacheId, key1, key2) \
|
|
GetSysCacheHashValue(cacheId, key1, key2, 0, 0)
|
|
#define GetSysCacheHashValue3(cacheId, key1, key2, key3) \
|
|
GetSysCacheHashValue(cacheId, key1, key2, key3, 0)
|
|
#define GetSysCacheHashValue4(cacheId, key1, key2, key3, key4) \
|
|
GetSysCacheHashValue(cacheId, key1, key2, key3, key4)
|
|
|
|
#define SearchSysCacheList1(cacheId, key1) \
|
|
SearchSysCacheList(cacheId, 1, key1, 0, 0, 0)
|
|
#define SearchSysCacheList2(cacheId, key1, key2) \
|
|
SearchSysCacheList(cacheId, 2, key1, key2, 0, 0)
|
|
#define SearchSysCacheList3(cacheId, key1, key2, key3) \
|
|
SearchSysCacheList(cacheId, 3, key1, key2, key3, 0)
|
|
#define SearchSysCacheList4(cacheId, key1, key2, key3, key4) \
|
|
SearchSysCacheList(cacheId, 4, key1, key2, key3, key4)
|
|
|
|
#define ReleaseSysCacheList(x) ReleaseCatCacheList(x)
|
|
|
|
#endif /* SYSCACHE_H */
|