Add buf parameter to JsonToCString()

Nikita Glukhov · Nikita Glukhov · commit e70f4620a98a · 2022-07-27T00:46:13.000+03:00
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -111,7 +111,7 @@ jsonb_out(PG_FUNCTION_ARGS)
 	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	char	   *out;
 
-	out = JsonToCString(JsonbRoot(jb));
+	out = JsonToCString(JsonbRoot(jb), NULL);
 
 	PG_RETURN_CSTRING(out);
 }
@@ -129,7 +129,7 @@ jsonb_send(PG_FUNCTION_ARGS)
 	StringInfo	jtext = makeStringInfo();
 	int			version = 1;
 
-	(void) JsonbToCString(jtext, JsonbRoot(jb), JsonbGetSize(jb));
+	(void) JsonToCString(JsonbRoot(jb), jtext);
 
 	pq_begintypsend(&buf);
 	pq_sendint8(&buf, version);
@@ -522,8 +522,7 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool
 				{
 					first = false;
 					if (v.type == jbvBinary)
-						JsonbToCString(out, v.val.binary.data,
-									   v.val.binary.data->len);
+						JsonToCString(v.val.binary.data, out);
 					else
 						jsonb_put_escaped_value(out, &v);
 				}
@@ -548,8 +547,7 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool
 					add_indent(out, use_indent, level);
 
 				if (v.type == jbvBinary)
-					JsonbToCString(out, v.val.binary.data,
-								   v.val.binary.data->len);
+					JsonToCString(v.val.binary.data, out);
 				else
 					jsonb_put_escaped_value(out, &v);
 				break;
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1501,9 +1501,8 @@ jsonb_get_element(Jsonb *jb, Datum *path, int npath, bool *isnull, bool as_text)
 	{
 		if (as_text)
 		{
-			return PointerGetDatum(cstring_to_text(JsonbToCString(NULL,
-																  container,
-																  JsonbGetSize(jb))));
+			return PointerGetDatum(cstring_to_text(JsonToCStringExt(NULL, container,
+																	JsonbGetSize(jb))));
 		}
 		else
 		{
@@ -1770,8 +1769,7 @@ JsonbValueAsText(JsonbValue *v)
 				StringInfoData jtext;
 
 				initStringInfo(&jtext);
-				(void) JsonbToCString(&jtext, v->val.binary.data,
-									  v->val.binary.data->len);
+				(void) JsonToCString(v->val.binary.data, &jtext);
 
 				return cstring_to_text_with_len(jtext.data, jtext.len);
 			}
@@ -2921,7 +2919,7 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 			 */
 			Jsonb	   *jsonb = JsonbValueToJsonb(jbv);
 
-			str = JsonbToCString(NULL, &jsonb->root, -1);
+			str = JsonToCString(&jsonb->root, NULL);
 		}
 		else if (jbv->type == jbvString)	/* quotes are stripped */
 			str = pnstrdup(jbv->val.string.val, jbv->val.string.len);
@@ -2931,8 +2929,7 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 			str = DatumGetCString(DirectFunctionCall1(numeric_out,
 													  PointerGetDatum(jbv->val.numeric)));
 		else if (jbv->type == jbvBinary)
-			str = JsonbToCString(NULL, jbv->val.binary.data,
-								 jbv->val.binary.data->len);
+			str = JsonToCString(jbv->val.binary.data, NULL);
 		else
 			elog(ERROR, "unrecognized jsonb type: %d", (int) jbv->type);
 	}
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -258,7 +258,7 @@ extern char *JsonbToCStringRaw(StringInfo out, JsonContainer *in,
 extern char *JsonbToCStringIndent(StringInfo out, JsonContainer *in,
 					 int estimated_len);
 
-#define JsonToCString(jc)	JsonToCStringExt(NULL, jc, (jc)->len)
+#define JsonToCString(jc, buf)	((jc)->ops->toString(buf, jc, (jc)->len))
 
 #define JsonToCStringExt(out, in, estimated_len) \
 	((*(in)->ops->toString)(out, in, estimated_len))

Original file line number	Diff line number	Diff line change
`@@ -1501,9 +1501,8 @@ jsonb_get_element(Jsonb jb, Datum path, int npath, bool *isnull, bool as_text)`
`1501`	`1501`	`{`
`1502`	`1502`	`if (as_text)`
`1503`	`1503`	`{`
`1504`		`- return PointerGetDatum(cstring_to_text(JsonbToCString(NULL,`
`1505`		`- container,`
`1506`		`- JsonbGetSize(jb))));`
	`1504`	`+ return PointerGetDatum(cstring_to_text(JsonToCStringExt(NULL, container,`
	`1505`	`+ JsonbGetSize(jb))));`
`1507`	`1506`	`}`
`1508`	`1507`	`else`
`1509`	`1508`	`{`
`@@ -1770,8 +1769,7 @@ JsonbValueAsText(JsonbValue *v)`
`1770`	`1769`	`StringInfoData jtext;`
`1771`	`1770`
`1772`	`1771`	`initStringInfo(&jtext);`
`1773`		`- (void) JsonbToCString(&jtext, v->val.binary.data,`
`1774`		`- v->val.binary.data->len);`
	`1772`	`+ (void) JsonToCString(v->val.binary.data, &jtext);`
`1775`	`1773`
`1776`	`1774`	`return cstring_to_text_with_len(jtext.data, jtext.len);`
`1777`	`1775`	`}`
`@@ -2921,7 +2919,7 @@ populate_scalar(ScalarIOData io, Oid typid, int32 typmod, JsValue jsv)`
`2921`	`2919`	`*/`
`2922`	`2920`	`Jsonb *jsonb = JsonbValueToJsonb(jbv);`
`2923`	`2921`
`2924`		`- str = JsonbToCString(NULL, &jsonb->root, -1);`
	`2922`	`+ str = JsonToCString(&jsonb->root, NULL);`
`2925`	`2923`	`}`
`2926`	`2924`	`else if (jbv->type == jbvString) /* quotes are stripped */`
`2927`	`2925`	`str = pnstrdup(jbv->val.string.val, jbv->val.string.len);`
`@@ -2931,8 +2929,7 @@ populate_scalar(ScalarIOData io, Oid typid, int32 typmod, JsValue jsv)`
`2931`	`2929`	`str = DatumGetCString(DirectFunctionCall1(numeric_out,`
`2932`	`2930`	`PointerGetDatum(jbv->val.numeric)));`
`2933`	`2931`	`else if (jbv->type == jbvBinary)`
`2934`		`- str = JsonbToCString(NULL, jbv->val.binary.data,`
`2935`		`- jbv->val.binary.data->len);`
	`2932`	`+ str = JsonToCString(jbv->val.binary.data, NULL);`
`2936`	`2933`	`else`
`2937`	`2934`	`elog(ERROR, "unrecognized jsonb type: %d", (int) jbv->type);`
`2938`	`2935`	`}`