Skip to content

P
Postgres FD Implementation
Commit 07f6c02e authored by Tom Lane's avatar Tom Lane
Browse files
Options

tskey_cmp() should use timestamp_cmp() instead of doing its own 

interval arithmetic.  From Teodor Sigaev.
parent 839c7924
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 15 deletions
contrib/btree_gist/btree_gist.c
View file @ 07f6c02e
...@@ -447,21 +447,13 @@ gts_binary_union(Datum *r1, char *r2) ...@@ -447,21 +447,13 @@ gts_binary_union(Datum *r1, char *r2)
static int static int
tskey_cmp(const void *a, const void *b) { tskey_cmp(const void *a, const void *b) {
Interval *intr; return DatumGetInt32(
float result; DirectFunctionCall2(
timestamp_cmp,
intr = DatumGetIntervalP( DirectFunctionCall2(
timestamp_mi,
TimestampGetDatum( ((TSKEY*)(((RIX*)a)->r))->lower ), TimestampGetDatum( ((TSKEY*)(((RIX*)a)->r))->lower ),
TimestampGetDatum( ((TSKEY*)(((RIX*)b)->r))->lower )) ); TimestampGetDatum( ((TSKEY*)(((RIX*)b)->r))->lower )
)
/* see interval_larger */ );
result = intr->time+intr->month * (30.0 * 86400);
pfree( intr );
if ( result == 0.0 )
return 0;
else
return ( result>0 ) ? 1 : 0;
} }
/************************************************** /**************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment