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
88 lines
2.3 KiB
C
88 lines
2.3 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pg_am.h
|
|
* definition of the system "access method" relation (pg_am)
|
|
* along with the relation's initial contents.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/catalog/pg_am.h
|
|
*
|
|
* NOTES
|
|
* the genbki.pl script reads this file and generates .bki
|
|
* information from the DATA() statements.
|
|
*
|
|
* XXX do NOT break up DATA() statements into multiple lines!
|
|
* the scripts are not as smart as you might think...
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PG_AM_H
|
|
#define PG_AM_H
|
|
|
|
#include "catalog/genbki.h"
|
|
|
|
/* ----------------
|
|
* pg_am definition. cpp turns this into
|
|
* typedef struct FormData_pg_am
|
|
* ----------------
|
|
*/
|
|
#define AccessMethodRelationId 2601
|
|
|
|
CATALOG(pg_am,2601)
|
|
{
|
|
NameData amname; /* access method name */
|
|
regproc amhandler; /* handler function */
|
|
char amtype; /* see AMTYPE_xxx constants below */
|
|
} FormData_pg_am;
|
|
|
|
/* ----------------
|
|
* Form_pg_am corresponds to a pointer to a tuple with
|
|
* the format of pg_am relation.
|
|
* ----------------
|
|
*/
|
|
typedef FormData_pg_am *Form_pg_am;
|
|
|
|
/* ----------------
|
|
* compiler constants for pg_am
|
|
* ----------------
|
|
*/
|
|
#define Natts_pg_am 3
|
|
#define Anum_pg_am_amname 1
|
|
#define Anum_pg_am_amhandler 2
|
|
#define Anum_pg_am_amtype 3
|
|
|
|
/* ----------------
|
|
* compiler constant for amtype
|
|
* ----------------
|
|
*/
|
|
#define AMTYPE_INDEX 'i' /* index access method */
|
|
|
|
/* ----------------
|
|
* initial contents of pg_am
|
|
* ----------------
|
|
*/
|
|
|
|
DATA(insert OID = 403 ( btree bthandler i ));
|
|
DESCR("b-tree index access method");
|
|
#define BTREE_AM_OID 403
|
|
DATA(insert OID = 405 ( hash hashhandler i ));
|
|
DESCR("hash index access method");
|
|
#define HASH_AM_OID 405
|
|
DATA(insert OID = 783 ( gist gisthandler i ));
|
|
DESCR("GiST index access method");
|
|
#define GIST_AM_OID 783
|
|
DATA(insert OID = 2742 ( gin ginhandler i ));
|
|
DESCR("GIN index access method");
|
|
#define GIN_AM_OID 2742
|
|
DATA(insert OID = 4000 ( spgist spghandler i ));
|
|
DESCR("SP-GiST index access method");
|
|
#define SPGIST_AM_OID 4000
|
|
DATA(insert OID = 3580 ( brin brinhandler i ));
|
|
DESCR("block range index (BRIN) access method");
|
|
#define BRIN_AM_OID 3580
|
|
|
|
#endif /* PG_AM_H */
|