Try to preserve formatting for text jsons

Author: Nikita Glukhov

src/backend/utils/adt/json_generic.c

@@ -556,7 +556,7 @@ jsonvContainerOps =
 	jsonvFindValueInArray,
 	jsonvGetArrayElement,
 	jsonvGetArraySize,
-	JsonbToCString,
+	JsonbToCStringRaw,
 };
 
 JsonValue *

src/backend/utils/adt/jsonb.c

@@ -442,12 +442,12 @@ jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype)
 			break;
 	}
 
-	_state->res = pushScalarJsonbValue(&_state->parseState, &v, false);
+	_state->res = pushScalarJsonbValue(&_state->parseState, &v, false, true);
 }
 
 #ifndef JSON_C
 /*
- * JsonbToCString
+ * JsonbToCStringRaw
  *	   Converts jsonb value to a C-string.
  *
  * If 'out' argument is non-null, the resulting C-string is stored inside the
@@ -458,7 +458,7 @@ jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype)
  * if they are converting it to a text* object.
  */
 char *
-JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
+JsonbToCStringRaw(StringInfo out, JsonbContainer *in, int estimated_len)
 {
 	return JsonbToCStringWorker(out, in, estimated_len, JsonFormatNormal);
 }
@@ -495,6 +495,7 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len,
 	/* If we are indenting, don't add a space after a comma */
 	int			ispaces = format == JsonFormatNormal ? 2 : 1;
 	bool		indent = format == JsonFormatIndented;
+	bool		skipNested = format == JsonFormatNormal;
 
 	/*
 	 * Don't indent the very first item. This gets set to the indent flag at
@@ -512,7 +513,7 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len,
 	it = JsonbIteratorInit(in);
 
 	while (redo_switch ||
-		   ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE))
+		   ((type = JsonbIteratorNext(&it, &v, skipNested)) != WJB_DONE))
 	{
 		redo_switch = false;
 		switch (type)
@@ -553,11 +554,14 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len,
 				jsonb_put_escaped_value(out, &v);
 				appendBinaryStringInfo(out, ": ", 2);
 
-				type = JsonbIteratorNext(&it, &v, false);
+				type = JsonbIteratorNext(&it, &v, skipNested);
 				if (type == WJB_VALUE)
 				{
 					first = false;
-					jsonb_put_escaped_value(out, &v);
+					if (v.type == jbvBinary)
+						JsonbToCString(out, v.val.binary.data, v.val.binary.len);
+					else
+						jsonb_put_escaped_value(out, &v);
 				}
 				else
 				{
@@ -578,7 +582,11 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len,
 
 				if (!raw_scalar)
 					add_indent(out, use_indent, level);
-				jsonb_put_escaped_value(out, &v);
+
+				if (v.type == jbvBinary)
+					JsonbToCString(out, v.val.binary.data, v.val.binary.len);
+				else
+					jsonb_put_escaped_value(out, &v);
 				break;
 			case WJB_END_ARRAY:
 				level--;
@@ -903,6 +911,15 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 					{
 						JsonbIteratorToken type;
 
+						JsonToJsonValue(jsonb, &jb);
+
+						if (result->parseState)
+						{
+							pushScalarJsonbValue(&result->parseState, &jb,
+												 false, false);
+							return;
+						}
+
 						while ((type = JsonbIteratorNext(&it, &jb, false))
 							   != WJB_DONE)
 						{
@@ -934,7 +951,8 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 		return;
 	}
 
-	result->res = pushScalarJsonbValue(&result->parseState, &jb, key_scalar);
+	result->res = pushScalarJsonbValue(&result->parseState, &jb, key_scalar,
+									   true);
 }
 
 /*

src/backend/utils/adt/jsonb_util.c

@@ -101,7 +101,8 @@ static void appendElement(JsonbParseState *pstate, const JsonbValue *scalarVal);
 static int	lengthCompareJsonbPair(const void *a, const void *b, void *arg);
 static void uniqueifyJsonbObject(JsonbValue *object);
 static JsonbValue *pushSingleScalarJsonbValue(JsonbParseState **pstate,
-											  const JsonbValue *jbval);
+											  const JsonbValue *jbval,
+											  bool unpackBinary);
 static void jsonbInitContainer(JsonContainerData *jc, JsonbContainer *jbc, int len);
 
 JsonValue *
@@ -163,7 +164,7 @@ JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,
 	if (IsAJsonbScalar(val))
 	{
 		JsonbParseState *pstate = NULL;
-		val = pushSingleScalarJsonbValue(&pstate, val);
+		val = pushSingleScalarJsonbValue(&pstate, val, true);
 	}
 	else
 	{
@@ -695,16 +696,16 @@ JsonbParseStateClone(JsonbParseState *state)
  * are unpacked before being added to the result.
  */
 JsonbValue *
-pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq,
-			   const JsonbValue *jbval)
+pushJsonbValueExt(JsonbParseState **pstate, JsonbIteratorToken seq,
+			   const JsonbValue *jbval, bool unpackBinary)
 {
 	JsonIterator *it;
 	JsonbValue *res = NULL;
 	JsonbValue	v;
 	JsonbIteratorToken tok;
 
 	if (!jbval || (seq != WJB_ELEM && seq != WJB_VALUE) ||
-		jbval->type != jbvBinary)
+		jbval->type != jbvBinary || !unpackBinary)
 	{
 		/* drop through */
 		return pushJsonbValueScalar(pstate, seq, jbval);
@@ -772,7 +773,7 @@ pushJsonbValueScalar(JsonbParseState **pstate, JsonbIteratorToken seq,
 			appendValue(*pstate, scalarVal);
 			break;
 		case WJB_ELEM:
-			Assert(IsAJsonbScalar(scalarVal));
+			/* Assert(IsAJsonbScalar(scalarVal)); */
 			appendElement(*pstate, scalarVal);
 			break;
 		case WJB_END_OBJECT:
@@ -811,7 +812,8 @@ pushJsonbValueScalar(JsonbParseState **pstate, JsonbIteratorToken seq,
 }
 
 static JsonbValue *
-pushSingleScalarJsonbValue(JsonbParseState **pstate, const JsonbValue *jbval)
+pushSingleScalarJsonbValue(JsonbParseState **pstate, const JsonbValue *jbval,
+						   bool unpackBinary)
 {
 	/* single root scalar */
 	JsonbValue	va;
@@ -821,20 +823,21 @@ pushSingleScalarJsonbValue(JsonbParseState **pstate, const JsonbValue *jbval)
 	va.val.array.nElems = 1;
 
 	pushJsonbValue(pstate, WJB_BEGIN_ARRAY, &va);
-	pushJsonbValue(pstate, WJB_ELEM, jbval);
+	pushJsonbValueExt(pstate, WJB_ELEM, jbval, unpackBinary);
 	return pushJsonbValue(pstate, WJB_END_ARRAY, NULL);
 }
 
 static JsonbValue *
 pushNestedScalarJsonbValue(JsonbParseState **pstate, const JsonbValue *jbval,
-						   bool isKey)
+						   bool isKey, bool unpackBinary)
 {
 	switch ((*pstate)->contVal.type)
 	{
 		case jbvArray:
-			return pushJsonbValue(pstate, WJB_ELEM, jbval);
+			return pushJsonbValueExt(pstate, WJB_ELEM, jbval, unpackBinary);
 		case jbvObject:
-			return pushJsonbValue(pstate, isKey ? WJB_KEY : WJB_VALUE, jbval);
+			return pushJsonbValueExt(pstate, isKey ? WJB_KEY : WJB_VALUE, jbval,
+									 unpackBinary);
 		default:
 			elog(ERROR, "unexpected parent of nested structure");
 			return NULL;
@@ -843,11 +846,11 @@ pushNestedScalarJsonbValue(JsonbParseState **pstate, const JsonbValue *jbval,
 
 JsonbValue *
 pushScalarJsonbValue(JsonbParseState **pstate, const JsonbValue *jbval,
-					 bool isKey)
+					 bool isKey, bool unpackBinary)
 {
 	return *pstate == NULL
-				? pushSingleScalarJsonbValue(pstate, jbval)
-				: pushNestedScalarJsonbValue(pstate, jbval, isKey);
+			? pushSingleScalarJsonbValue(pstate, jbval, unpackBinary)
+			: pushNestedScalarJsonbValue(pstate, jbval, isKey, unpackBinary);
 
 }
 
@@ -2155,5 +2158,5 @@ jsonbContainerOps =
 	jsonbFindValueInArray,
 	jsonbGetArrayElement,
 	NULL,
-	JsonbToCString,
+	JsonbToCStringRaw,
 };

src/backend/utils/adt/jsonfuncs.c

@@ -4278,7 +4278,7 @@ addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb)
 		Assert(v.type == jbvArray);
 		(void) JsonbIteratorNext(&it, &v, false);	/* fetch scalar value */
 
-		(void) pushScalarJsonbValue(jbps, &v, false);
+		(void) pushScalarJsonbValue(jbps, &v, false, true);
 	}
 	else
 	{

src/include/utils/json_generic.h

@@ -298,7 +298,7 @@ extern JsonValue *JsonContainerExtractKeys(JsonContainer *jsc);
 extern JsonValue *JsonValueFromCString(char *json, int len);
 
 
-extern char *JsonbToCString(StringInfo out, JsonContainer *in,
+extern char *JsonbToCStringRaw(StringInfo out, JsonContainer *in,
 			   int estimated_len);
 extern char *JsonbToCStringIndent(StringInfo out, JsonContainer *in,
 					 int estimated_len);
@@ -310,6 +310,9 @@ extern char *JsonbToCStringCanonical(StringInfo out, JsonContainer *in,
 #define JsonToCStringExt(out, in, estimated_len) \
 	((*(in)->ops->toString)(out, in, estimated_len))
 
+#define JsonbToCString(out, in, estimated_len) \
+		JsonToCStringExt(out, in, estimated_len)
+
 extern JsonValue   *jsonFindKeyInObject(JsonContainer *obj, const char *key, int len);
 extern JsonValue   *jsonFindLastKeyInObject(JsonContainer *obj, const char *key, int len);
 extern JsonValue   *jsonFindValueInArray(JsonContainer *array, const JsonValue *elem);

src/include/utils/jsonb.h

@@ -354,14 +354,17 @@ extern JsonbValue *findJsonbValueFromContainer(const JsonbContainer *sheader,
 extern JsonbValue *getKeyJsonValueFromContainer(const struct JsonContainerData *container,
 												const char *keyVal, int keyLen,
 												JsonbValue *res);
-extern JsonbValue *pushJsonbValue(JsonbParseState **pstate,
-								  JsonbIteratorToken seq, 
-								  const JsonbValue *jbval);
+extern JsonbValue *pushJsonbValueExt(JsonbParseState **pstate,
+									 JsonbIteratorToken seq,
+									 const JsonbValue *jbVal,
+									 bool unpackBinary);
+#define pushJsonbValue(pstate, seq, jv) pushJsonbValueExt(pstate, seq, jv, true)
 extern JsonbValue *pushJsonbValueScalar(JsonbParseState **pstate,
 										JsonbIteratorToken seq,
 										const JsonbValue *scalarVal);
 extern JsonbValue *pushScalarJsonbValue(JsonbParseState **pstate,
-										const JsonbValue *jbval, bool isKey);
+										const JsonbValue *jbval, bool isKey,
+										bool unpackBinary);
 extern JsonbParseState *JsonbParseStateClone(JsonbParseState *state);
 typedef struct JsonIteratorData JsonIterator;
 extern JsonbIteratorToken JsonbIteratorNext(JsonIterator **it, JsonbValue *val,