Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit8816af6

hlinnaka

committed

Minor refactoring of btree_gist code.

The gbt_var_key_copy function was doing two different things depending onthe boolean argument. Seems cleaner to have two separate functions.Remove unused argument from gbt_num_compress.

1 parent55b59ed commit8816af6Copy full SHA for 8816af6

File tree

17 files changed

+50

-53

lines changed

contrib/btree_gist

17 files changed

+50

-53

lines changed

`‎contrib/btree_gist/btree_bit.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ gbt_bit_l2n(GBT_VARKEY *leaf)`
`99`	`99`
`100`	`100`	`o=gbt_bit_xfrm(r.lower);`
`101`	`101`	`r.upper=r.lower=o;`
`102`		`-out=gbt_var_key_copy(&r, TRUE);`
	`102`	`+out=gbt_var_key_copy(&r);`
`103`	`103`	`pfree(o);`
`104`	`104`
`105`	`105`	`returnout;`

`‎contrib/btree_gist/btree_cash.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,8 @@ Datum`
`119`	`119`	`gbt_cash_compress(PG_FUNCTION_ARGS)`
`120`	`120`	`{`
`121`	`121`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`122`		`-GISTENTRY*retval=NULL;`
`123`	`122`
`124`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`123`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`125`	`124`	`}`
`126`	`125`
`127`	`126`

`‎contrib/btree_gist/btree_date.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,8 @@ Datum`
`130`	`130`	`gbt_date_compress(PG_FUNCTION_ARGS)`
`131`	`131`	`{`
`132`	`132`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`133`		`-GISTENTRY*retval=NULL;`
`134`	`133`
`135`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`134`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`136`	`135`	`}`
`137`	`136`
`138`	`137`

`‎contrib/btree_gist/btree_float4.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,8 @@ Datum`
`112`	`112`	`gbt_float4_compress(PG_FUNCTION_ARGS)`
`113`	`113`	`{`
`114`	`114`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`115`		`-GISTENTRY*retval=NULL;`
`116`	`115`
`117`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`116`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`118`	`117`	`}`
`119`	`118`
`120`	`119`

`‎contrib/btree_gist/btree_float8.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,8 @@ Datum`
`119`	`119`	`gbt_float8_compress(PG_FUNCTION_ARGS)`
`120`	`120`	`{`
`121`	`121`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`122`		`-GISTENTRY*retval=NULL;`
`123`	`122`
`124`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`123`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`125`	`124`	`}`
`126`	`125`
`127`	`126`

`‎contrib/btree_gist/btree_int2.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,8 @@ Datum`
`119`	`119`	`gbt_int2_compress(PG_FUNCTION_ARGS)`
`120`	`120`	`{`
`121`	`121`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`122`		`-GISTENTRY*retval=NULL;`
`123`	`122`
`124`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`123`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`125`	`124`	`}`
`126`	`125`
`127`	`126`

`‎contrib/btree_gist/btree_int4.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,8 @@ Datum`
`120`	`120`	`gbt_int4_compress(PG_FUNCTION_ARGS)`
`121`	`121`	`{`
`122`	`122`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`123`		`-GISTENTRY*retval=NULL;`
`124`	`123`
`125`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`124`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`126`	`125`	`}`
`127`	`126`
`128`	`127`

`‎contrib/btree_gist/btree_int8.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,8 @@ Datum`
`120`	`120`	`gbt_int8_compress(PG_FUNCTION_ARGS)`
`121`	`121`	`{`
`122`	`122`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`123`		`-GISTENTRY*retval=NULL;`
`124`	`123`
`125`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`124`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`126`	`125`	`}`
`127`	`126`
`128`	`127`

`‎contrib/btree_gist/btree_macaddr.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,8 @@ Datum`
`110`	`110`	`gbt_macad_compress(PG_FUNCTION_ARGS)`
`111`	`111`	`{`
`112`	`112`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`113`		`-GISTENTRY*retval=NULL;`
`114`	`113`
`115`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`114`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`116`	`115`	`}`
`117`	`116`
`118`	`117`

`‎contrib/btree_gist/btree_numeric.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ gbt_numeric_penalty(PG_FUNCTION_ARGS)`
`170`	`170`	`uk;`
`171`	`171`
`172`	`172`	`rk=gbt_var_key_readable(org);`
`173`		`-uni=PointerGetDatum(gbt_var_key_copy(&rk, TRUE));`
	`173`	`+uni=PointerGetDatum(gbt_var_key_copy(&rk));`
`174`	`174`	`gbt_var_bin_union(&uni,newe,PG_GET_COLLATION(),&tinfo);`
`175`	`175`	`ok=gbt_var_key_readable(org);`
`176`	`176`	`uk=gbt_var_key_readable((GBT_VARKEY*)DatumGetPointer(uni));`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp