Commit71c25d7

Nikita Glukhov

committed

Simplify jsonb_get_element()

1 parent8b36bda commit71c25d7Copy full SHA for 71c25d7

File tree

+13

-23

lines changed

+13

-23

lines changed

Lines changed: 13 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -4012,33 +4012,23 @@ Datum`
`4012`	`4012`	`jsonb_get_element(Datumjsonbdatum,text*path,intpath_len,boolis_null)`
`4013`	`4013`	`{`
`4014`	`4014`	`Jsonb*jb=DatumGetJsonb(jsonbdatum);`
`4015`		`-JsonbValue*v;`
`4016`		`-intlevel=1;`
	`4015`	`+JsonbValuevbuf;`
	`4016`	`+JsonbValue*v=JsonbToJsonbValue(jb,&vbuf);`
	`4017`	`+intlevel;`
`4017`	`4018`
`4018`		`-if (!JB_ROOT_IS_OBJECT(jb))`
	`4019`	`+for (level=0;level<path_len;level++)`
`4019`	`4020`	`{`
`4020`		`-*is_null= true;`
`4021`		`-return (Datum)0;`
`4022`		`-}`
`4023`		`-`
`4024`		`-v=findJsonbValueFromContainerLen(&jb->root,JB_FOBJECT,`
`4025`		`-VARDATA_ANY(path[0]),`
`4026`		`-VARSIZE_ANY_EXHDR(path[0]));`
`4027`		`-`
`4028`		`-while (v!=NULL&&`
`4029`		`-v->type==jbvBinary&&level<path_len)`
`4030`		`-{`
`4031`		`-v=findJsonbValueFromContainerLen(v->val.binary.data,JB_FOBJECT,`
`4032`		`-VARDATA_ANY(path[level]),`
`4033`		`-VARSIZE_ANY_EXHDR(path[level]));`
`4034`		`-level++;`
	`4021`	`+if (v->type!=jbvBinary\|\|`
	`4022`	`+!(v=findJsonbValueFromContainerLen(v->val.binary.data,JB_FOBJECT,`
	`4023`	`+VARDATA_ANY(path[level]),`
	`4024`	`+VARSIZE_ANY_EXHDR(path[level]))))`
	`4025`	`+{`
	`4026`	`+*is_null= true;`
	`4027`	`+return (Datum)0;`
	`4028`	`+}`
`4035`	`4029`	`}`
`4036`	`4030`
`4037`		`-if (v!=NULL&&level==path_len)`
`4038`		`-PG_RETURN_JSONB(JsonbValueToJsonb(v));`
`4039`		`-`
`4040`		`-*is_null= true;`
`4041`		`-return (Datum)0;`
	`4031`	`+PG_RETURN_JSONB(JsonbValueToJsonb(v));`
`4042`	`4032`	`}`
`4043`	`4033`
`4044`	`4034`	`Datum`

Comments

(0)