Use JsonValueWrapInBinary()

Author: Nikita Glukhov

src/backend/utils/adt/json_generic.c

@@ -399,9 +399,7 @@ jsonvArrayIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 		else if (res->type != jbvBinary)
 		{
 			Assert(res->type == jbvArray || res->type == jbvObject);
-			res->val.binary.data = JsonValueToContainer(val);
-			res->val.binary.uniquified = JsonValueIsUniquified(val);
-			res->type = jbvBinary;
+			JsonValueWrapInBinary(val, res);
 		}
 	}
 
@@ -451,10 +449,7 @@ jsonvObjectIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 			else if (res->type != jbvBinary)
 			{
 				Assert(res->type == jbvArray || res->type == jbvObject);
-				res->val.binary.data = JsonValueToContainer(&pair->value);
-				res->val.binary.uniquified =
-											JsonValueIsUniquified(&pair->value);
-				res->type = jbvBinary;
+				JsonValueWrapInBinary(&pair->value, res);
 			}
 		}