Commit9fee610

Nikita Glukhov

committed

Add JsonValueInitBinary()

1 parenta0af4ad commit9fee610Copy full SHA for 9fee610

File tree

+20

-29

lines changed

+20

-29

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2764,13 +2764,10 @@ jsontFillValue(JsonIterator *pit, JsonValue res, bool skipNested,`
`2764`	`2764`	`caseJSON_TOKEN_OBJECT_START:`
`2765`	`2765`	`caseJSON_TOKEN_ARRAY_START:`
`2766`	`2766`	`{`
	`2767`	`+JsonContainerData*cont=JsonContainerAlloc();`
`2767`	`2768`	`char*token_start=lex->token_start;`
`2768`	`2769`	`intlen;`
`2769`	`2770`
`2770`		`-res->type=jbvBinary;`
`2771`		`-res->val.binary.data=JsonContainerAlloc();`
`2772`		`-res->val.binary.uniquified= false;`
`2773`		`-`
`2774`	`2771`	`if (skipNested)`
`2775`	`2772`	`{`
`2776`	`2773`	`if (tok==JSON_TOKEN_OBJECT_START)`
`@@ -2783,12 +2780,14 @@ jsontFillValue(JsonIterator *pit, JsonValue res, bool skipNested,`
`2783`	`2780`	`else`
`2784`	`2781`	`len=lex->input_length- (lex->token_start-lex->input);`
`2785`	`2782`
`2786`		`-jsontInitContainer((JsonContainerData*)res->val.binary.data,`
	`2783`	`+jsontInitContainer(cont,`
`2787`	`2784`	`token_start,len,`
`2788`	`2785`	`tok==JSON_TOKEN_OBJECT_START ?jbvObject`
`2789`	`2786`	`:jbvArray,`
`2790`	`2787`	`-1);`
`2791`	`2788`
	`2789`	`+JsonValueInitBinary(res,cont);`
	`2790`	`+`
`2792`	`2791`	`if (skipNested)`
`2793`	`2792`	`return false;`
`2794`	`2793`

Lines changed: 2 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,16 +153,10 @@ JsonValueUnwrap(const JsonValue val, JsonValue valbuf)`
`153`	`153`	`JsonValue*`
`154`	`154`	`JsonValueWrapInBinary(constJsonValueval,JsonValuebin)`
`155`	`155`	`{`
`156`		`-JsonContainer*jc=JsonValueToContainer(val);`
`157`		`-`
`158`	`156`	`if (!bin)`
`159`	`157`	`bin= (JsonValue*)palloc(sizeof(JsonValue));`
`160`	`158`
`161`		`-bin->type=jbvBinary;`
`162`		`-bin->val.binary.data=jc;`
`163`		`-bin->val.binary.uniquified=JsonValueIsUniquified(val);`
`164`		`-`
`165`		`-returnbin;`
	`159`	`+returnJsonValueInitBinary(bin,JsonValueToContainer(val));`
`166`	`160`	`}`
`167`	`161`
`168`	`162`	`staticinlineJsonValue*`
`@@ -708,11 +702,7 @@ JsonToJsonValue(Json json, JsonValue jv)`
`708`	`702`	`if (!jv)`
`709`	`703`	`jv=palloc(sizeof(JsonValue));`
`710`	`704`
`711`		`-jv->type=jbvBinary;`
`712`		`-jv->val.binary.data=&json->root;`
`713`		`-jv->val.binary.uniquified=json->root.ops!=&jsontContainerOps;`
`714`		`-`
`715`		`-returnjv;`
	`705`	`+returnJsonValueInitBinary(jv,&json->root);`
`716`	`706`	`}`
`717`	`707`
`718`	`708`	`#defineJSON_FLATTEN_INTO_TARGET`

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,14 +136,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,`
`136`	`136`	`if (binary)`
`137`	`137`	`Assert(binary->type==jbvBinary);`
`138`	`138`	`else`
`139`		`-{`
`140`		`-jbv.type=jbvBinary;`
`141`		`-jbv.val.binary.data=jc;`
`142`		`-jbv.val.binary.len=jc->len;`
`143`		`-jbv.val.binary.uniquified=JsonContainerIsUniquified(jc);`
`144`		`-`
`145`		`-binary=&jbv;`
`146`		`-}`
	`139`	`+binary=JsonValueInitBinary(&jbv,jc);`
`147`	`140`
`148`	`141`	`if (!binary->val.binary.uniquified)`
`149`	`142`	`binary=JsonValueUniquify(&uniquified,binary);`
`@@ -624,15 +617,14 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`624`	`617`	`}`
`625`	`618`	`else`
`626`	`619`	`{`
	`620`	`+JsonContainerData*cont=JsonContainerAlloc();`
`627`	`621`	`Assert(JBE_ISCONTAINER(entry));`
`628`		`-result->type=jbvBinary;`
`629`		`-result->val.binary.data=JsonContainerAlloc();`
`630`		`-jsonbInitContainer((JsonContainerData*)result->val.binary.data,`
	`622`	`+jsonbInitContainer(cont,`
`631`	`623`	`/* Remove alignment padding from data pointer and length */`
`632`	`624`	`(JsonbContainer*)(base_addr+INTALIGN(offset)),`
`633`	`625`	`getJsonbLength(container,index)-`
`634`	`626`	`(INTALIGN(offset)-offset));`
`635`		`-result->val.binary.uniquified= true;`
	`627`	`+JsonValueInitBinary(result,cont);`
`636`	`628`	`}`
`637`	`629`	`}`
`638`	`630`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,16 @@ JsonValueInitArray(JsonValue *val, int nElems, int nElemsAllocated,`
`355`	`355`	`returnval;`
`356`	`356`	`}`
`357`	`357`
	`358`	`+staticinlineJsonValue*`
	`359`	`+JsonValueInitBinary(JsonValueval,JsonContainercont)`
	`360`	`+{`
	`361`	`+val->type=jbvBinary;`
	`362`	`+val->val.binary.data=cont;`
	`363`	`+val->val.binary.uniquified=JsonContainerIsUniquified(cont);`
	`364`	`+`
	`365`	`+returnval;`
	`366`	`+}`
	`367`	`+`
`358`	`368`	`externJsonJsonValueToJson(JsonValueval);`
`359`	`369`	`externJsonValueJsonToJsonValue(Jsonjson,JsonValue*jv);`
`360`	`370`	`externJsonValueJsonValueUnpackBinary(constJsonValuejbv);`

Comments

(0)