NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit77be5f9

committed

AdjustTimestampForTypmod does not work (at least not portably) on

-infinity and +infinity. Put TIMESTAMP_NOT_FINITE guard into the routine,instead of forgetting it at some call sites. Fixes regression testfailures here.

1 parenta390975 commit77be5f9Copy full SHA for 77be5f9

File tree

1 file changed

-10

lines changed

src/backend/utils/adt
- timestamp.c

1 file changed

-10

lines changed

`‎src/backend/utils/adt/timestamp.c`

Lines changed: 6 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.52 2001/10/0305:29:24 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.53 2001/10/0315:50:48 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -32,8 +32,7 @@`
`32`	`32`	`staticdoubletime2t(constinthour,constintmin,constdoublesec);`
`33`	`33`	`staticintEncodeSpecialTimestamp(Timestampdt,char*str);`
`34`	`34`	`staticTimestampdt2local(Timestampdt,inttimezone);`
`35`		`-staticvoid`
`36`		`-AdjustTimestampForTypmod(Timestamp*time,int32typmod);`
	`35`	`+staticvoidAdjustTimestampForTypmod(Timestamp*time,int32typmod);`
`37`	`36`
`38`	`37`
`39`	`38`	`/*****************************************************************************`
`@@ -138,16 +137,16 @@ timestamp_scale(PG_FUNCTION_ARGS)`
`138`	`137`
`139`	`138`	`result=timestamp;`
`140`	`139`
`141`		`-if (!TIMESTAMP_NOT_FINITE(result))`
`142`		`-AdjustTimestampForTypmod(&result,typmod);`
	`140`	`+AdjustTimestampForTypmod(&result,typmod);`
`143`	`141`
`144`	`142`	`PG_RETURN_TIMESTAMP(result);`
`145`	`143`	`}`
`146`	`144`
`147`	`145`	`staticvoid`
`148`	`146`	`AdjustTimestampForTypmod(Timestamp*time,int32typmod)`
`149`	`147`	`{`
`150`		`-if ((typmod >=0)&& (typmod <=13))`
	`148`	`+if (!TIMESTAMP_NOT_FINITE(*time)&&`
	`149`	`+(typmod >=0)&& (typmod <=13))`
`151`	`150`	`{`
`152`	`151`	`staticdoubleTimestampScale=1;`
`153`	`152`	`staticint32TimestampTypmod=0;`
`@@ -157,8 +156,6 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod)`
`157`	`156`
`158`	`157`	`time= (rint(((double)time)*TimestampScale)/TimestampScale);`
`159`	`158`	`}`
`160`		`-`
`161`		`-return;`
`162`	`159`	`}`
`163`	`160`
`164`	`161`
`@@ -261,8 +258,7 @@ timestamptz_scale(PG_FUNCTION_ARGS)`
`261`	`258`
`262`	`259`	`result=timestamp;`
`263`	`260`
`264`		`-if (!TIMESTAMP_NOT_FINITE(result))`
`265`		`-AdjustTimestampForTypmod(&result,typmod);`
	`261`	`+AdjustTimestampForTypmod(&result,typmod);`
`266`	`262`
`267`	`263`	`PG_RETURN_TIMESTAMPTZ(result);`
`268`	`264`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit77be5f9

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/timestamp.c`

0 commit comments