@@ -86,6 +86,8 @@ Datumgts_same(PG_FUNCTION_ARGS);
8686static void gts_binary_union (Datum * r1 ,char * r2 );
8787static int tskey_cmp (const void * a ,const void * b );
8888
89+ #define TimestampGetDatumFast (X ) Float8GetDatumFast(X)
90+
8991/* define for comparison */
9092#define TSGE (ts1 ,ts2 ) (DatumGetBool(DirectFunctionCall2( \
9193timestamp_ge, \
@@ -297,23 +299,11 @@ gts_compress(PG_FUNCTION_ARGS)
297299if (entry -> leafkey )
298300{
299301TSKEY * r = (TSKEY * )palloc (sizeof (TSKEY ));
300-
301302retval = palloc (sizeof (GISTENTRY ));
302- if (entry -> key )
303- {
304- r -> lower = r -> upper = * (Timestamp * ) (entry -> key );
305-
306- gistentryinit (* retval ,PointerGetDatum (r ),
307- entry -> rel ,entry -> page ,
308- entry -> offset ,sizeof (TSKEY ), FALSE);
309-
310- }
311- else
312- {
313- gistentryinit (* retval ,PointerGetDatum (NULL ),
314- entry -> rel ,entry -> page ,
315- entry -> offset ,0 , FALSE);
316- }
303+ r -> lower = r -> upper = * (Timestamp * ) (entry -> key );
304+ gistentryinit (* retval ,PointerGetDatum (r ),
305+ entry -> rel ,entry -> page ,
306+ entry -> offset ,sizeof (TSKEY ), FALSE);
317307}
318308else
319309retval = entry ;
@@ -408,17 +398,17 @@ gts_penalty(PG_FUNCTION_ARGS)
408398
409399intr = DatumGetIntervalP (DirectFunctionCall2 (
410400timestamp_mi ,
411- TimestampGetDatum (newentry -> upper ),
412- TimestampGetDatum (origentry -> upper )));
401+ TimestampGetDatumFast (newentry -> upper ),
402+ TimestampGetDatumFast (origentry -> upper )));
413403
414404/* see interval_larger */
415405* result = Max (intr -> time + intr -> month * (30.0 * 86400 ),0 );
416406pfree (intr );
417407
418408intr = DatumGetIntervalP (DirectFunctionCall2 (
419409timestamp_mi ,
420- TimestampGetDatum (origentry -> lower ),
421- TimestampGetDatum (newentry -> lower )));
410+ TimestampGetDatumFast (origentry -> lower ),
411+ TimestampGetDatumFast (newentry -> lower )));
422412
423413/* see interval_larger */
424414* result += Max (intr -> time + intr -> month * (30.0 * 86400 ),0 );
@@ -483,8 +473,8 @@ tskey_cmp(const void *a, const void *b)
483473return DatumGetInt32 (
484474DirectFunctionCall2 (
485475timestamp_cmp ,
486- TimestampGetDatum (((TSKEY * ) (((RIX * )a )-> r ))-> lower ),
487- TimestampGetDatum (((TSKEY * ) (((RIX * )b )-> r ))-> lower )
476+ TimestampGetDatumFast (((TSKEY * ) (((RIX * )a )-> r ))-> lower ),
477+ TimestampGetDatumFast (((TSKEY * ) (((RIX * )b )-> r ))-> lower )
488478 )
489479);
490480}