mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-11-27 07:21:09 +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 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
74 lines
2.2 KiB
C
74 lines
2.2 KiB
C
/*
|
|
* contrib/btree_gist/btree_utils_var.h
|
|
*/
|
|
#ifndef __BTREE_UTILS_VAR_H__
|
|
#define __BTREE_UTILS_VAR_H__
|
|
|
|
#include "btree_gist.h"
|
|
|
|
#include "access/gist.h"
|
|
#include "mb/pg_wchar.h"
|
|
|
|
/* Variable length key */
|
|
typedef bytea GBT_VARKEY;
|
|
|
|
/* Better readable key */
|
|
typedef struct
|
|
{
|
|
bytea *lower,
|
|
*upper;
|
|
} GBT_VARKEY_R;
|
|
|
|
/*
|
|
* type description
|
|
*/
|
|
typedef struct
|
|
{
|
|
|
|
/* Attribs */
|
|
|
|
enum gbtree_type t; /* data type */
|
|
int32 eml; /* cached pg_database_encoding_max_length (0:
|
|
* undefined) */
|
|
bool trnc; /* truncate (=compress) key */
|
|
|
|
/* Methods */
|
|
|
|
bool (*f_gt) (const void *, const void *, Oid, FmgrInfo *); /* greater than */
|
|
bool (*f_ge) (const void *, const void *, Oid, FmgrInfo *); /* greater equal */
|
|
bool (*f_eq) (const void *, const void *, Oid, FmgrInfo *); /* equal */
|
|
bool (*f_le) (const void *, const void *, Oid, FmgrInfo *); /* less equal */
|
|
bool (*f_lt) (const void *, const void *, Oid, FmgrInfo *); /* less than */
|
|
int32 (*f_cmp) (const void *, const void *, Oid, FmgrInfo *); /* compare */
|
|
GBT_VARKEY *(*f_l2n) (GBT_VARKEY *, FmgrInfo *flinfo); /* convert leaf to node */
|
|
} gbtree_vinfo;
|
|
|
|
|
|
|
|
extern GBT_VARKEY_R gbt_var_key_readable(const GBT_VARKEY *k);
|
|
|
|
extern GBT_VARKEY *gbt_var_key_copy(const GBT_VARKEY_R *u);
|
|
|
|
extern GISTENTRY *gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo);
|
|
|
|
extern GBT_VARKEY *gbt_var_union(const GistEntryVector *entryvec, int32 *size,
|
|
Oid collation, const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern bool gbt_var_same(Datum d1, Datum d2, Oid collation,
|
|
const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern float *gbt_var_penalty(float *res, const GISTENTRY *o, const GISTENTRY *n,
|
|
Oid collation, const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern bool gbt_var_consistent(GBT_VARKEY_R *key, const void *query,
|
|
StrategyNumber strategy, Oid collation, bool is_leaf,
|
|
const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern GIST_SPLITVEC *gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v,
|
|
Oid collation, const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern void gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
|
|
const gbtree_vinfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
#endif
|