mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
- Add aligment of variable data types
- Add aligment for interval data types - Avoid floating point overflow in penalty functions Janko Richter <jankorichter@yahoo.de> and teodor
This commit is contained in:
@ -3,8 +3,7 @@
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Interval lower,
|
||||
upper;
|
||||
Interval lower, upper;
|
||||
} intvKEY;
|
||||
|
||||
|
||||
@ -12,6 +11,7 @@ typedef struct
|
||||
** Interval ops
|
||||
*/
|
||||
PG_FUNCTION_INFO_V1(gbt_intv_compress);
|
||||
PG_FUNCTION_INFO_V1(gbt_intv_decompress);
|
||||
PG_FUNCTION_INFO_V1(gbt_intv_union);
|
||||
PG_FUNCTION_INFO_V1(gbt_intv_picksplit);
|
||||
PG_FUNCTION_INFO_V1(gbt_intv_consistent);
|
||||
@ -19,6 +19,7 @@ PG_FUNCTION_INFO_V1(gbt_intv_penalty);
|
||||
PG_FUNCTION_INFO_V1(gbt_intv_same);
|
||||
|
||||
Datum gbt_intv_compress(PG_FUNCTION_ARGS);
|
||||
Datum gbt_intv_decompress(PG_FUNCTION_ARGS);
|
||||
Datum gbt_intv_union(PG_FUNCTION_ARGS);
|
||||
Datum gbt_intv_picksplit(PG_FUNCTION_ARGS);
|
||||
Datum gbt_intv_consistent(PG_FUNCTION_ARGS);
|
||||
@ -28,27 +29,27 @@ Datum gbt_intv_same(PG_FUNCTION_ARGS);
|
||||
|
||||
static bool gbt_intvgt (const void *a, const void *b)
|
||||
{
|
||||
return DirectFunctionCall2 ( interval_gt , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) );
|
||||
return DatumGetBool(DirectFunctionCall2 ( interval_gt , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) ));
|
||||
}
|
||||
|
||||
static bool gbt_intvge (const void *a, const void *b)
|
||||
{
|
||||
return DirectFunctionCall2 ( interval_ge , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) );
|
||||
return DatumGetBool(DirectFunctionCall2 ( interval_ge , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) ));
|
||||
}
|
||||
|
||||
static bool gbt_intveq (const void *a, const void *b)
|
||||
{
|
||||
return DirectFunctionCall2 ( interval_eq , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) );
|
||||
return DatumGetBool(DirectFunctionCall2 ( interval_eq , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) ));
|
||||
}
|
||||
|
||||
static bool gbt_intvle (const void *a, const void *b)
|
||||
{
|
||||
return DirectFunctionCall2 ( interval_le , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) );
|
||||
return DatumGetBool(DirectFunctionCall2 ( interval_le , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) ));
|
||||
}
|
||||
|
||||
static bool gbt_intvlt (const void *a, const void *b)
|
||||
{
|
||||
return DirectFunctionCall2 ( interval_lt , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) );
|
||||
return DatumGetBool(DirectFunctionCall2 ( interval_lt , IntervalPGetDatum ( a ) , IntervalPGetDatum ( b ) ));
|
||||
}
|
||||
|
||||
static int
|
||||
@ -56,12 +57,32 @@ gbt_intvkey_cmp(const void *a, const void *b)
|
||||
{
|
||||
return DatumGetInt32 (
|
||||
DirectFunctionCall2 ( interval_cmp ,
|
||||
IntervalPGetDatum(&((Nsrt *) a)->t[0]) ,
|
||||
IntervalPGetDatum(&((Nsrt *) b)->t[0])
|
||||
IntervalPGetDatum(((Nsrt *) a)->t) ,
|
||||
IntervalPGetDatum(((Nsrt *) b)->t)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
static double intr2num ( const Interval * i )
|
||||
{
|
||||
double ret = 0.0;
|
||||
struct pg_tm tm;
|
||||
fsec_t fsec;
|
||||
interval2tm( *i, &tm, &fsec);
|
||||
ret += ( tm.tm_year * 360.0 * 86400.0 ) ;
|
||||
ret += ( tm.tm_mon * 12.0 * 86400.0 ) ;
|
||||
ret += ( tm.tm_mday * 86400.0 ) ;
|
||||
ret += ( tm.tm_hour * 3600.0 ) ;
|
||||
ret += ( tm.tm_min * 60.0 ) ;
|
||||
ret += ( tm.tm_sec ) ;
|
||||
ret += ( fsec / 1000000.0 );
|
||||
|
||||
return ( ret );
|
||||
}
|
||||
|
||||
#define INTERVALSIZE 12
|
||||
|
||||
static const gbtree_ninfo tinfo =
|
||||
{
|
||||
gbt_t_intv,
|
||||
@ -84,10 +105,51 @@ Datum
|
||||
gbt_intv_compress(PG_FUNCTION_ARGS)
|
||||
{
|
||||
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
|
||||
GISTENTRY *retval = NULL;
|
||||
PG_RETURN_POINTER( gbt_num_compress( retval , entry , &tinfo ));
|
||||
GISTENTRY *retval = entry;
|
||||
if ( entry->leafkey || INTERVALSIZE != sizeof(Interval) ) {
|
||||
char *r = ( char * ) palloc(2 * INTERVALSIZE);
|
||||
|
||||
retval = palloc(sizeof(GISTENTRY));
|
||||
|
||||
if ( entry->leafkey ) {
|
||||
Interval *key = DatumGetIntervalP(entry->key);
|
||||
memcpy( (void*) r , (void*)key, INTERVALSIZE);
|
||||
memcpy( (void*)(r + INTERVALSIZE), (void*)key, INTERVALSIZE);
|
||||
} else {
|
||||
intvKEY *key = ( intvKEY * ) DatumGetPointer(entry->key);
|
||||
memcpy(r, &key->lower, INTERVALSIZE);
|
||||
memcpy(r + INTERVALSIZE, &key->upper, INTERVALSIZE);
|
||||
}
|
||||
gistentryinit(*retval, PointerGetDatum(r),
|
||||
entry->rel, entry->page,
|
||||
entry->offset, 2 * INTERVALSIZE, FALSE);
|
||||
}
|
||||
|
||||
PG_RETURN_POINTER(retval);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Datum
|
||||
gbt_intv_decompress(PG_FUNCTION_ARGS)
|
||||
{
|
||||
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
|
||||
GISTENTRY *retval = entry;
|
||||
|
||||
if ( INTERVALSIZE != sizeof(Interval) ) {
|
||||
intvKEY *r = palloc(sizeof(intvKEY));
|
||||
char *key = DatumGetPointer(entry->key);
|
||||
|
||||
retval = palloc(sizeof(GISTENTRY));
|
||||
memcpy( &r->lower, key, INTERVALSIZE);
|
||||
memcpy( &r->upper, key+ INTERVALSIZE, INTERVALSIZE);
|
||||
|
||||
gistentryinit(*retval, PointerGetDatum(r),
|
||||
entry->rel, entry->page,
|
||||
entry->offset, sizeof(intvKEY), FALSE);
|
||||
}
|
||||
PG_RETURN_POINTER(retval);
|
||||
}
|
||||
|
||||
|
||||
Datum
|
||||
gbt_intv_consistent(PG_FUNCTION_ARGS)
|
||||
@ -97,6 +159,7 @@ gbt_intv_consistent(PG_FUNCTION_ARGS)
|
||||
intvKEY *kkk = (intvKEY *) DatumGetPointer(entry->key);
|
||||
GBT_NUMKEY_R key ;
|
||||
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
|
||||
|
||||
key.lower = (GBT_NUMKEY*) &kkk->lower ;
|
||||
key.upper = (GBT_NUMKEY*) &kkk->upper ;
|
||||
|
||||
@ -121,56 +184,26 @@ gbt_intv_penalty(PG_FUNCTION_ARGS)
|
||||
{
|
||||
intvKEY *origentry = (intvKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
|
||||
intvKEY *newentry = (intvKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
|
||||
float *result = (float *) PG_GETARG_POINTER(2);
|
||||
Interval *intr;
|
||||
#ifdef HAVE_INT64_TIMESTAMP
|
||||
int64 res;
|
||||
#else
|
||||
double res;
|
||||
#endif
|
||||
float *result = (float *) PG_GETARG_POINTER(2);
|
||||
double iorg[2], inew[2], res;
|
||||
|
||||
intr = DatumGetIntervalP(DirectFunctionCall2(
|
||||
interval_mi,
|
||||
IntervalPGetDatum(&newentry->upper),
|
||||
IntervalPGetDatum(&origentry->upper)
|
||||
));
|
||||
iorg[0] = intr2num ( &origentry->lower );
|
||||
iorg[1] = intr2num ( &origentry->upper );
|
||||
inew[0] = intr2num ( &newentry->lower );
|
||||
inew[1] = intr2num ( &newentry->upper );
|
||||
|
||||
/* see interval_larger */
|
||||
|
||||
res = Max(intr->time + intr->month * (30 * 86400), 0);
|
||||
pfree(intr);
|
||||
|
||||
intr = DatumGetIntervalP(DirectFunctionCall2(
|
||||
interval_mi,
|
||||
IntervalPGetDatum(&origentry->lower),
|
||||
IntervalPGetDatum(&newentry->lower)
|
||||
));
|
||||
|
||||
/* see interval_larger */
|
||||
res += Max(intr->time + intr->month * (30 * 86400), 0);
|
||||
pfree(intr);
|
||||
penalty_range_enlarge ( iorg[0], iorg[1], inew[0], inew[1] );
|
||||
|
||||
*result = 0.0;
|
||||
|
||||
if ( res > 0 ){
|
||||
|
||||
intr = DatumGetIntervalP(DirectFunctionCall2(
|
||||
interval_mi,
|
||||
IntervalPGetDatum(&origentry->upper),
|
||||
IntervalPGetDatum(&origentry->lower)
|
||||
));
|
||||
|
||||
*result += FLT_MIN ;
|
||||
*result += (float) ( res / ( (double) ( res + intr->time + intr->month * (30 * 86400) ) ) );
|
||||
*result += (float) ( res / ( res + iorg[1] - iorg[0] ) );
|
||||
*result *= ( FLT_MAX / ( ( (GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1 ) );
|
||||
|
||||
pfree ( intr );
|
||||
|
||||
}
|
||||
|
||||
PG_RETURN_POINTER(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
Datum
|
||||
|
Reference in New Issue
Block a user