NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit26ae3aa

committed

Remove redundant function calls in timestamp[tz]_part().

The DTK_DOW/DTK_ISODOW and DTK_DOY switch cases in timestamp_part() andtimestamptz_part() contained calls of timestamp2tm() that were fullyredundant with the ones done just above the switch. This evidently creptin during commit258ee1b, which relocated that code from another placewhere the calls were indeed needed. Just delete the redundant calls.I (tgl) noted that our test coverage of these functions left quite abit to be desired, so extend timestamp.sql and timestamptz.sql tocover all the branches.Back-patch to all supported branches, as the previous commit was.There's no real issue here other than some wasted cycles in somenot-too-heavily-used code paths, but the test coverage seems valuable.Report and patch by Li Japin; test case adjustments by me.Discussion:https://postgr.es/m/SG2PR06MB37762CAE45DB0F6CA7001EA9B6550@SG2PR06MB3776.apcprd06.prod.outlook.com

1 parent8ed428d commit26ae3aaCopy full SHA for 26ae3aa

File tree

5 files changed

+693

-395

lines changed

src
- backend/utils/adt
  - timestamp.c
- test/regress
  - expected
    - timestamp.out
    - timestamptz.out
  - sql
    - timestamp.sql
    - timestamptz.sql

5 files changed

+693

-395

lines changed

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

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -4651,20 +4651,12 @@ timestamp_part(PG_FUNCTION_ARGS)`
`4651`	`4651`
`4652`	`4652`	`caseDTK_DOW:`
`4653`	`4653`	`caseDTK_ISODOW:`
`4654`		`-if (timestamp2tm(timestamp,NULL,tm,&fsec,NULL,NULL)!=0)`
`4655`		`-ereport(ERROR,`
`4656`		`-(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
`4657`		`-errmsg("timestamp out of range")));`
`4658`	`4654`	`result=j2day(date2j(tm->tm_year,tm->tm_mon,tm->tm_mday));`
`4659`	`4655`	`if (val==DTK_ISODOW&&result==0)`
`4660`	`4656`	`result=7;`
`4661`	`4657`	`break;`
`4662`	`4658`
`4663`	`4659`	`caseDTK_DOY:`
`4664`		`-if (timestamp2tm(timestamp,NULL,tm,&fsec,NULL,NULL)!=0)`
`4665`		`-ereport(ERROR,`
`4666`		`-(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
`4667`		`-errmsg("timestamp out of range")));`
`4668`	`4660`	`result= (date2j(tm->tm_year,tm->tm_mon,tm->tm_mday)`
`4669`	`4661`	`-date2j(tm->tm_year,1,1)+1);`
`4670`	`4662`	`break;`
`@@ -4855,20 +4847,12 @@ timestamptz_part(PG_FUNCTION_ARGS)`
`4855`	`4847`
`4856`	`4848`	`caseDTK_DOW:`
`4857`	`4849`	`caseDTK_ISODOW:`
`4858`		`-if (timestamp2tm(timestamp,&tz,tm,&fsec,NULL,NULL)!=0)`
`4859`		`-ereport(ERROR,`
`4860`		`-(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
`4861`		`-errmsg("timestamp out of range")));`
`4862`	`4850`	`result=j2day(date2j(tm->tm_year,tm->tm_mon,tm->tm_mday));`
`4863`	`4851`	`if (val==DTK_ISODOW&&result==0)`
`4864`	`4852`	`result=7;`
`4865`	`4853`	`break;`
`4866`	`4854`
`4867`	`4855`	`caseDTK_DOY:`
`4868`		`-if (timestamp2tm(timestamp,&tz,tm,&fsec,NULL,NULL)!=0)`
`4869`		`-ereport(ERROR,`
`4870`		`-(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),`
`4871`		`-errmsg("timestamp out of range")));`
`4872`	`4856`	`result= (date2j(tm->tm_year,tm->tm_mon,tm->tm_mday)`
`4873`	`4857`	`-date2j(tm->tm_year,1,1)+1);`
`4874`	`4858`	`break;`

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!

Commit26ae3aa

File tree

5 files changed

5 files changed

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

0 commit comments