database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-18 17:42:25 +03:00
Code Activity

Fix time_larger, time_smaller, timetz_larger, timetz_smaller to meet

Browse Source 
nodeAgg.c's expectation that aggregate transition functions never return
pointers to their input values.  This is fixed in a much better way in
current sources, but in 7.0.* it's gotta be done like this.
This commit is contained in:
Tom Lane
2000-10-19 20:52:35 +00:00
parent 40938384aa
commit d11d8d0501
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/utils/adt/date.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.44 2000/04/12 17:15:48 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.44.2.1 2000/10/19 20:52:35 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -495,13 +495,23 @@ time_cmp(TimeADT *time1, TimeADT *time2)
TimeADT *
time_larger(TimeADT *time1, TimeADT *time2)
{
return time_gt(time1, time2) ? time1 : time2;
TimeADT *result;
/* nodeAgg.c expects me to return a copied datum! */
result = palloc(sizeof(*result));
*result = time_gt(time1, time2) ? *time1 : *time2;
return result;
} /* time_larger() */
TimeADT *
time_smaller(TimeADT *time1, TimeADT *time2)
{
return time_lt(time1, time2) ? time1 : time2;
TimeADT *result;
/* nodeAgg.c expects me to return a copied datum! */
result = palloc(sizeof(*result));
*result = time_lt(time1, time2) ? *time1 : *time2;
return result;
} /* time_smaller() */
/* overlaps_time()
@ -742,13 +752,23 @@ timetz_cmp(TimeTzADT *time1, TimeTzADT *time2)
TimeTzADT *
timetz_larger(TimeTzADT *time1, TimeTzADT *time2)
{
return timetz_gt(time1, time2) ? time1 : time2;
TimeTzADT *result;
/* nodeAgg.c expects me to return a copied datum! */
result = palloc(sizeof(*result));
*result = timetz_gt(time1, time2) ? *time1 : *time2;
return result;
} /* timetz_larger() */
TimeTzADT *
timetz_smaller(TimeTzADT *time1, TimeTzADT *time2)
{
return timetz_lt(time1, time2) ? time1 : time2;
TimeTzADT *result;
/* nodeAgg.c expects me to return a copied datum! */
result = palloc(sizeof(*result));
*result = timetz_lt(time1, time2) ? *time1 : *time2;
return result;
} /* timetz_smaller() */
/* overlaps_timetz()