Fix json value wrapping in JsonFindKeyInObject()

Author: Nikita Glukhov

src/backend/utils/adt/json_generic.c

@@ -150,6 +150,22 @@ JsonValueUnwrap(const JsonValue *val, JsonValue *valbuf)
 	return val;
 }
 
+JsonValue *
+JsonValueWrapInBinary(const JsonValue *val, JsonValue *bin)
+{
+	JsonContainer *jc = JsonValueToContainer(val);
+
+	if (!bin)
+		bin = (JsonValue *) palloc(sizeof(JsonValue));
+
+	bin->type = jbvBinary;
+	bin->val.binary.data = jc;
+	bin->val.binary.len = jc->len;
+	bin->val.binary.uniquified = JsonValueIsUniquified(val);
+
+	return bin;
+}
+
 static inline JsonValue *
 jsonFindKeyInObjectInternal(JsonContainer *obj, const char *key, int len,
 							bool last)
@@ -577,18 +593,7 @@ jsonvFindKeyInObject(JsonContainer *objc, const char *key, int len)
 		return NULL;
 
 	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;
+	*jv = *res;
 
 	return jv;
 }

src/backend/utils/adt/jsonb_util.c

@@ -1313,13 +1313,17 @@ JsonbDeepContains(JsonContainer *cval, JsonContainer *ccont)
 		while ((rcont = JsonIteratorNext(&icont, &vcont, false)) == WJB_KEY)
 		{
 			/* First, find value by key in lhs object ... */
+			JsonbValue	lhsValBuf;
 			JsonbValue *lhsVal = JsonFindKeyInObject(cval,
 													 vcont.val.string.val,
 													 vcont.val.string.len);
 
 			if (!lhsVal)
 				return false;
 
+			if (lhsVal->type == jbvObject || lhsVal->type == jbvArray)
+				lhsVal = JsonValueWrapInBinary(lhsVal, &lhsValBuf);
+
 			/*
 			 * ...at this stage it is apparent that there is at least a key
 			 * match for this rhs pair.

src/backend/utils/adt/jsonfuncs.c

@@ -1651,9 +1651,10 @@ jsonb_get_element(Jsonb *jb, Datum *path, int npath, bool *isnull, bool as_text)
 		}
 		else
 		{
-			Assert(IsAJsonbScalar(jbvp));
-			have_object = false;
-			have_array = false;
+			have_object = jbvp->type == jbvObject;
+			have_array = jbvp->type == jbvArray;
+			if (have_object || have_array)
+				container = JsonValueToContainer(jbvp);
 		}
 	}
 
@@ -1805,6 +1806,8 @@ push_path(JsonbParseState **st, int level, Datum *path_elems,
 static text *
 JsonbValueAsText(JsonbValue *v)
 {
+	JsonbValue	vbuf;
+
 	switch (v->type)
 	{
 		case jbvNull:
@@ -1829,6 +1832,11 @@ JsonbValueAsText(JsonbValue *v)
 				return cstring_to_text(DatumGetCString(cstr));
 			}
 
+		case jbvObject:
+		case jbvArray:
+			v = JsonValueWrapInBinary(v, &vbuf);
+			/* fall through */
+
 		case jbvBinary:
 			{
 				StringInfoData jtext;
@@ -2984,6 +2992,10 @@ JsValueToJsObject(JsValue *jsv, JsObject *jso)
 		{
 			jso->val.jsonb_cont = jbv->val.binary.data;
 		}
+		else if (jbv->type == jbvObject)
+		{
+			jso->val.jsonb_cont = JsonValueToContainer(jbv);
+		}
 		else
 		{
 			bool		is_scalar;
@@ -3138,6 +3150,8 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 		else if (jbv->type == jbvNumeric)
 			str = DatumGetCString(DirectFunctionCall1(numeric_out,
 													  PointerGetDatum(jbv->val.numeric)));
+		else if (jbv->type == jbvObject || jbv->type == jbvArray)
+			str = JsonbToCString(NULL, JsonValueToContainer(jbv), 0);
 		else if (jbv->type == jbvBinary)
 			str = JsonbToCString(NULL, jbv->val.binary.data,
 								 jbv->val.binary.len);

src/include/utils/json_generic.h

@@ -361,6 +361,7 @@ extern JsonValue *JsonValueUnpackBinary(const JsonValue *jbv);
 extern JsonContainer *JsonValueToContainer(const JsonValue *val);
 extern JsonValue *JsonValueCopy(JsonValue *res, const JsonValue *val);
 extern const JsonValue *JsonValueUnwrap(const JsonValue *val, JsonValue *buf);
+extern JsonValue *JsonValueWrapInBinary(const JsonValue *val, JsonValue *bin);
 extern JsonContainer *JsonCopyFlat(JsonContainer *flatContainer);
 extern JsonValue *JsonExtractScalar(JsonContainer *jc, JsonValue *scalar);