Add JsonbRoot(), JsonbGetSize() macros

Nikita Glukhov · Nikita Glukhov · commit 5c4d00b4a13a · 2017-05-02T21:38:28.000+03:00
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -139,7 +139,7 @@ jsonb_out(PG_FUNCTION_ARGS)
 	Jsonb	   *jb = PG_GETARG_JSONB(0);
 	char	   *out;
 
-	out = JsonbToCString(NULL, &jb->root, VARSIZE(jb));
+	out = JsonbToCString(NULL, JsonbRoot(jb), JsonbGetSize(jb));
 
 	PG_RETURN_CSTRING(out);
 }
@@ -157,7 +157,7 @@ jsonb_send(PG_FUNCTION_ARGS)
 	StringInfo	jtext = makeStringInfo();
 	int			version = 1;
 
-	(void) JsonbToCString(jtext, &jb->root, VARSIZE(jb));
+	(void) JsonbToCString(jtext, JsonbRoot(jb), JsonbGetSize(jb));
 
 	pq_begintypsend(&buf);
 	pq_sendint(&buf, version, 1);
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1426,7 +1426,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 		{
 			PG_RETURN_TEXT_P(cstring_to_text(JsonbToCString(NULL,
 															container,
-															VARSIZE(jb))));
+															JsonbGetSize(jb))));
 		}
 		else
 		{
@@ -1523,8 +1523,8 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 	if (as_text)
 	{
 		PG_RETURN_TEXT_P(cstring_to_text(JsonbToCString(NULL,
-														&res->root,
-														VARSIZE(res))));
+														JsonbRoot(res),
+														JsonbGetSize(res))));
 	}
 	else
 	{
@@ -3995,7 +3995,7 @@ jsonb_pretty(PG_FUNCTION_ARGS)
 	Jsonb	   *jb = PG_GETARG_JSONB(0);
 	StringInfo	str = makeStringInfo();
 
-	JsonbToCStringIndent(str, &jb->root, VARSIZE(jb));
+	JsonbToCStringIndent(str, JsonbRoot(jb), JsonbGetSize(jb));
 
 	PG_RETURN_TEXT_P(cstring_to_text_with_len(str->data, str->len));
 }
@@ -4006,7 +4006,7 @@ jsonb_canonical(PG_FUNCTION_ARGS)
 	Jsonb	   *jb = PG_GETARG_JSONB(0);
 	StringInfo	str = makeStringInfo();
 
-	JsonbToCStringCanonical(str, &jb->root, VARSIZE(jb));
+	JsonbToCStringCanonical(str, JsonbRoot(jb), JsonbGetSize(jb));
 
 	PG_RETURN_TEXT_P(cstring_to_text_with_len(str->data, str->len));
 }
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -70,6 +70,9 @@ typedef enum
 #define PG_GETARG_JSONB(x)	DatumGetJsonb(PG_GETARG_DATUM(x))
 #define PG_RETURN_JSONB(x)	PG_RETURN_DATUM(JsonbGetDatum(x))
 
+#define JsonbRoot(jsonb)	(&(jsonb)->root)
+#define JsonbGetSize(jsonb)	VARSIZE(jsonb)
+
 typedef struct JsonbPair JsonbPair;
 typedef struct JsonbValue JsonbValue;
 

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`	`StringInfo str = 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`	`StringInfo str = 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`	`}`