NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitfc96a5f

committed

Blind try to fix portability issue in commit8f93bd8 et al.

The S/390 members of the buildfarm are showing failures indicatingthat they're having trouble with the rint() calls I added yesterday.There's no good reason for that, and I wonder if it is a compiler bugsimilar to the one we worked around ind9476b8. Try to fix it usingthe same method as before, namely to store the result of rint() backinto a "double" variable rather than immediately converting to int64.(This isn't entirely waving a dead chicken, since on machines withwider-than-double float registers, the extra store forces a widthconversion. I don't know if S/390 is like that, but it seems worthtrying.)In passing, merge duplicate ereport() calls in float8_timestamptz().Per buildfarm.

1 parent404756f commitfc96a5fCopy full SHA for fc96a5f

File tree

1 file changed

-8

lines changed

src/backend/utils/adt
- timestamp.c

1 file changed

-8

lines changed

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

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -764,12 +764,8 @@ float8_timestamptz(PG_FUNCTION_ARGS)`
`764`	`764`	`{`
`765`	`765`	`/* Out of range? */`
`766`	`766`	`if (seconds<`
`767`		`-(float8)SECS_PER_DAY* (DATETIME_MIN_JULIAN-UNIX_EPOCH_JDATE))`
`768`		`-ereport(ERROR,`
`769`		`-(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
`770`		`-errmsg("timestamp out of range: \"%g\"",seconds)));`
`771`		`-`
`772`		`-if (seconds >=`
	`767`	`+(float8)SECS_PER_DAY* (DATETIME_MIN_JULIAN-UNIX_EPOCH_JDATE)`
	`768`	`+\|\|seconds >=`
`773`	`769`	`(float8)SECS_PER_DAY* (TIMESTAMP_END_JULIAN-UNIX_EPOCH_JDATE))`
`774`	`770`	`ereport(ERROR,`
`775`	`771`	`(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
`@@ -779,7 +775,8 @@ float8_timestamptz(PG_FUNCTION_ARGS)`
`779`	`775`	`seconds-= ((POSTGRES_EPOCH_JDATE-UNIX_EPOCH_JDATE)*SECS_PER_DAY);`
`780`	`776`
`781`	`777`	`#ifdefHAVE_INT64_TIMESTAMP`
`782`		`-result=rint(seconds*USECS_PER_SEC);`
	`778`	`+seconds=rint(seconds*USECS_PER_SEC);`
	`779`	`+result= (int64)seconds;`
`783`	`780`	`#else`
`784`	`781`	`result=seconds;`
`785`	`782`	`#endif`
`@@ -1615,9 +1612,10 @@ make_interval(PG_FUNCTION_ARGS)`
`1615`	`1612`	`result->day=weeks*7+days;`
`1616`	`1613`
`1617`	`1614`	`#ifdefHAVE_INT64_TIMESTAMP`
	`1615`	`+secs=rint(secs*USECS_PER_SEC);`
`1618`	`1616`	`result->time=hours* ((int64)SECS_PER_HOUR*USECS_PER_SEC)+`
`1619`	`1617`	`mins* ((int64)SECS_PER_MINUTE*USECS_PER_SEC)+`
`1620`		`-(int64)rint(secs*USECS_PER_SEC);`
	`1618`	`+(int64)secs;`
`1621`	`1619`	`#else`
`1622`	`1620`	`result->time=hours* (double)SECS_PER_HOUR+`
`1623`	`1621`	`mins* (double)SECS_PER_MINUTE+`

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!

Commitfc96a5f

File tree

1 file changed

1 file changed

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

0 commit comments