Extract JsonValueFromCString()

Nikita Glukhov · Nikita Glukhov · commit 44dc26b5d3a2 · 2020-11-24T18:49:51.000+03:00
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -251,15 +251,8 @@ jsonb_typeof(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(cstring_to_text(result));
 }
 
-/*
- * jsonb_from_cstring
- *
- * Turns json string into a jsonb Datum.
- *
- * Uses the json parser (with hooks) to construct a jsonb.
- */
-static inline Datum
-jsonb_from_cstring(char *json, int len)
+static JsonbValue *
+JsonValueFromCString(char *json, int len)
 {
 	JsonLexContext *lex;
 	JsonbInState state;
@@ -281,9 +274,21 @@ jsonb_from_cstring(char *json, int len)
 	pg_parse_json_or_ereport(lex, &sem);
 
 	/* after parsing, the item member has the composed jsonb structure */
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(state.res));
+	return state.res;
 }
 
+/*
+ * jsonb_from_cstring
+ *
+ * Turns json string into a jsonb Datum.
+ *
+ * Uses the json parser (with hooks) to construct a jsonb.
+ */
+static inline Datum
+jsonb_from_cstring(char *json, int len)
+{
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(JsonValueFromCString(json, len)));
+}
 
 static void
 jsonb_in_object_start(void *pstate)
