Commitf94e8c6

Nikita Glukhov

committed

Add JsonContainerAlloc() macro

1 parente0336b1 commitf94e8c6Copy full SHA for f94e8c6

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2767,8 +2767,7 @@ jsontFillValue(JsonIterator *pit, JsonValue res, bool skipNested,`
`2767`	`2767`
`2768`	`2768`	`res->type=jbvBinary;`
`2769`	`2769`	`res->val.binary.len=0;`
`2770`		`-res->val.binary.data= (JsonContainer*)`
`2771`		`-palloc(sizeof(JsonContainer));`
	`2770`	`+res->val.binary.data=JsonContainerAlloc();`
`2772`	`2771`
`2773`	`2772`	`if (skipNested)`
`2774`	`2773`	`{`

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`614`	`614`	`{`
`615`	`615`	`Assert(JBE_ISCONTAINER(entry));`
`616`	`616`	`result->type=jbvBinary;`
`617`		`-result->val.binary.data=palloc(sizeof(JsonContainerData));`
	`617`	`+result->val.binary.data=JsonContainerAlloc();`
`618`	`618`	`jsonbInitContainer((JsonContainerData*)result->val.binary.data,`
`619`	`619`	`/* Remove alignment padding from data pointer and length */`
`620`	`620`	`(JsonbContainer*)(base_addr+INTALIGN(offset)),`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,9 @@ JsonIteratorNext(JsonIterator *it, JsonValue val, bool skipNested)`
`227`	`227`	`externJsonDatumGetJson(Datumval,JsonContainerOpsops,`
`228`	`228`	`CompressionOptionsoptions);`
`229`	`229`
	`230`	`+#defineJsonContainerAlloc() \`
	`231`	`+((JsonContainerData *) palloc(sizeof(JsonContainerData)))`
	`232`	`+`
`230`	`233`	`externJsonValueJsonFindValueInContainer(JsonContainerjson,uint32flags,`
`231`	`234`	`JsonValue*key);`
`232`	`235`

Comments

(0)