Add non-uniquified json values for improving compatibility with text jsons

Author: Nikita Glukhov

src/backend/tsearch/wparser.c

@@ -402,7 +402,7 @@ ts_headline_jsonb_byid_opt(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("text search parser does not support headline creation")));
 
-	out = transform_jsonb_string_values(jb, state, action);
+	out = transform_jsonb_string_values(jb, state, action, false);
 
 	/* flatten result to jsonb before jb freeing */
 	res = JsonFlattenToJsonbDatum(out);
@@ -491,7 +491,7 @@ ts_headline_json_byid_opt(PG_FUNCTION_ARGS)
 	PG_FREE_IF_COPY(json, 1);
 #else
 	{
-		Jsonb	   *jsonb = transform_jsonb_string_values(json, state, action);
+		Jsonb	   *jsonb = transform_jsonb_string_values(json, state, action, true);
 		char	   *str = JsonToCString(&jsonb->root);
 
 		out = cstring_to_text(str);

src/backend/utils/adt/json_generic.c

@@ -13,13 +13,13 @@
 #include "utils/builtins.h"
 #include "utils/json_generic.h"
 #include "utils/memutils.h"
+#include "utils/builtins.h"
 
-static JsonContainerOps jsonvContainerOps;
+JsonContainerOps jsonvContainerOps;
 
 static Json *JsonExpand(Json *tmp, Datum value, bool freeValue,
 						JsonContainerOps *ops);
 
-
 #if 0
 static JsonValue *
 JsonValueCopy(JsonValue *val)
@@ -214,10 +214,7 @@ jsonvScalarIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 	switch (sit->next)
 	{
 		case WJB_BEGIN_ARRAY:
-			res->type = jbvArray;
-			res->val.array.rawScalar = true;
-			res->val.array.nElems = 1;
-			res->val.array.elems = NULL;
+			JsonValueInitArray(res, 1, 0, true, true);
 			sit->next = WJB_ELEM;
 			return WJB_BEGIN_ARRAY;
 
@@ -275,6 +272,7 @@ jsonvArrayIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 			Assert(res->type == jbvArray || res->type == jbvObject);
 			res->val.binary.data = JsonValueToContainer(val);
 			res->val.binary.len = 0;
+			res->val.binary.uniquified = JsonValueIsUniquified(val);
 			res->type = jbvBinary;
 		}
 	}
@@ -327,6 +325,8 @@ jsonvObjectIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 				Assert(res->type == jbvArray || res->type == jbvObject);
 				res->val.binary.data = JsonValueToContainer(&pair->value);
 				res->val.binary.len = 0;
+				res->val.binary.uniquified =
+											JsonValueIsUniquified(&pair->value);
 				res->type = jbvBinary;
 			}
 		}
@@ -420,7 +420,10 @@ static JsonValue *
 jsonvFindKeyInObject(JsonContainer *objc, const char *key, int len)
 {
 	JsonValue  *obj = (JsonValue *) objc->data;
+	JsonValue  *res;
+	JsonValue  *jv;
 	int			i;
+	bool		uniquified;
 
 	Assert(JsonContainerIsObject(objc));
 
@@ -433,32 +436,41 @@ jsonvFindKeyInObject(JsonContainer *objc, const char *key, int len)
 
 	Assert(obj->type == jbvObject);
 
+	res = NULL;
+	uniquified = obj->val.object.uniquified;
+
 	for (i = 0; i < obj->val.object.nPairs; i++)
 	{
 		JsonPair *pair = &obj->val.object.pairs[i];
 		if (!lengthCompareJsonbString(key, len,
 									  pair->key.val.string.val,
 									  pair->key.val.string.len))
 		{
-			JsonValue  *jv = palloc(sizeof(JsonValue));
+			res = &pair->value;
 
-			if (pair->value.type == jbvObject ||
-				pair->value.type == jbvArray)
-			{	/* FIXME need to wrap containers into binary JsonValue */
-				JsonContainer *jc = JsonValueToContainer(&pair->value);
+			if (uniquified)
+				break;
+		}
+	}
 
-				jv->type = jbvBinary;
-				jv->val.binary.data = jc;
-				jv->val.binary.len = jc->len;
-			}
-			else
-				*jv = pair->value;
+	if (!res)
+		return NULL;
 
-			return jv;		/* XXX palloced copy? */
-		}
+	jv = (JsonValue *) palloc(sizeof(JsonValue));	/* XXX palloced copy? */
+
+	if (res->type == jbvObject || res->type == jbvArray)
+	{	/* FIXME need to wrap containers into binary JsonValue */
+		JsonContainer *jc = JsonValueToContainer(res);
+
+		jv->type = jbvBinary;
+		jv->val.binary.data = jc;
+		jv->val.binary.len = jc->len;
+		jv->val.binary.uniquified = JsonValueIsUniquified(res);
 	}
+	else
+		*jv = *res;
 
-	return NULL;
+	return jv;
 }
 
 static JsonValue *
@@ -548,7 +560,7 @@ jsonvGetArraySize(JsonContainer *arrc)
 	}
 }
 
-static JsonContainerOps
+JsonContainerOps
 jsonvContainerOps =
 {
 	JsonContainerJsonv,
@@ -573,6 +585,7 @@ JsonToJsonValue(Json *json, JsonValue *jv)
 	jv->type = jbvBinary;
 	jv->val.binary.data = &json->root;
 	jv->val.binary.len = json->root.len;
+	jv->val.binary.uniquified = json->root.ops != &jsontContainerOps;
 
 	return jv;
 }
@@ -677,6 +690,40 @@ JsonInit(Json *json)
 	json->root.ops->init(&json->root, json->obj.value);
 }
 
+static Size
+jsonGetFlatSizeJsont(Json *json, void **context)
+{
+	Size		size;
+
+	if (json->root.ops == &jsontContainerOps)
+		size = VARHDRSZ + json->root.len;
+	else
+	{
+		char	   *str = JsonToCString(&json->root);
+		size = VARHDRSZ + strlen(str);
+		if (context)
+			*context = str;
+		else
+			pfree(str);
+	}
+
+	return size;
+}
+
+static void *
+jsonFlattenJsont(Json *json, void **context)
+{
+	if (json->root.ops == &jsontContainerOps)
+		return cstring_to_text_with_len(json->root.data, json->root.len);
+	else
+	{
+		char   *str = context ? (char *) *context : JsonToCString(JsonRoot(json));
+		text   *text = cstring_to_text(str);
+		pfree(str);
+		return text;
+	}
+}
+
 static Size
 jsonGetFlatSize2(Json *json, void **context)
 {
@@ -685,20 +732,8 @@ jsonGetFlatSize2(Json *json, void **context)
 #ifdef JSON_FLATTEN_INTO_TARGET
 	if (json->is_json)
 #endif
-#if defined(JSON_FLATTEN_INTO_TARGET) || defined(JSON_FLATTEN_INTO_JSON)
-	{
-		if (json->root.ops == &jsontContainerOps)
-			size = VARHDRSZ + json->root.len;
-		else
-		{
-			char	   *str = JsonToCString(&json->root);
-			size = VARHDRSZ + strlen(str);
-			if (context)
-				*context = str;
-			else
-				pfree(str);
-		}
-	}
+#if defined(JSON_FLATTEN_INTO_TARGET) || defined(JSON_FLATTEN_INTO_JSONT)
+		size = jsonGetFlatSizeJsont(json, context);
 #endif
 #ifdef JSON_FLATTEN_INTO_TARGET
 	else
@@ -729,18 +764,8 @@ jsonFlatten(Json *json, void **context)
 #ifdef JSON_FLATTEN_INTO_TARGET
 	if (json->is_json)
 #endif
-#if defined(JSON_FLATTEN_INTO_TARGET) || defined(JSON_FLATTEN_INTO_JSON)
-	{
-		if (json->root.ops == &jsontContainerOps)
-			return cstring_to_text_with_len(json->root.data, json->root.len);
-		else
-		{
-			char   *str = context ? (char *) *context : JsonToCString(JsonRoot(json));
-			text   *text = cstring_to_text(str);
-			pfree(str);
-			return text;
-		}
-	}
+#if defined(JSON_FLATTEN_INTO_TARGET) || defined(JSON_FLATTEN_INTO_JSONT)
+		return jsonFlattenJsont(json, context);
 #endif
 #ifdef JSON_FLATTEN_INTO_TARGET
 	else
@@ -779,9 +804,21 @@ jsonGetFlatSize(ExpandedObjectHeader *eoh, void **context)
 
 		if (json->root.ops == &jsonvContainerOps)
 		{
+			JsonValue *val = (JsonValue *) flat->data;
+
+			if (JsonValueIsUniquified(val))
+			{
+				tmp.len = jsonGetFlatSize2(json, context) - VARHDRSZ;
+				tmp.ops = flatContainerOps;
+			}
+			else
+			{
+				tmp.len = jsonGetFlatSizeJsont(json, context) - VARHDRSZ;
+				tmp.ops = &jsontContainerOps;
+			}
+
 			tmp.data = NULL;
-			tmp.ops = flatContainerOps;
-			tmp.len = jsonGetFlatSize2(json, context) - VARHDRSZ;
+
 			flat = &tmp;
 		}
 
@@ -808,11 +845,21 @@ jsonFlattenInto(ExpandedObjectHeader *eoh, void *result, Size allocated_size,
 
 		if (flat->ops == &jsonvContainerOps)
 		{
-			tmpData = jsonFlatten(json, context);
+			JsonValue *val = (JsonValue *) flat->data;
+
+			if (JsonValueIsUniquified(val))
+			{
+				tmpData = jsonFlatten(json, context);
+				tmp.ops = flatContainerOps;
+			}
+			else
+			{
+				tmpData = jsonFlattenJsont(json, context);
+				tmp.ops = &jsontContainerOps;
+			}
 
-			tmp.ops = flatContainerOps;
 			tmp.data = VARDATA(tmpData);
-			tmp.len = VARSIZE_ANY_EXHDR(tmpData);
+			tmp.len = VARSIZE(tmpData) - VARHDRSZ;
 
 			flat = &tmp;
 		}