mirror of
https://github.com/postgres/postgres.git
synced 2026-03-10 10:11:28 -04: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 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
69 lines
1.8 KiB
C
69 lines
1.8 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* sequence.h
|
|
* prototypes for sequence.c.
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/commands/sequence.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef SEQUENCE_H
|
|
#define SEQUENCE_H
|
|
|
|
#include "access/xlogreader.h"
|
|
#include "catalog/objectaddress.h"
|
|
#include "fmgr.h"
|
|
#include "lib/stringinfo.h"
|
|
#include "nodes/parsenodes.h"
|
|
#include "parser/parse_node.h"
|
|
#include "storage/relfilenode.h"
|
|
|
|
|
|
typedef struct FormData_pg_sequence_data
|
|
{
|
|
int64 last_value;
|
|
int64 log_cnt;
|
|
bool is_called;
|
|
} FormData_pg_sequence_data;
|
|
|
|
typedef FormData_pg_sequence_data *Form_pg_sequence_data;
|
|
|
|
/*
|
|
* Columns of a sequence relation
|
|
*/
|
|
|
|
#define SEQ_COL_LASTVAL 1
|
|
#define SEQ_COL_LOG 2
|
|
#define SEQ_COL_CALLED 3
|
|
|
|
#define SEQ_COL_FIRSTCOL SEQ_COL_LASTVAL
|
|
#define SEQ_COL_LASTCOL SEQ_COL_CALLED
|
|
|
|
/* XLOG stuff */
|
|
#define XLOG_SEQ_LOG 0x00
|
|
|
|
typedef struct xl_seq_rec
|
|
{
|
|
RelFileNode node;
|
|
/* SEQUENCE TUPLE DATA FOLLOWS AT THE END */
|
|
} xl_seq_rec;
|
|
|
|
extern int64 nextval_internal(Oid relid, bool check_permissions);
|
|
extern Datum nextval(PG_FUNCTION_ARGS);
|
|
extern List *sequence_options(Oid relid);
|
|
|
|
extern ObjectAddress DefineSequence(ParseState *pstate, CreateSeqStmt *stmt);
|
|
extern ObjectAddress AlterSequence(ParseState *pstate, AlterSeqStmt *stmt);
|
|
extern void DeleteSequenceTuple(Oid relid);
|
|
extern void ResetSequence(Oid seq_relid);
|
|
extern void ResetSequenceCaches(void);
|
|
|
|
extern void seq_redo(XLogReaderState *rptr);
|
|
extern void seq_desc(StringInfo buf, XLogReaderState *rptr);
|
|
extern const char *seq_identify(uint8 info);
|
|
extern void seq_mask(char *pagedata, BlockNumber blkno);
|
|
|
|
#endif /* SEQUENCE_H */
|