mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-14 02:17:02 +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
37 lines
837 B
C
37 lines
837 B
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* basebackup.h
|
|
* Exports from replication/basebackup.c.
|
|
*
|
|
* Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
|
|
*
|
|
* src/include/replication/basebackup.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef _BASEBACKUP_H
|
|
#define _BASEBACKUP_H
|
|
|
|
#include "nodes/replnodes.h"
|
|
|
|
/*
|
|
* Minimum and maximum values of MAX_RATE option in BASE_BACKUP command.
|
|
*/
|
|
#define MAX_RATE_LOWER 32
|
|
#define MAX_RATE_UPPER 1048576
|
|
|
|
|
|
typedef struct
|
|
{
|
|
char *oid;
|
|
char *path;
|
|
char *rpath; /* relative path within PGDATA, or NULL */
|
|
int64 size;
|
|
} tablespaceinfo;
|
|
|
|
extern void SendBaseBackup(BaseBackupCmd *cmd);
|
|
|
|
extern int64 sendTablespace(char *path, bool sizeonly);
|
|
|
|
#endif /* _BASEBACKUP_H */
|