NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4681ad4

committed

Use construct_array_builtin for FLOAT8OID instead of construct_array.

Commitd746021 introduced construct_array_builtin() for built-indata types, but forgot some replacements linked to FLOAT8OID.Author: Bertrand DrouvotReviewed-by: Peter EisentrautDiscussion:https://postgr.es/m/CAD21AoCERkwmttY44dqUw%3Dm_9QCctu7W%2Bp6B7w_VqxRJA1Qq_Q%40mail.gmail.com

1 parentc594f1a commit4681ad4Copy full SHA for 4681ad4

File tree

2 files changed

+11

-15

lines changed

src/backend/utils/adt
- arrayfuncs.c
- float.c

2 files changed

+11

-15

lines changed

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

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3404,6 +3404,12 @@ construct_array_builtin(Datum *elems, int nelems, Oid elmtype)`
`3404`	`3404`	`elmalign=TYPALIGN_INT;`
`3405`	`3405`	`break;`
`3406`	`3406`
	`3407`	`+caseFLOAT8OID:`
	`3408`	`+elmlen=sizeof(float8);`
	`3409`	`+elmbyval=FLOAT8PASSBYVAL;`
	`3410`	`+elmalign=TYPALIGN_DOUBLE;`
	`3411`	`+break;`
	`3412`	`+`
`3407`	`3413`	`caseINT2OID:`
`3408`	`3414`	`elmlen=sizeof(int16);`
`3409`	`3415`	`elmbyval= true;`

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

Lines changed: 5 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -2946,9 +2946,7 @@ float8_combine(PG_FUNCTION_ARGS)`
`2946`	`2946`	`transdatums[1]=Float8GetDatumFast(Sx);`
`2947`	`2947`	`transdatums[2]=Float8GetDatumFast(Sxx);`
`2948`	`2948`
`2949`		`-result=construct_array(transdatums,3,`
`2950`		`-FLOAT8OID,`
`2951`		`-sizeof(float8),FLOAT8PASSBYVAL,TYPALIGN_DOUBLE);`
	`2949`	`+result=construct_array_builtin(transdatums,3,FLOAT8OID);`
`2952`	`2950`
`2953`	`2951`	`PG_RETURN_ARRAYTYPE_P(result);`
`2954`	`2952`	`}`
`@@ -3029,9 +3027,7 @@ float8_accum(PG_FUNCTION_ARGS)`
`3029`	`3027`	`transdatums[1]=Float8GetDatumFast(Sx);`
`3030`	`3028`	`transdatums[2]=Float8GetDatumFast(Sxx);`
`3031`	`3029`
`3032`		`-result=construct_array(transdatums,3,`
`3033`		`-FLOAT8OID,`
`3034`		`-sizeof(float8),FLOAT8PASSBYVAL,TYPALIGN_DOUBLE);`
	`3030`	`+result=construct_array_builtin(transdatums,3,FLOAT8OID);`
`3035`	`3031`
`3036`	`3032`	`PG_RETURN_ARRAYTYPE_P(result);`
`3037`	`3033`	`}`
`@@ -3114,9 +3110,7 @@ float4_accum(PG_FUNCTION_ARGS)`
`3114`	`3110`	`transdatums[1]=Float8GetDatumFast(Sx);`
`3115`	`3111`	`transdatums[2]=Float8GetDatumFast(Sxx);`
`3116`	`3112`
`3117`		`-result=construct_array(transdatums,3,`
`3118`		`-FLOAT8OID,`
`3119`		`-sizeof(float8),FLOAT8PASSBYVAL,TYPALIGN_DOUBLE);`
	`3113`	`+result=construct_array_builtin(transdatums,3,FLOAT8OID);`
`3120`	`3114`
`3121`	`3115`	`PG_RETURN_ARRAYTYPE_P(result);`
`3122`	`3116`	`}`
`@@ -3359,9 +3353,7 @@ float8_regr_accum(PG_FUNCTION_ARGS)`
`3359`	`3353`	`transdatums[4]=Float8GetDatumFast(Syy);`
`3360`	`3354`	`transdatums[5]=Float8GetDatumFast(Sxy);`
`3361`	`3355`
`3362`		`-result=construct_array(transdatums,6,`
`3363`		`-FLOAT8OID,`
`3364`		`-sizeof(float8),FLOAT8PASSBYVAL,TYPALIGN_DOUBLE);`
	`3356`	`+result=construct_array_builtin(transdatums,6,FLOAT8OID);`
`3365`	`3357`
`3366`	`3358`	`PG_RETURN_ARRAYTYPE_P(result);`
`3367`	`3359`	`}`
`@@ -3500,9 +3492,7 @@ float8_regr_combine(PG_FUNCTION_ARGS)`
`3500`	`3492`	`transdatums[4]=Float8GetDatumFast(Syy);`
`3501`	`3493`	`transdatums[5]=Float8GetDatumFast(Sxy);`
`3502`	`3494`
`3503`		`-result=construct_array(transdatums,6,`
`3504`		`-FLOAT8OID,`
`3505`		`-sizeof(float8),FLOAT8PASSBYVAL,TYPALIGN_DOUBLE);`
	`3495`	`+result=construct_array_builtin(transdatums,6,FLOAT8OID);`
`3506`	`3496`
`3507`	`3497`	`PG_RETURN_ARRAYTYPE_P(result);`
`3508`	`3498`	`}`

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!

Commit4681ad4

File tree

2 files changed

2 files changed

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

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

0 commit comments