NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdbb9aed

committed

Optimize get_jsonb_path_all avoiding an iterator

Instead of creating an iterator object at each step down the JSONBobject/array, we can just just examine its object/array flags, which isfaster. Also, use the recently introduced JsonbValueAsText instead ofopen-coding the same thing, for code simplicity.Author: Nikita GlukhovDiscussion:https://postgr.es/m/7c417f90-f95f-247e-ba63-d95e39c0ad14@postgrespro.ru

1 parentabb014a commitdbb9aedCopy full SHA for dbb9aed

File tree

1 file changed

+10

-23

lines changed

src/backend/utils/adt
- jsonfuncs.c

1 file changed

+10

-23

lines changed

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

Lines changed: 10 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -1329,15 +1329,13 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)`
`1329`	`1329`	`{`
`1330`	`1330`	`Jsonb*jb=PG_GETARG_JSONB_P(0);`
`1331`	`1331`	`ArrayType*path=PG_GETARG_ARRAYTYPE_P(1);`
`1332`		`-Jsonb*res;`
`1333`	`1332`	`Datum*pathtext;`
`1334`	`1333`	`bool*pathnulls;`
`1335`	`1334`	`intnpath;`
`1336`	`1335`	`inti;`
`1337`	`1336`	`boolhave_object= false,`
`1338`	`1337`	`have_array= false;`
`1339`	`1338`	`JsonbValue*jbvp=NULL;`
`1340`		`-JsonbValuetv;`
`1341`	`1339`	`JsonbContainer*container;`
`1342`	`1340`
`1343`	`1341`	`/*`
`@@ -1449,41 +1447,30 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)`
`1449`	`1447`
`1450`	`1448`	`if (jbvp->type==jbvBinary)`
`1451`	`1449`	`{`
`1452`		`-JsonbIteratorit=JsonbIteratorInit((JsonbContainer)jbvp->val.binary.data);`
`1453`		`-JsonbIteratorTokenr;`
`1454`		`-`
`1455`		`-r=JsonbIteratorNext(&it,&tv, true);`
`1456`		`-container= (JsonbContainer*)jbvp->val.binary.data;`
`1457`		`-have_object=r==WJB_BEGIN_OBJECT;`
`1458`		`-have_array=r==WJB_BEGIN_ARRAY;`
	`1450`	`+container=jbvp->val.binary.data;`
	`1451`	`+have_object=JsonContainerIsObject(container);`
	`1452`	`+have_array=JsonContainerIsArray(container);`
	`1453`	`+Assert(!JsonContainerIsScalar(container));`
`1459`	`1454`	`}`
`1460`	`1455`	`else`
`1461`	`1456`	`{`
`1462`		`-have_object=jbvp->type==jbvObject;`
`1463`		`-have_array=jbvp->type==jbvArray;`
	`1457`	`+Assert(IsAJsonbScalar(jbvp));`
	`1458`	`+have_object= false;`
	`1459`	`+have_array= false;`
`1464`	`1460`	`}`
`1465`	`1461`	`}`
`1466`	`1462`
`1467`	`1463`	`if (as_text)`
`1468`	`1464`	`{`
`1469`		`-/* special-case outputs for string and null values */`
`1470`		`-if (jbvp->type==jbvString)`
`1471`		`-PG_RETURN_TEXT_P(cstring_to_text_with_len(jbvp->val.string.val,`
`1472`		`-jbvp->val.string.len));`
`1473`	`1465`	`if (jbvp->type==jbvNull)`
`1474`	`1466`	`PG_RETURN_NULL();`
`1475`		`-}`
`1476`		`-`
`1477`		`-res=JsonbValueToJsonb(jbvp);`
`1478`	`1467`
`1479`		`-if (as_text)`
`1480`		`-{`
`1481`		`-PG_RETURN_TEXT_P(cstring_to_text(JsonbToCString(NULL,`
`1482`		`-&res->root,`
`1483`		`-VARSIZE(res))));`
	`1468`	`+PG_RETURN_TEXT_P(JsonbValueAsText(jbvp));`
`1484`	`1469`	`}`
`1485`	`1470`	`else`
`1486`	`1471`	`{`
	`1472`	`+Jsonb*res=JsonbValueToJsonb(jbvp);`
	`1473`	`+`
`1487`	`1474`	`/* not text mode - just hand back the jsonb */`
`1488`	`1475`	`PG_RETURN_JSONB_P(res);`
`1489`	`1476`	`}`

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!

Commitdbb9aed

File tree

1 file changed

1 file changed

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

0 commit comments