Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

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));`

`‎contrib/btree_gist/btree_oid.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_oid_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_time.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,8 @@ Datum`
`157`	`157`	`gbt_time_compress(PG_FUNCTION_ARGS)`
`158`	`158`	`{`
`159`	`159`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`160`		`-GISTENTRY*retval=NULL;`
`161`	`160`
`162`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`161`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`163`	`162`	`}`
`164`	`163`
`165`	`164`

`‎contrib/btree_gist/btree_ts.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,8 @@ Datum`
`212`	`212`	`gbt_ts_compress(PG_FUNCTION_ARGS)`
`213`	`213`	`{`
`214`	`214`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`215`		`-GISTENTRY*retval=NULL;`
`216`	`215`
`217`		`-PG_RETURN_POINTER(gbt_num_compress(retval,entry,&tinfo));`
	`216`	`+PG_RETURN_POINTER(gbt_num_compress(entry,&tinfo));`
`218`	`217`	`}`
`219`	`218`
`220`	`219`

`‎contrib/btree_gist/btree_utils_num.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,10 @@`
`11`	`11`
`12`	`12`
`13`	`13`	`GISTENTRY*`
`14`		`-gbt_num_compress(GISTENTRYretval,GISTENTRYentry,constgbtree_ninfo*tinfo)`
	`14`	`+gbt_num_compress(GISTENTRYentry,constgbtree_ninfotinfo)`
`15`	`15`	`{`
	`16`	`+GISTENTRY*retval;`
	`17`	`+`
`16`	`18`	`if (entry->leafkey)`
`17`	`19`	`{`
`18`	`20`	`union`

`‎contrib/btree_gist/btree_utils_num.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,7 @@ extern float8 gbt_num_distance(const GBT_NUMKEY_R key, const void query,`
`128`	`128`	`externGIST_SPLITVECgbt_num_picksplit(constGistEntryVectorentryvec,GIST_SPLITVEC*v,`
`129`	`129`	`constgbtree_ninfo*tinfo);`
`130`	`130`
`131`		`-externGISTENTRYgbt_num_compress(GISTENTRYretval,GISTENTRY*entry,`
`132`		`-constgbtree_ninfo*tinfo);`
	`131`	`+externGISTENTRYgbt_num_compress(GISTENTRYentry,constgbtree_ninfo*tinfo);`
`133`	`132`
`134`	`133`
`135`	`134`	`externvoidgbt_num_union(GBT_NUMKEYout,constGistEntryVector*entryvec,`

`‎contrib/btree_gist/btree_utils_var.c`

Lines changed: 32 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,26 +66,37 @@ gbt_var_key_readable(const GBT_VARKEY *k)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`
	`69`	`+/*`
	`70`	`+ * Create a leaf-entry to store in the index, from a single Datum.`
	`71`	`+ */`
	`72`	`+staticGBT_VARKEY*`
	`73`	`+gbt_var_key_from_datum(conststructvarlena*u)`
	`74`	`+{`
	`75`	`+int32lowersize=VARSIZE(u);`
	`76`	`+GBT_VARKEY*r;`
	`77`	`+`
	`78`	`+r= (GBT_VARKEY*)palloc(lowersize+VARHDRSZ);`
	`79`	`+memcpy(VARDATA(r),u,lowersize);`
	`80`	`+SET_VARSIZE(r,lowersize+VARHDRSZ);`
	`81`	`+`
	`82`	`+returnr;`
	`83`	`+}`
	`84`	`+`
	`85`	`+/*`
	`86`	`+ * Create an entry to store in the index, from lower and upper bound.`
	`87`	`+ */`
`69`	`88`	`GBT_VARKEY*`
`70`		`-gbt_var_key_copy(constGBT_VARKEY_R*u,boolforce_node)`
	`89`	`+gbt_var_key_copy(constGBT_VARKEY_R*u)`
`71`	`90`	`{`
`72`		`-GBT_VARKEY*r=NULL;`
`73`	`91`	`int32lowersize=VARSIZE(u->lower);`
`74`	`92`	`int32uppersize=VARSIZE(u->upper);`
	`93`	`+GBT_VARKEY*r;`
	`94`	`+`
	`95`	`+r= (GBT_VARKEY*)palloc0(INTALIGN(lowersize)+uppersize+VARHDRSZ);`
	`96`	`+memcpy(VARDATA(r),u->lower,lowersize);`
	`97`	`+memcpy(VARDATA(r)+INTALIGN(lowersize),u->upper,uppersize);`
	`98`	`+SET_VARSIZE(r,INTALIGN(lowersize)+uppersize+VARHDRSZ);`
`75`	`99`
`76`		`-if (u->lower==u->upper&& !force_node)`
`77`		`-{/* leaf key mode */`
`78`		`-r= (GBT_VARKEY*)palloc(lowersize+VARHDRSZ);`
`79`		`-memcpy(VARDATA(r),u->lower,lowersize);`
`80`		`-SET_VARSIZE(r,lowersize+VARHDRSZ);`
`81`		`-}`
`82`		`-else`
`83`		`-{/* node key mode */`
`84`		`-r= (GBT_VARKEY*)palloc0(INTALIGN(lowersize)+uppersize+VARHDRSZ);`
`85`		`-memcpy(VARDATA(r),u->lower,lowersize);`
`86`		`-memcpy(VARDATA(r)+INTALIGN(lowersize),u->upper,uppersize);`
`87`		`-SET_VARSIZE(r,INTALIGN(lowersize)+uppersize+VARHDRSZ);`
`88`		`-}`
`89`	`100`	`returnr;`
`90`	`101`	`}`
`91`	`102`
`@@ -255,31 +266,28 @@ gbt_var_bin_union(Datum u, GBT_VARKEY e, Oid collation,`
`255`	`266`	`}`
`256`	`267`
`257`	`268`	`if (update)`
`258`		`-*u=PointerGetDatum(gbt_var_key_copy(&nr, TRUE));`
	`269`	`+*u=PointerGetDatum(gbt_var_key_copy(&nr));`
`259`	`270`	`}`
`260`	`271`	`else`
`261`	`272`	`{`
`262`	`273`	`nr.lower=eo.lower;`
`263`	`274`	`nr.upper=eo.upper;`
`264`		`-*u=PointerGetDatum(gbt_var_key_copy(&nr, TRUE));`
	`275`	`+*u=PointerGetDatum(gbt_var_key_copy(&nr));`
`265`	`276`	`}`
`266`	`277`	`}`
`267`	`278`
`268`	`279`
`269`		`-`
`270`	`280`	`GISTENTRY*`
`271`	`281`	`gbt_var_compress(GISTENTRYentry,constgbtree_vinfotinfo)`
`272`	`282`	`{`
`273`	`283`	`GISTENTRY*retval;`
`274`	`284`
`275`	`285`	`if (entry->leafkey)`
`276`	`286`	`{`
`277`		`-GBT_VARKEY*r=NULL;`
`278`		`-bytealeaf= (bytea)DatumGetPointer(PG_DETOAST_DATUM(entry->key));`
`279`		`-GBT_VARKEY_Ru;`
	`287`	`+structvarlena*leaf=PG_DETOAST_DATUM(entry->key);`
	`288`	`+GBT_VARKEY*r;`
`280`	`289`
`281`		`-u.lower=u.upper=leaf;`
`282`		`-r=gbt_var_key_copy(&u, FALSE);`
	`290`	`+r=gbt_var_key_from_datum(leaf);`
`283`	`291`
`284`	`292`	`retval=palloc(sizeof(GISTENTRY));`
`285`	`293`	`gistentryinit(*retval,PointerGetDatum(r),`
`@@ -293,7 +301,6 @@ gbt_var_compress(GISTENTRY entry, const gbtree_vinfo tinfo)`
`293`	`301`	`}`
`294`	`302`
`295`	`303`
`296`		`-`
`297`	`304`	`GBT_VARKEY*`
`298`	`305`	`gbt_var_union(constGistEntryVectorentryvec,int32size,Oidcollation,`
`299`	`306`	`constgbtree_vinfo*tinfo)`
`@@ -308,7 +315,7 @@ gbt_var_union(const GistEntryVector entryvec, int32 size, Oid collation,`
`308`	`315`
`309`	`316`	`cur= (GBT_VARKEY*)DatumGetPointer(entryvec->vector[0].key);`
`310`	`317`	`rk=gbt_var_key_readable(cur);`
`311`		`-out=PointerGetDatum(gbt_var_key_copy(&rk, TRUE));`
	`318`	`+out=PointerGetDatum(gbt_var_key_copy(&rk));`
`312`	`319`
`313`	`320`	`for (i=1;i<numranges;i++)`
`314`	`321`	`{`

`‎contrib/btree_gist/btree_utils_var.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ typedef struct`
`47`	`47`
`48`	`48`	`externGBT_VARKEY_Rgbt_var_key_readable(constGBT_VARKEY*k);`
`49`	`49`
`50`		`-externGBT_VARKEYgbt_var_key_copy(constGBT_VARKEY_Ru,boolforce_node);`
	`50`	`+externGBT_VARKEYgbt_var_key_copy(constGBT_VARKEY_Ru);`
`51`	`51`
`52`	`52`	`externGISTENTRYgbt_var_compress(GISTENTRYentry,constgbtree_vinfo*tinfo);`
`53`	`53`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp