Commit 7e36809

authored

Merge pull request #14 from ildus/master

Add compability with pg11

2 parents 26471d8 + 2f772b5 commit 7e36809Copy full SHA for 7e36809

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,12 @@ PG_FUNCTION_INFO_V1(jsonb_to_zson);`
`30`	`30`	`PG_FUNCTION_INFO_V1(zson_info);`
`31`	`31`	`PG_FUNCTION_INFO_V1(debug_dump_jsonb);`
`32`	`32`
	`33`	`+/* In version 11 these macros have been changed */`
	`34`	`+#if PG_VERSION_NUM < 110000`
	`35`	`+#define PG_GETARG_JSONB_P(v) PG_GETARG_JSONB(v)`
	`36`	`+#define PG_RETURN_JSONB_P(v) PG_RETURN_JSONB(v)`
	`37`	`+#endif`
	`38`	`+`
`33`	`39`	`#define ZSON_CURRENT_VERSION 0`
`34`	`40`
`35`	`41`	`#define ZSON_HEADER_SIZE (sizeof(uint8) + sizeof(uint32)*2)`
`@@ -477,7 +483,7 @@ zson_fastdecompress(const Dict* pdict,`
`477`	`483`	`Datum`
`478`	`484`	`jsonb_to_zson(PG_FUNCTION_ARGS)`
`479`	`485`	`{`
`480`		`- Jsonb *jsonb = PG_GETARG_JSONB(0);`
	`486`	`+ Jsonb *jsonb = PG_GETARG_JSONB_P(0);`
`481`	`487`	`uint8* jsonb_data = (uint8*)VARDATA(jsonb);`
`482`	`488`	`Size jsonb_data_size = VARSIZE(jsonb) - VARHDRSZ;`
`483`	`489`	`uint8 encoded_buff, encoded_header, *encoded_data;`
`@@ -580,7 +586,7 @@ zson_to_jsonb(PG_FUNCTION_ARGS)`
`580`	`586`
`581`	`587`	`decoded_size += VARHDRSZ;`
`582`	`588`	`SET_VARSIZE(jsonb, decoded_size);`
`583`		`- PG_RETURN_JSONB(jsonb);`
	`589`	`+ PG_RETURN_JSONB_P(jsonb);`
`584`	`590`	`}`
`585`	`591`
`586`	`592`	`// zson -> "size, encoded size, other info"`

Comments

(0)