Commitf649da1

Nikita Glukhov

committed

Add jsonb support for custom toasters

1 parent694c56b commitf649da1Copy full SHA for f649da1

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`#include"postgres.h"`
`12`	`12`
	`13`	`+#include"access/toasterapi.h"`
`13`	`14`	`#include"miscadmin.h"`
`14`	`15`	`#include"utils/builtins.h"`
`15`	`16`	`#include"utils/jsonb.h"`
`@@ -101,9 +102,24 @@ JsonExpandDatum(Datum value, JsonContainerOps ops, Json tmp)`
`101`	`102`	`Json*`
`102`	`103`	`DatumGetJson(Datumvalue,JsonContainerOpsops,Jsontmp)`
`103`	`104`	`{`
`104`		`-Json*json=JsonExpandDatum(value,ops,tmp);`
	`105`	`+Json*json;`
`105`	`106`
`106`		`-//JsonInit(json);`
	`107`	`+if (VARATT_IS_CUSTOM(value))`
	`108`	`+{`
	`109`	`+Oidtoasterid=VARATT_CUSTOM_GET_TOASTERID(value);`
	`110`	`+TsrRoutine*toaster=SearchTsrCache(toasterid);`
	`111`	`+JsonToastRoutine*routine=toaster->get_vtable(toasterid);`
	`112`	`+`
	`113`	`+if (routine->magic==JSON_TOASTER_MAGIC)`
	`114`	`+{`
	`115`	`+json=JsonExpand(tmp,value, false,routine->ops);`
	`116`	`+routine->ops->init(JsonRoot(json),value);`
	`117`	`+`
	`118`	`+returnjson;`
	`119`	`+}`
	`120`	`+}`
	`121`	`+`
	`122`	`+json=JsonExpandDatum(value,ops,tmp);`
`107`	`123`	`json->root.ops->init(&json->root,json->obj.value);`
`108`	`124`
`109`	`125`	`returnjson;`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -310,4 +310,12 @@ extern int lengthCompareJsonbString(const char *val1, int len1,`
`310`	`310`
`311`	`311`	`externJsonContainerOpsjsonbContainerOps;`
`312`	`312`
	`313`	`+#defineJSON_TOASTER_MAGIC 0x20211223`
	`314`	`+`
	`315`	`+typedefstructJsonToastRoutine`
	`316`	`+{`
	`317`	`+uint32magic;`
	`318`	`+JsonContainerOps*ops;`
	`319`	`+}JsonToastRoutine;`
	`320`	`+`
`313`	`321`	`#endif/* UTILS_JSON_GENERIC_H */`

Comments

(0)