database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-20 00:42:27 +03:00
Code

BACKPATCH:

Browse Source 
Please, apply attached patch of contrib/btree_gist to 7.2.1 and current
cvs.
The patch fixes memory leak during creation GiST index on timestamp
column.

Thank you.

--
Teodor Sigaev
teodor@stack.net
This commit is contained in:
Bruce Momjian 2002-02-22 06:08:48 +00:00
parent c30ef871cd
commit a81dc0d168
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contrib/btree_gist/btree_gist.c
View File

@ -86,6 +86,8 @@ Datum gts_same(PG_FUNCTION_ARGS);
static void gts_binary_union(Datum *r1, char *r2); static void gts_binary_union(Datum *r1, char *r2);
static int tskey_cmp(const void *a, const void *b); static int tskey_cmp(const void *a, const void *b);
#define TimestampGetDatumFast(X) Float8GetDatumFast(X)
/* define for comparison */ /* define for comparison */
#define TSGE( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \ #define TSGE( ts1, ts2 ) (DatumGetBool(DirectFunctionCall2( \
timestamp_ge, \ timestamp_ge, \
@ -297,23 +299,11 @@ gts_compress(PG_FUNCTION_ARGS)
if (entry->leafkey) if (entry->leafkey)
{ {
TSKEY *r = (TSKEY *) palloc(sizeof(TSKEY)); TSKEY *r = (TSKEY *) palloc(sizeof(TSKEY));
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
if (entry->key) r->lower = r->upper = *(Timestamp *) (entry->key);
{ gistentryinit(*retval, PointerGetDatum(r),
r->lower = r->upper = *(Timestamp *) (entry->key); entry->rel, entry->page,
entry->offset, sizeof(TSKEY), FALSE);
gistentryinit(*retval, PointerGetDatum(r),
entry->rel, entry->page,
entry->offset, sizeof(TSKEY), FALSE);
}
else
{
gistentryinit(*retval, PointerGetDatum(NULL),
entry->rel, entry->page,
entry->offset, 0, FALSE);
}
} }
else else
retval = entry; retval = entry;
@ -408,8 +398,8 @@ gts_penalty(PG_FUNCTION_ARGS)
intr = DatumGetIntervalP(DirectFunctionCall2( intr = DatumGetIntervalP(DirectFunctionCall2(
timestamp_mi, timestamp_mi,
TimestampGetDatum(newentry->upper), TimestampGetDatumFast(newentry->upper),
TimestampGetDatum(origentry->upper))); TimestampGetDatumFast(origentry->upper)));
/* see interval_larger */ /* see interval_larger */
*result = Max(intr->time + intr->month * (30.0 * 86400), 0); *result = Max(intr->time + intr->month * (30.0 * 86400), 0);
@ -417,8 +407,8 @@ gts_penalty(PG_FUNCTION_ARGS)
intr = DatumGetIntervalP(DirectFunctionCall2( intr = DatumGetIntervalP(DirectFunctionCall2(
timestamp_mi, timestamp_mi,
TimestampGetDatum(origentry->lower), TimestampGetDatumFast(origentry->lower),
TimestampGetDatum(newentry->lower))); TimestampGetDatumFast(newentry->lower)));
/* see interval_larger */ /* see interval_larger */
*result += Max(intr->time + intr->month * (30.0 * 86400), 0); *result += Max(intr->time + intr->month * (30.0 * 86400), 0);
@ -483,8 +473,8 @@ tskey_cmp(const void *a, const void *b)
return DatumGetInt32( return DatumGetInt32(
DirectFunctionCall2( DirectFunctionCall2(
timestamp_cmp, timestamp_cmp,
TimestampGetDatum(((TSKEY *) (((RIX *) a)->r))->lower), TimestampGetDatumFast(((TSKEY *) (((RIX *) a)->r))->lower),
TimestampGetDatum(((TSKEY *) (((RIX *) b)->r))->lower) TimestampGetDatumFast(((TSKEY *) (((RIX *) b)->r))->lower)
) )
); );
} }