Commit2c1d01d

Nikita Glukhov

committed

fixup! Add temporary stack-allocated expanded Jsons

1 parent54c5f46 commit2c1d01dCopy full SHA for 2c1d01d

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,8 @@ typedef struct Json`
`110`	`110`	`#defineDatumGetJsonx(datum) \`
`111`	`111`	`DatumGetJson(datum, JsonxContainerOps, NULL, NULL)`
`112`	`112`
`113`		`-#defineDatumGetJsonbTmp(datum,tmp)\`
`114`		`-DatumGetJson(datum,&jsonbContainerOps, NULL, tmp)`
	`113`	`+#defineDatumGetJsonxTmp(datum,tmp)\`
	`114`	`+DatumGetJson(datum,JsonxContainerOps, NULL, tmp)`
`115`	`115`
`116`	`116`	`#defineJsonIsUniquified(json) ( \`
`117`	`117`	`JsonRoot(json)->ops == &jsontContainerOps ? false : \`
`@@ -129,13 +129,11 @@ typedef struct Json`
`129`	`129`	`# defineJsonbGetDatum(json)JsonGetDatum(JsonGetUniquified(json))`
`130`	`130`	`#endif`
`131`	`131`
`132`		`-#definePG_GETARG_JSONB_TMP(n,tmp)DatumGetJsonbTmp(PG_GETARG_DATUM(n), tmp)`
`133`	`132`
`134`		`-#undefPG_GETARG_JSONB`
`135`		`-#definePG_GETARG_JSONB(n)PG_GETARG_JSONB_TMP(n, alloca(sizeof(Json)))`
	`133`	`+#definePG_GETARG_JSONX_TMP(n,tmp)DatumGetJsonxTmp(PG_GETARG_DATUM(n), tmp)`
`136`	`134`
`137`	`135`	`#undefPG_GETARG_JSONB`
`138`		`-#definePG_GETARG_JSONB(n)DatumGetJsonx(PG_GETARG_DATUM(n))`
	`136`	`+#definePG_GETARG_JSONB(n)PG_GETARG_JSONX_TMP(n, alloca(sizeof(Json)))`
`139`	`137`
`140`	`138`	`#defineJsonFreeIfCopy(json,datum) \`
`141`	`139`	`do { \`

Comments

(0)