open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

/contrib/btree_gist adjustments for new 'day' interval value.

Browse Source
REL8_1_STABLE
Bruce Momjian 20 years ago
parent ddc038cad2
commit a45f4c2533
2 changed files with 4 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      contrib/btree_gist/btree_interval.c
  2. 6
      contrib/btree_gist/btree_time.c

2
contrib/btree_gist/btree_interval.c
Unescape View File

@ -89,7 +89,7 @@ intr2num(const Interval *i)
return (ret); return (ret);
} }
#define INTERVALSIZE 12 #define INTERVALSIZE 16
static const gbtree_ninfo tinfo = static const gbtree_ninfo tinfo =
{ {

6
contrib/btree_gist/btree_time.c
Unescape View File

@ -221,7 +221,7 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
P_TimeADTGetDatum(origentry->upper))); P_TimeADTGetDatum(origentry->upper)));
/* see interval_larger */ /* see interval_larger */
res = Max(intr->time + intr->month * (30 * 86400), 0); res = Max(intr->time + intr->day * 86400 + intr->month * (30 * 86400), 0);
intr = DatumGetIntervalP(DirectFunctionCall2( intr = DatumGetIntervalP(DirectFunctionCall2(
time_mi_time, time_mi_time,
@ -229,7 +229,7 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
P_TimeADTGetDatum(newentry->lower))); P_TimeADTGetDatum(newentry->lower)));
/* see interval_larger */ /* see interval_larger */
res += Max(intr->time + intr->month * (30 * 86400), 0); res += Max(intr->time + intr->day * 86400 + intr->month * (30 * 86400), 0);
*result = 0.0; *result = 0.0;
@ -240,7 +240,7 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
P_TimeADTGetDatum(origentry->upper), P_TimeADTGetDatum(origentry->upper),
P_TimeADTGetDatum(origentry->lower))); P_TimeADTGetDatum(origentry->lower)));
*result += FLT_MIN; *result += FLT_MIN;
*result += (float) (res / ((double) (res + intr->time + intr->month * (30 * 86400)))); *result += (float) (res / ((double) (res + intr->time + intr->day * 86400 + intr->month * (30 * 86400))));
*result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1)); *result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1));
} }

Write Preview
Loading…
Cancel
Save