mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-22 10:13:24 +02: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
138 lines
4.0 KiB
C
138 lines
4.0 KiB
C
/*
|
|
* contrib/btree_gist/btree_utils_num.h
|
|
*/
|
|
#ifndef __BTREE_UTILS_NUM_H__
|
|
#define __BTREE_UTILS_NUM_H__
|
|
|
|
#include "btree_gist.h"
|
|
#include "access/gist.h"
|
|
#include "utils/rel.h"
|
|
|
|
#include <math.h>
|
|
#include <float.h>
|
|
|
|
typedef char GBT_NUMKEY;
|
|
|
|
/* Better readable key */
|
|
typedef struct
|
|
{
|
|
const GBT_NUMKEY *lower,
|
|
*upper;
|
|
} GBT_NUMKEY_R;
|
|
|
|
|
|
/* for sorting */
|
|
typedef struct
|
|
{
|
|
int i;
|
|
GBT_NUMKEY *t;
|
|
} Nsrt;
|
|
|
|
|
|
/* type description */
|
|
|
|
typedef struct
|
|
{
|
|
|
|
/* Attribs */
|
|
|
|
enum gbtree_type t; /* data type */
|
|
int32 size; /* size of type, 0 means variable */
|
|
int32 indexsize; /* size of datums stored in index */
|
|
|
|
/* Methods */
|
|
|
|
bool (*f_gt) (const void *, const void *, FmgrInfo *); /* greater than */
|
|
bool (*f_ge) (const void *, const void *, FmgrInfo *); /* greater or equal */
|
|
bool (*f_eq) (const void *, const void *, FmgrInfo *); /* equal */
|
|
bool (*f_le) (const void *, const void *, FmgrInfo *); /* less or equal */
|
|
bool (*f_lt) (const void *, const void *, FmgrInfo *); /* less than */
|
|
int (*f_cmp) (const void *, const void *, FmgrInfo *); /* key compare function */
|
|
float8 (*f_dist) (const void *, const void *, FmgrInfo *); /* key distance function */
|
|
} gbtree_ninfo;
|
|
|
|
|
|
/*
|
|
* Numeric btree functions
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
* Note: The factor 0.49 in following macro avoids floating point overflows
|
|
*/
|
|
#define penalty_num(result,olower,oupper,nlower,nupper) do { \
|
|
double tmp = 0.0F; \
|
|
(*(result)) = 0.0F; \
|
|
if ( (nupper) > (oupper) ) \
|
|
tmp += ( ((double)nupper)*0.49F - ((double)oupper)*0.49F ); \
|
|
if ( (olower) > (nlower) ) \
|
|
tmp += ( ((double)olower)*0.49F - ((double)nlower)*0.49F ); \
|
|
if (tmp > 0.0F) \
|
|
{ \
|
|
(*(result)) += FLT_MIN; \
|
|
(*(result)) += (float) ( ((double)(tmp)) / ( (double)(tmp) + ( ((double)(oupper))*0.49F - ((double)(olower))*0.49F ) ) ); \
|
|
(*(result)) *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1)); \
|
|
} \
|
|
} while (0);
|
|
|
|
|
|
/*
|
|
* Convert an Interval to an approximate equivalent number of seconds
|
|
* (as a double). Here because we need it for time/timetz as well as
|
|
* interval. See interval_cmp_internal for comparison.
|
|
*/
|
|
#define INTERVAL_TO_SEC(ivp) \
|
|
(((double) (ivp)->time) / ((double) USECS_PER_SEC) + \
|
|
(ivp)->day * (24.0 * SECS_PER_HOUR) + \
|
|
(ivp)->month * (30.0 * SECS_PER_DAY))
|
|
|
|
#define GET_FLOAT_DISTANCE(t, arg1, arg2) Abs( ((float8) *((const t *) (arg1))) - ((float8) *((const t *) (arg2))) )
|
|
|
|
#define SAMESIGN(a,b) (((a) < 0) == ((b) < 0))
|
|
|
|
/*
|
|
* check to see if a float4/8 val has underflowed or overflowed
|
|
* borrowed from src/backend/utils/adt/float.c
|
|
*/
|
|
#define CHECKFLOATVAL(val, inf_is_valid, zero_is_valid) \
|
|
do { \
|
|
if (isinf(val) && !(inf_is_valid)) \
|
|
ereport(ERROR, \
|
|
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), \
|
|
errmsg("value out of range: overflow"))); \
|
|
\
|
|
if ((val) == 0.0 && !(zero_is_valid)) \
|
|
ereport(ERROR, \
|
|
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), \
|
|
errmsg("value out of range: underflow"))); \
|
|
} while(0)
|
|
|
|
|
|
extern Interval *abs_interval(Interval *a);
|
|
|
|
extern bool gbt_num_consistent(const GBT_NUMKEY_R *key, const void *query,
|
|
const StrategyNumber *strategy, bool is_leaf,
|
|
const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern float8 gbt_num_distance(const GBT_NUMKEY_R *key, const void *query,
|
|
bool is_leaf, const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern GIST_SPLITVEC *gbt_num_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v,
|
|
const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern GISTENTRY *gbt_num_compress(GISTENTRY *entry, const gbtree_ninfo *tinfo);
|
|
|
|
extern GISTENTRY *gbt_num_fetch(GISTENTRY *entry, const gbtree_ninfo *tinfo);
|
|
|
|
extern void *gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec,
|
|
const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern bool gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b,
|
|
const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
extern void gbt_num_bin_union(Datum *u, GBT_NUMKEY *e,
|
|
const gbtree_ninfo *tinfo, FmgrInfo *flinfo);
|
|
|
|
#endif
|