Use JsonValueWrapInBinary()

Nikita Glukhov · Nikita Glukhov · commit a4dbe4080b10 · 2017-05-02T21:38:30.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -397,9 +397,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);
 		}
 	}
 
@@ -449,10 +447,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
`@@ -397,9 +397,7 @@ jsonvArrayIteratorNext(JsonIterator *it, JsonValue res, bool skipNested)`
`397`	`397`	`else if (res->type != jbvBinary)`
`398`	`398`	`{`
`399`	`399`	`Assert(res->type == jbvArray \|\| res->type == jbvObject);`
`400`		`- res->val.binary.data = JsonValueToContainer(val);`
`401`		`- res->val.binary.uniquified = JsonValueIsUniquified(val);`
`402`		`- res->type = jbvBinary;`
	`400`	`+ JsonValueWrapInBinary(val, res);`
`403`	`401`	`}`
`404`	`402`	`}`
`405`	`403`
`@@ -449,10 +447,7 @@ jsonvObjectIteratorNext(JsonIterator *it, JsonValue res, bool skipNested)`
`449`	`447`	`else if (res->type != jbvBinary)`
`450`	`448`	`{`
`451`	`449`	`Assert(res->type == jbvArray \|\| res->type == jbvObject);`
`452`		`- res->val.binary.data = JsonValueToContainer(&pair->value);`
`453`		`- res->val.binary.uniquified =`
`454`		`- JsonValueIsUniquified(&pair->value);`
`455`		`- res->type = jbvBinary;`
	`450`	`+ JsonValueWrapInBinary(&pair->value, res);`
`456`	`451`	`}`
`457`	`452`	`}`
`458`	`453`