Use JsonValueWrapInBinary()

Nikita Glukhov · Nikita Glukhov · commit eec6be01c2d6 · 2020-11-24T18:49:54.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/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);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -399,9 +399,7 @@ jsonvArrayIteratorNext(JsonIterator *it, JsonValue res, bool skipNested)`
`399`	`399`	`else if (res->type != jbvBinary)`
`400`	`400`	`{`
`401`	`401`	`Assert(res->type == jbvArray \|\| res->type == jbvObject);`
`402`		`- res->val.binary.data = JsonValueToContainer(val);`
`403`		`- res->val.binary.uniquified = JsonValueIsUniquified(val);`
`404`		`- res->type = jbvBinary;`
	`402`	`+ JsonValueWrapInBinary(val, res);`
`405`	`403`	`}`
`406`	`404`	`}`
`407`	`405`
`@@ -451,10 +449,7 @@ jsonvObjectIteratorNext(JsonIterator *it, JsonValue res, bool skipNested)`
`451`	`449`	`else if (res->type != jbvBinary)`
`452`	`450`	`{`
`453`	`451`	`Assert(res->type == jbvArray \|\| res->type == jbvObject);`
`454`		`- res->val.binary.data = JsonValueToContainer(&pair->value);`
`455`		`- res->val.binary.uniquified =`
`456`		`- JsonValueIsUniquified(&pair->value);`
`457`		`- res->type = jbvBinary;`
	`452`	`+ JsonValueWrapInBinary(&pair->value, res);`
`458`	`453`	`}`
`459`	`454`	`}`
`460`	`455`