Commit14d4821

Nikita Glukhov

committed

Pass toaster id to encode method

1 parent8e9a0cf commit14d4821Copy full SHA for 14d4821

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,9 @@ JsonbValueToOrigJsonbDatum(JsonValue val, Json orig_json)`
`166`	`166`	`if (val->type!=jbvBinary&&`
`167`	`167`	`JsonRoot(orig_json)->ops->encode)`
`168`	`168`	`{`
`169`		`-void*res=JsonRoot(orig_json)->ops->encode(val,&jsonbContainerOps);`
	`169`	`+void*res=`
	`170`	`+JsonRoot(orig_json)->ops->encode(val,&jsonbContainerOps,`
	`171`	`+JsonRoot(orig_json)->toasterid);`
`170`	`172`
`171`	`173`	`if (res)`
`172`	`174`	`returnPointerGetDatum(res);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,`
`126`	`126`	`void*res;`
`127`	`127`
`128`	`128`	`JsonValueInitBinary(&bin,jc);`
`129`		`-res=jc->ops->encode(&bin,ops);`
	`129`	`+res=jc->ops->encode(&bin,ops,jc->toasterid);`
`130`	`130`
`131`	`131`	`if (res)`
`132`	`132`	`returnres;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct JsonContainerOps`
`64`	`64`	`intestimated_len);`
`65`	`65`	`JsonContainer(copy)(JsonContainer*jc);`
`66`	`66`	`void(free)(JsonContainerjc);`
`67`		`-void(encode)(JsonValuejc,JsonContainerOpsops);`
	`67`	`+void(encode)(JsonValuejc,JsonContainerOpsops,Oidtoasterid);`
`68`	`68`	`};`
`69`	`69`
`70`	`70`	`typedefstructCompressedObject`

Comments

(0)