Fix json value wrapping in JsonFindKeyInObject()

Nikita Glukhov · Nikita Glukhov · commit 161c89bed016 · 2020-12-07T19:31:07.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/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;
 }
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -1250,13 +1250,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.
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1635,9 +1635,10 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, 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);
 		}
 	}
 
@@ -1663,6 +1664,8 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 static text *
 JsonbValueAsText(JsonbValue *v)
 {
+	JsonbValue	vbuf;
+
 	switch (v->type)
 	{
 		case jbvNull:
@@ -1687,6 +1690,11 @@ JsonbValueAsText(JsonbValue *v)
 				return cstring_to_text(DatumGetCString(cstr));
 			}
 
+		case jbvObject:
+		case jbvArray:
+			v = JsonValueWrapInBinary(v, &vbuf);
+			/* fall through */
+
 		case jbvBinary:
 			{
 				StringInfoData jtext;
@@ -2842,6 +2850,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;
@@ -2996,6 +3008,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);
diff --git a/src/include/utils/json_generic.h b/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);
 

Original file line number	Diff line number	Diff line change
`@@ -1635,9 +1635,10 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)`
`1635`	`1635`	`}`
`1636`	`1636`	`else`
`1637`	`1637`	`{`
`1638`		`- Assert(IsAJsonbScalar(jbvp));`
`1639`		`- have_object = false;`
`1640`		`- have_array = false;`
	`1638`	`+ have_object = jbvp->type == jbvObject;`
	`1639`	`+ have_array = jbvp->type == jbvArray;`
	`1640`	`+ if (have_object \|\| have_array)`
	`1641`	`+ container = JsonValueToContainer(jbvp);`
`1641`	`1642`	`}`
`1642`	`1643`	`}`
`1643`	`1644`
`@@ -1663,6 +1664,8 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)`
`1663`	`1664`	`static text *`
`1664`	`1665`	`JsonbValueAsText(JsonbValue *v)`
`1665`	`1666`	`{`
	`1667`	`+ JsonbValue vbuf;`
	`1668`	`+`
`1666`	`1669`	`switch (v->type)`
`1667`	`1670`	`{`
`1668`	`1671`	`case jbvNull:`
`@@ -1687,6 +1690,11 @@ JsonbValueAsText(JsonbValue *v)`
`1687`	`1690`	`return cstring_to_text(DatumGetCString(cstr));`
`1688`	`1691`	`}`
`1689`	`1692`
	`1693`	`+ case jbvObject:`
	`1694`	`+ case jbvArray:`
	`1695`	`+ v = JsonValueWrapInBinary(v, &vbuf);`
	`1696`	`+ /* fall through */`
	`1697`	`+`
`1690`	`1698`	`case jbvBinary:`
`1691`	`1699`	`{`
`1692`	`1700`	`StringInfoData jtext;`
`@@ -2842,6 +2850,10 @@ JsValueToJsObject(JsValue jsv, JsObject jso)`
`2842`	`2850`	`{`
`2843`	`2851`	`jso->val.jsonb_cont = jbv->val.binary.data;`
`2844`	`2852`	`}`
	`2853`	`+ else if (jbv->type == jbvObject)`
	`2854`	`+ {`
	`2855`	`+ jso->val.jsonb_cont = JsonValueToContainer(jbv);`
	`2856`	`+ }`
`2845`	`2857`	`else`
`2846`	`2858`	`{`
`2847`	`2859`	`bool is_scalar;`
`@@ -2996,6 +3008,8 @@ populate_scalar(ScalarIOData io, Oid typid, int32 typmod, JsValue jsv)`
`2996`	`3008`	`else if (jbv->type == jbvNumeric)`
`2997`	`3009`	`str = DatumGetCString(DirectFunctionCall1(numeric_out,`
`2998`	`3010`	`PointerGetDatum(jbv->val.numeric)));`
	`3011`	`+ else if (jbv->type == jbvObject \|\| jbv->type == jbvArray)`
	`3012`	`+ str = JsonbToCString(NULL, JsonValueToContainer(jbv), 0);`
`2999`	`3013`	`else if (jbv->type == jbvBinary)`
`3000`	`3014`	`str = JsonbToCString(NULL, jbv->val.binary.data,`
`3001`	`3015`	`jbv->val.binary.len);`