NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita5351c9

Nikita Glukhov

committed

Simplify and move to jsonb_utils.c clone_parse_state()

1 parentd76a28e commita5351c9Copy full SHA for a5351c9

File tree

3 files changed

+29

-37

lines changed

src
- backend/utils/adt
  - jsonb.c
  - jsonb_util.c
- include/utils
  - jsonb.h

3 files changed

+29

-37

lines changed

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

Lines changed: 2 additions & 37 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ static void datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`86`	`86`	`boolkey_scalar);`
`87`	`87`	`staticvoidadd_jsonb(Datumval,boolis_null,JsonbInState*result,`
`88`	`88`	`Oidval_type,boolkey_scalar);`
`89`		`-staticJsonbParseStateclone_parse_state(JsonbParseStatestate);`
`90`	`89`	`staticcharJsonbToCStringWorker(StringInfoout,JsonbContainerin,intestimated_len,boolindent);`
`91`	`90`	`staticvoidadd_indent(StringInfoout,boolindent,intlevel);`
`92`	`91`
`@@ -1465,40 +1464,6 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS)`
`1465`	`1464`	`}`
`1466`	`1465`
`1467`	`1466`
`1468`		`-/*`
`1469`		`- * shallow clone of a parse state, suitable for use in aggregate`
`1470`		`- * final functions that will only append to the values rather than`
`1471`		`- * change them.`
`1472`		`- */`
`1473`		`-staticJsonbParseState*`
`1474`		`-clone_parse_state(JsonbParseState*state)`
`1475`		`-{`
`1476`		`-JsonbParseState*result,`
`1477`		`-*icursor,`
`1478`		`-*ocursor;`
`1479`		`-`
`1480`		`-if (state==NULL)`
`1481`		`-returnNULL;`
`1482`		`-`
`1483`		`-result=palloc(sizeof(JsonbParseState));`
`1484`		`-icursor=state;`
`1485`		`-ocursor=result;`
`1486`		`-for (;;)`
`1487`		`-{`
`1488`		`-ocursor->contVal=icursor->contVal;`
`1489`		`-ocursor->size=icursor->size;`
`1490`		`-icursor=icursor->next;`
`1491`		`-if (icursor==NULL)`
`1492`		`-break;`
`1493`		`-ocursor->next=palloc(sizeof(JsonbParseState));`
`1494`		`-ocursor=ocursor->next;`
`1495`		`-}`
`1496`		`-ocursor->next=NULL;`
`1497`		`-`
`1498`		`-returnresult;`
`1499`		`-}`
`1500`		`-`
`1501`		`-`
`1502`	`1467`	`/*`
`1503`	`1468`	`* jsonb_agg aggregate function`
`1504`	`1469`	`*/`
`@@ -1642,7 +1607,7 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)`
`1642`	`1607`	`* values, just add the final array end marker.`
`1643`	`1608`	`*/`
`1644`	`1609`
`1645`		`-result.parseState=clone_parse_state(arg->res->parseState);`
	`1610`	`+result.parseState=JsonbParseStateClone(arg->res->parseState);`
`1646`	`1611`
`1647`	`1612`	`result.res=pushJsonbValue(&result.parseState,`
`1648`	`1613`	`WJB_END_ARRAY,NULL);`
`@@ -1874,7 +1839,7 @@ jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)`
`1874`	`1839`	`* marker.`
`1875`	`1840`	`*/`
`1876`	`1841`
`1877`		`-result.parseState=clone_parse_state(arg->res->parseState);`
	`1842`	`+result.parseState=JsonbParseStateClone(arg->res->parseState);`
`1878`	`1843`
`1879`	`1844`	`result.res=pushJsonbValue(&result.parseState,`
`1880`	`1845`	`WJB_END_OBJECT,NULL);`

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

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,32 @@ fillJsonbValue(JsonbContainer *container, int index,`
`538`	`538`	`}`
`539`	`539`	`}`
`540`	`540`
	`541`	`+/*`
	`542`	`+ * shallow clone of a parse state, suitable for use in aggregate`
	`543`	`+ * final functions that will only append to the values rather than`
	`544`	`+ * change them.`
	`545`	`+ */`
	`546`	`+JsonbParseState*`
	`547`	`+JsonbParseStateClone(JsonbParseState*state)`
	`548`	`+{`
	`549`	`+JsonbParseState*result,`
	`550`	`+*icursor,`
	`551`	`+*ocursor,`
	`552`	`+**pocursor=&result;`
	`553`	`+`
	`554`	`+for (icursor=state;icursor;icursor=icursor->next)`
	`555`	`+{`
	`556`	`+*pocursor=ocursor=palloc(sizeof(JsonbParseState));`
	`557`	`+ocursor->contVal=icursor->contVal;`
	`558`	`+ocursor->size=icursor->size;`
	`559`	`+pocursor=&ocursor->next;`
	`560`	`+}`
	`561`	`+`
	`562`	`+*pocursor=NULL;`
	`563`	`+`
	`564`	`+returnresult;`
	`565`	`+}`
	`566`	`+`
`541`	`567`	`/*`
`542`	`568`	`* Push JsonbValue into JsonbParseState.`
`543`	`569`	`*`

`‎src/include/utils/jsonb.h`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -387,6 +387,7 @@ extern JsonbValue getIthJsonbValueFromContainer(JsonbContainer sheader,`
`387`	`387`	`uint32i);`
`388`	`388`	`externJsonbValuepushJsonbValue(JsonbParseState*pstate,`
`389`	`389`	`JsonbIteratorTokenseq,JsonbValue*jbval);`
	`390`	`+externJsonbParseStateJsonbParseStateClone(JsonbParseStatestate);`
`390`	`391`	`externJsonbIteratorJsonbIteratorInit(JsonbContainercontainer);`
`391`	`392`	`externJsonbIteratorTokenJsonbIteratorNext(JsonbIterator*it,JsonbValueval,`
`392`	`393`	`boolskipNested);`

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!

Commita5351c9

File tree

3 files changed

3 files changed

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

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

`‎src/include/utils/jsonb.h`

0 commit comments