database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-08 06:02:22 +03:00
Code Activity

Fix btree_gist to handle timetz zone correctly per recent changes.

Browse Source
This commit is contained in:
Tom Lane
2005-04-25 16:58:18 +00:00
parent 582dcae7e8
commit 73c195c607
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/btree_gist/btree_time.c
View File

@@ -123,14 +123,17 @@ gbt_timetz_compress(PG_FUNCTION_ARGS)
{ {
timeKEY *r = (timeKEY *) palloc(sizeof(timeKEY)); timeKEY *r = (timeKEY *) palloc(sizeof(timeKEY));
TimeTzADT *tz = DatumGetTimeTzADTP(entry->key); TimeTzADT *tz = DatumGetTimeTzADTP(entry->key);
void *qqq = DatumGetPointer( TimeADTGetDatum(tz->time + tz->zone) ); TimeADT tmp;
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
/* We are using the time + zone only to compress */ /* We are using the time + zone only to compress */
memcpy( &(r->lower), qqq, sizeof(TimeADT) ); #ifdef HAVE_INT64_TIMESTAMP
memcpy( &(r->upper), qqq, sizeof(TimeADT) ); tmp = tz->time + (tz->zone * INT64CONST(1000000));
pfree(qqq); #else
tmp = (tz->time + tz->zone);
#endif
r->lower = r->upper = tmp;
gistentryinit(*retval, PointerGetDatum(r), gistentryinit(*retval, PointerGetDatum(r),
entry->rel, entry->page, entry->rel, entry->page,
entry->offset, sizeof(timeKEY), FALSE); entry->offset, sizeof(timeKEY), FALSE);
@@ -163,17 +166,23 @@ gbt_timetz_consistent(PG_FUNCTION_ARGS)
{ {
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TimeTzADT *query = PG_GETARG_TIMETZADT_P(1); TimeTzADT *query = PG_GETARG_TIMETZADT_P(1);
void* qqq = DatumGetPointer( TimeADTGetDatum(query->time + query->zone) );
timeKEY *kkk = (timeKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
timeKEY *kkk = (timeKEY *) DatumGetPointer(entry->key);
TimeADT qqq;
GBT_NUMKEY_R key;
bool res; bool res;
#ifdef HAVE_INT64_TIMESTAMP
qqq = query->time + (query->zone * INT64CONST(1000000));
#else
qqq = (query->time + query->zone);
#endif
key.lower = (GBT_NUMKEY *) & kkk->lower; key.lower = (GBT_NUMKEY *) & kkk->lower;
key.upper = (GBT_NUMKEY *) & kkk->upper; key.upper = (GBT_NUMKEY *) & kkk->upper;
res = gbt_num_consistent(&key, qqq, &strategy, GIST_LEAF(entry), &tinfo); res = gbt_num_consistent(&key, (void *) &qqq, &strategy, GIST_LEAF(entry), &tinfo);
pfree(qqq);
PG_RETURN_BOOL( res ); PG_RETURN_BOOL( res );
} }