NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3ab2668

committed

Use psprintf to simplify gtsvectorout()

The buffer allocation was correct, but looked archaic and scary:- It was weird to calculate the buffer size before determining which format string was used. With the same effort, we could've used the right-sized buffer for each branch.- Commitaa0d350 added one more possible return string ("all true bits"), but didn't adjust the code at the top of the function to calculate the returned string's max size. It was not a live bug, because the new string was smaller than the existing ones, but seemed wrong in principle.- Use of sprintf() is generally eyebrow-raising these daysSwitch to psprintf(). psprintf() allocates a larger buffer than whatwas allocated before, 128 bytes vs 80 bytes, which is acceptable asthis code is not performance or space critical.Reviewed-by: Andres FreundDiscussion:https://www.postgresql.org/message-id/54c29fb0-edf2-48ea-9814-44e918bbd6e8@iki.fi

1 parentd5f139c commit3ab2668Copy full SHA for 3ab2668

File tree

1 file changed

-13

lines changed

src/backend/utils/adt
- tsgistidx.c

1 file changed

-13

lines changed

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

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,34 +96,25 @@ gtsvectorin(PG_FUNCTION_ARGS)`
`96`	`96`	`PG_RETURN_VOID();/* keep compiler quiet */`
`97`	`97`	`}`
`98`	`98`
`99`		`-#defineSINGOUTSTR"%d true bits, %d false bits"`
`100`		`-#defineARROUTSTR"%d unique words"`
`101`		`-#defineEXTRALEN( 2*13 )`
`102`		`-`
`103`		`-staticintoutbuf_maxlen=0;`
`104`		`-`
`105`	`99`	`Datum`
`106`	`100`	`gtsvectorout(PG_FUNCTION_ARGS)`
`107`	`101`	`{`
`108`	`102`	`SignTSVectorkey= (SignTSVector)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));`
`109`	`103`	`char*outbuf;`
`110`	`104`
`111`		`-if (outbuf_maxlen==0)`
`112`		`-outbuf_maxlen=2*EXTRALEN+Max(strlen(SINGOUTSTR),strlen(ARROUTSTR))+1;`
`113`		`-outbuf=palloc(outbuf_maxlen);`
`114`		`-`
`115`	`105`	`if (ISARRKEY(key))`
`116`		`-sprintf(outbuf,ARROUTSTR, (int)ARRNELEM(key));`
	`106`	`+outbuf=psprintf("%d unique words", (int)ARRNELEM(key));`
`117`	`107`	`else`
`118`	`108`	`{`
`119`	`109`	`if (ISALLTRUE(key))`
`120`		`-sprintf(outbuf,"all true bits");`
	`110`	`+outbuf=pstrdup("all true bits");`
`121`	`111`	`else`
`122`	`112`	`{`
`123`	`113`	`intsiglen=GETSIGLEN(key);`
`124`	`114`	`intcnttrue=sizebitvec(GETSIGN(key),siglen);`
`125`	`115`
`126`		`-sprintf(outbuf,SINGOUTSTR,cnttrue, (int)SIGLENBIT(siglen)-cnttrue);`
	`116`	`+outbuf=psprintf("%d true bits, %d false bits",`
	`117`	`+cnttrue, (int)SIGLENBIT(siglen)-cnttrue);`
`127`	`118`	`}`
`128`	`119`	`}`
`129`	`120`

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!

Commit3ab2668

File tree

1 file changed

1 file changed

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

0 commit comments