Commit8e9a0cf

Nikita Glukhov

committed

Add context to JsonValueFlatten()

1 parent6f2db95 commit8e9a0cfCopy full SHA for 8e9a0cf

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,`
`165`	`165`	`*/`
`166`	`166`	`void*`
`167`	`167`	`JsonValueFlatten(constJsonValue*val,JsonValueEncoderencoder,`
`168`		`-JsonContainerOps*ops)`
	`168`	`+JsonContainerOpsops,voidcxt)`
`169`	`169`	`{`
`170`	`170`	`if (val->type==jbvBinary)`
`171`	`171`	`returnJsonContainerFlatten(val->val.binary.data,encoder,ops,val);`
`@@ -180,7 +180,7 @@ JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,`
`180`	`180`	`Assert(val->type==jbvObject\|\|val->type==jbvArray);`
`181`	`181`	`}`
`182`	`182`
`183`		`-returnJsonEncode(val,encoder,NULL);`
	`183`	`+returnJsonEncode(val,encoder,cxt);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/*`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ typedef JsonContainer JsonbContainer;`
`92`	`92`	`PointerGetDatum(JsonFlatten(json, JsonbEncode, &jsonbContainerOps))`
`93`	`93`
`94`	`94`	`#defineJsonValueToJsonbDatum(jv) \`
`95`		`-PointerGetDatum(JsonValueFlatten(jv, JsonbEncode, &jsonbContainerOps))`
	`95`	`+PointerGetDatum(JsonValueFlatten(jv, JsonbEncode, &jsonbContainerOps, NULL))`
`96`	`96`
`97`	`97`	`#defineJsonbPGetDatum(json)JsonFlattenToJsonbDatum(json)`
`98`	`98`
`@@ -294,7 +294,7 @@ extern void JsonContainerFlatten(JsonContainer jc, JsonValueEncoder encoder,`
`294`	`294`	`JsonContainerOpsops,constJsonValuebinary);`
`295`	`295`
`296`	`296`	`externvoidJsonValueFlatten(constJsonValueval,JsonValueEncoderencoder,`
`297`		`-JsonContainerOps*ops);`
	`297`	`+JsonContainerOpsops,voidcxt);`
`298`	`298`	`externvoidJsonEncode(constJsonbValueval,JsonValueEncoderencoder,void*cxt);`
`299`	`299`
`300`	`300`	`staticinlinevoid*`
`@@ -306,7 +306,7 @@ JsonFlatten(Json json, JsonValueEncoder encoder, JsonContainerOps ops)`
`306`	`306`	`externvoidJsonbEncode(StringInfo,constJsonValue,voidcxt);`
`307`	`307`
`308`	`308`	`#defineJsonValueToJsonb(val) \`
`309`		`-JsonValueFlatten(val, JsonbEncode, &jsonbContainerOps)`
	`309`	`+JsonValueFlatten(val, JsonbEncode, &jsonbContainerOps, NULL)`
`310`	`310`
`311`	`311`	`externintlengthCompareJsonbStringValue(constvoida,constvoidb);`
`312`	`312`	`externintlengthCompareJsonbString(constchar*val1,intlen1,`

Comments

(0)