Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd11d8d0

Browse files
committed
Fix time_larger, time_smaller, timetz_larger, timetz_smaller to meet
nodeAgg.c's expectation that aggregate transition functions never returnpointers to their input values. This is fixed in a much better way incurrent sources, but in 7.0.* it's gotta be done like this.
1 parent4093838 commitd11d8d0

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

‎src/backend/utils/adt/date.c

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.44 2000/04/12 17:15:48 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.44.2.1 2000/10/19 20:52:35 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -495,13 +495,23 @@ time_cmp(TimeADT *time1, TimeADT *time2)
495495
TimeADT*
496496
time_larger(TimeADT*time1,TimeADT*time2)
497497
{
498-
returntime_gt(time1,time2) ?time1 :time2;
498+
TimeADT*result;
499+
500+
/* nodeAgg.c expects me to return a copied datum! */
501+
result=palloc(sizeof(*result));
502+
*result=time_gt(time1,time2) ?*time1 :*time2;
503+
returnresult;
499504
}/* time_larger() */
500505

501506
TimeADT*
502507
time_smaller(TimeADT*time1,TimeADT*time2)
503508
{
504-
returntime_lt(time1,time2) ?time1 :time2;
509+
TimeADT*result;
510+
511+
/* nodeAgg.c expects me to return a copied datum! */
512+
result=palloc(sizeof(*result));
513+
*result=time_lt(time1,time2) ?*time1 :*time2;
514+
returnresult;
505515
}/* time_smaller() */
506516

507517
/* overlaps_time()
@@ -742,13 +752,23 @@ timetz_cmp(TimeTzADT *time1, TimeTzADT *time2)
742752
TimeTzADT*
743753
timetz_larger(TimeTzADT*time1,TimeTzADT*time2)
744754
{
745-
returntimetz_gt(time1,time2) ?time1 :time2;
755+
TimeTzADT*result;
756+
757+
/* nodeAgg.c expects me to return a copied datum! */
758+
result=palloc(sizeof(*result));
759+
*result=timetz_gt(time1,time2) ?*time1 :*time2;
760+
returnresult;
746761
}/* timetz_larger() */
747762

748763
TimeTzADT*
749764
timetz_smaller(TimeTzADT*time1,TimeTzADT*time2)
750765
{
751-
returntimetz_lt(time1,time2) ?time1 :time2;
766+
TimeTzADT*result;
767+
768+
/* nodeAgg.c expects me to return a copied datum! */
769+
result=palloc(sizeof(*result));
770+
*result=timetz_lt(time1,time2) ?*time1 :*time2;
771+
returnresult;
752772
}/* timetz_smaller() */
753773

754774
/* overlaps_timetz()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp