Commit4079d52

Nikita Glukhov

committed

Add JsonContainerAlloc() macro

1 parent28ed5bb commit4079d52Copy full SHA for 4079d52

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ JsonValueToContainer(const JsonValue *val)`
`173`	`173`	`returnval->val.binary.data;`
`174`	`174`	`else`
`175`	`175`	`{`
`176`		`-JsonContainerData*jc=palloc(sizeof(JsonContainerData));`
	`176`	`+JsonContainerData*jc=JsonContainerAlloc();`
`177`	`177`	`jsonvInitContainer(jc,val);`
`178`	`178`	`returnjc;`
`179`	`179`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`641`	`641`	`{`
`642`	`642`	`Assert(JBE_ISCONTAINER(entry));`
`643`	`643`	`result->type=jbvBinary;`
`644`		`-result->val.binary.data=palloc(sizeof(JsonContainerData));`
	`644`	`+result->val.binary.data=JsonContainerAlloc();`
`645`	`645`	`jsonbInitContainer((JsonContainerData*)result->val.binary.data,`
`646`	`646`	`/* Remove alignment padding from data pointer and length */`
`647`	`647`	`(JsonbContainer*)(base_addr+INTALIGN(offset)),`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1336,8 +1336,7 @@ jsontFillValue(JsonIterator *pit, JsonValue res, bool skipNested,`
`1336`	`1336`
`1337`	`1337`	`res->type=jbvBinary;`
`1338`	`1338`	`res->val.binary.len=0;`
`1339`		`-res->val.binary.data= (JsonContainer*)`
`1340`		`-palloc(sizeof(JsonContainer));`
	`1339`	`+res->val.binary.data=JsonContainerAlloc();`
`1341`	`1340`
`1342`	`1341`	`if (skipNested)`
`1343`	`1342`	`{`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,9 @@ JsonIteratorNext(JsonIterator *it, JsonValue val, bool skipNested)`
`249`	`249`
`250`	`250`	`externJsonDatumGetJson(Datumvalue,JsonContainerOpsops);`
`251`	`251`
	`252`	`+#defineJsonContainerAlloc() \`
	`253`	`+((JsonContainerData *) palloc(sizeof(JsonContainerData)))`
	`254`	`+`
`252`	`255`	`externJsonValueJsonFindValueInContainer(JsonContainerjson,uint32flags,`
`253`	`256`	`JsonValue*key);`
`254`	`257`

Comments

(0)