Commit5c4d00b

Nikita Glukhov

committed

Add JsonbRoot(), JsonbGetSize() macros

1 parent4152c5b commit5c4d00bCopy full SHA for 5c4d00b

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ jsonb_out(PG_FUNCTION_ARGS)`
`139`	`139`	`Jsonb*jb=PG_GETARG_JSONB(0);`
`140`	`140`	`char*out;`
`141`	`141`
`142`		`-out=JsonbToCString(NULL,&jb->root,VARSIZE(jb));`
	`142`	`+out=JsonbToCString(NULL,JsonbRoot(jb),JsonbGetSize(jb));`
`143`	`143`
`144`	`144`	`PG_RETURN_CSTRING(out);`
`145`	`145`	`}`
`@@ -157,7 +157,7 @@ jsonb_send(PG_FUNCTION_ARGS)`
`157`	`157`	`StringInfojtext=makeStringInfo();`
`158`	`158`	`intversion=1;`
`159`	`159`
`160`		`-(void)JsonbToCString(jtext,&jb->root,VARSIZE(jb));`
	`160`	`+(void)JsonbToCString(jtext,JsonbRoot(jb),JsonbGetSize(jb));`
`161`	`161`
`162`	`162`	`pq_begintypsend(&buf);`
`163`	`163`	`pq_sendint(&buf,version,1);`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1426,7 +1426,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)`
`1426`	`1426`	`{`
`1427`	`1427`	`PG_RETURN_TEXT_P(cstring_to_text(JsonbToCString(NULL,`
`1428`	`1428`	`container,`
`1429`		`-VARSIZE(jb))));`
	`1429`	`+JsonbGetSize(jb))));`
`1430`	`1430`	`}`
`1431`	`1431`	`else`
`1432`	`1432`	`{`
`@@ -1523,8 +1523,8 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)`
`1523`	`1523`	`if (as_text)`
`1524`	`1524`	`{`
`1525`	`1525`	`PG_RETURN_TEXT_P(cstring_to_text(JsonbToCString(NULL,`
`1526`		`-&res->root,`
`1527`		`-VARSIZE(res))));`
	`1526`	`+JsonbRoot(res),`
	`1527`	`+JsonbGetSize(res))));`
`1528`	`1528`	`}`
`1529`	`1529`	`else`
`1530`	`1530`	`{`
`@@ -3995,7 +3995,7 @@ jsonb_pretty(PG_FUNCTION_ARGS)`
`3995`	`3995`	`Jsonb*jb=PG_GETARG_JSONB(0);`
`3996`	`3996`	`StringInfostr=makeStringInfo();`
`3997`	`3997`
`3998`		`-JsonbToCStringIndent(str,&jb->root,VARSIZE(jb));`
	`3998`	`+JsonbToCStringIndent(str,JsonbRoot(jb),JsonbGetSize(jb));`
`3999`	`3999`
`4000`	`4000`	`PG_RETURN_TEXT_P(cstring_to_text_with_len(str->data,str->len));`
`4001`	`4001`	`}`
`@@ -4006,7 +4006,7 @@ jsonb_canonical(PG_FUNCTION_ARGS)`
`4006`	`4006`	`Jsonb*jb=PG_GETARG_JSONB(0);`
`4007`	`4007`	`StringInfostr=makeStringInfo();`
`4008`	`4008`
`4009`		`-JsonbToCStringCanonical(str,&jb->root,VARSIZE(jb));`
	`4009`	`+JsonbToCStringCanonical(str,JsonbRoot(jb),JsonbGetSize(jb));`
`4010`	`4010`
`4011`	`4011`	`PG_RETURN_TEXT_P(cstring_to_text_with_len(str->data,str->len));`
`4012`	`4012`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ typedef enum`
`70`	`70`	`#definePG_GETARG_JSONB(x)DatumGetJsonb(PG_GETARG_DATUM(x))`
`71`	`71`	`#definePG_RETURN_JSONB(x)PG_RETURN_DATUM(JsonbGetDatum(x))`
`72`	`72`
	`73`	`+#defineJsonbRoot(jsonb)(&(jsonb)->root)`
	`74`	`+#defineJsonbGetSize(jsonb)VARSIZE(jsonb)`
	`75`	`+`
`73`	`76`	`typedefstructJsonbPairJsonbPair;`
`74`	`77`	`typedefstructJsonbValueJsonbValue;`
`75`	`78`

Comments

(0)