mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-13 19:57:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify addJsonbToParseState()

Browse Source 
This function no longer needs to walk non-scalar structures passed to
it, following commit 54547bd87f.
This commit is contained in:
Andrew Dunstan 2015-05-26 11:46:02 -04:00
parent 54547bd87f
commit fba12c8c6c
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/utils/adt/jsonfuncs.c
View File

@ -3225,8 +3225,9 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
* If the parse state container is an object, the jsonb is pushed as
* a value, not a key.
*
* This needs to be done using an iterator because pushJsonbValue doesn't
* like getting jbvBinary values, so we can't just push jb as a whole.
* If the new value is a root scalar, extract the value using an iterator, and
* just add that. Otherwise, add the value as the type appropriate for
* the container.
*/
static void
addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb)
@ -3236,36 +3237,26 @@ addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb)
int type;
JsonbValue v;
it = JsonbIteratorInit(&jb->root);
Assert(o->type == jbvArray || o->type == jbvObject);
if (JB_ROOT_IS_SCALAR(jb))
{
it = JsonbIteratorInit(&jb->root);
(void) JsonbIteratorNext(&it, &v, false); /* skip array header */
(void) JsonbIteratorNext(&it, &v, false); /* fetch scalar value */
switch (o->type)
{
case jbvArray:
(void) pushJsonbValue(jbps, WJB_ELEM, &v);
break;
case jbvObject:
(void) pushJsonbValue(jbps, WJB_VALUE, &v);
break;
default:
elog(ERROR, "unexpected parent of nested structure");
}
if (o->type == jbvArray)
(void) pushJsonbValue(jbps, WJB_ELEM, &v);
else
(void) pushJsonbValue(jbps, WJB_VALUE, &v);
}
else
{
while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
{
if (type == WJB_KEY || type == WJB_VALUE || type == WJB_ELEM)
(void) pushJsonbValue(jbps, type, &v);
else
(void) pushJsonbValue(jbps, type, NULL);
}
if (o->type == jbvArray)
(void) pushJsonbValue(jbps, WJB_ELEM, &jb->root);
else
(void) pushJsonbValue(jbps, WJB_VALUE, &jb->root);
}
}