Add JsonValueInitBinary()

Nikita Glukhov · Nikita Glukhov · commit 9fee61049f84 · 2017-05-02T21:38:30.000+03:00
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -2764,13 +2764,10 @@ jsontFillValue(JsonIterator **pit, JsonValue *res, bool skipNested,
 		case JSON_TOKEN_OBJECT_START:
 		case JSON_TOKEN_ARRAY_START:
 		{
+			JsonContainerData *cont = JsonContainerAlloc();
 			char   *token_start = lex->token_start;
 			int		len;
 
-			res->type = jbvBinary;
-			res->val.binary.data = JsonContainerAlloc();
-			res->val.binary.uniquified = false;
-
 			if (skipNested)
 			{
 				if (tok == JSON_TOKEN_OBJECT_START)
@@ -2783,12 +2780,14 @@ jsontFillValue(JsonIterator **pit, JsonValue *res, bool skipNested,
 			else
 				len = lex->input_length - (lex->token_start - lex->input);
 
-			jsontInitContainer((JsonContainerData *) res->val.binary.data,
+			jsontInitContainer(cont,
 								token_start, len,
 								tok == JSON_TOKEN_OBJECT_START ? jbvObject
 														 	   : jbvArray,
 							   -1);
 
+			JsonValueInitBinary(res, cont);
+
 			if (skipNested)
 				return false;
 
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -153,16 +153,10 @@ JsonValueUnwrap(const JsonValue *val, JsonValue *valbuf)
 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.uniquified = JsonValueIsUniquified(val);
-
-	return bin;
+	return JsonValueInitBinary(bin, JsonValueToContainer(val));
 }
 
 static inline JsonValue *
@@ -708,11 +702,7 @@ JsonToJsonValue(Json *json, JsonValue *jv)
 	if (!jv)
 		jv = palloc(sizeof(JsonValue));
 
-	jv->type = jbvBinary;
-	jv->val.binary.data = &json->root;
-	jv->val.binary.uniquified = json->root.ops != &jsontContainerOps;
-
-	return jv;
+	return JsonValueInitBinary(jv, &json->root);
 }
 
 #define JSON_FLATTEN_INTO_TARGET
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -136,14 +136,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
 	if (binary)
 		Assert(binary->type == jbvBinary);
 	else
-	{
-		jbv.type = jbvBinary;
-		jbv.val.binary.data = jc;
-		jbv.val.binary.len = jc->len;
-		jbv.val.binary.uniquified = JsonContainerIsUniquified(jc);
-
-		binary = &jbv;
-	}
+		binary = JsonValueInitBinary(&jbv, jc);
 
 	if (!binary->val.binary.uniquified)
 		binary = JsonValueUniquify(&uniquified, binary);
@@ -624,15 +617,14 @@ fillJsonbValue(const JsonbContainer *container, int index,
 	}
 	else
 	{
+		JsonContainerData *cont = JsonContainerAlloc();
 		Assert(JBE_ISCONTAINER(entry));
-		result->type = jbvBinary;
-		result->val.binary.data = JsonContainerAlloc();
-		jsonbInitContainer((JsonContainerData *) result->val.binary.data,
+		jsonbInitContainer(cont,
 				/* Remove alignment padding from data pointer and length */
 						   (JsonbContainer *)(base_addr + INTALIGN(offset)),
 						   getJsonbLength(container, index) -
 								(INTALIGN(offset) - offset));
-		result->val.binary.uniquified = true;
+		JsonValueInitBinary(result, cont);
 	}
 }
 
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -355,6 +355,16 @@ JsonValueInitArray(JsonValue *val, int nElems, int nElemsAllocated,
 	return val;
 }
 
+static inline JsonValue *
+JsonValueInitBinary(JsonValue *val, JsonContainer *cont)
+{
+	val->type = jbvBinary;
+	val->val.binary.data = cont;
+	val->val.binary.uniquified = JsonContainerIsUniquified(cont);
+
+	return val;
+}
+
 extern Json *JsonValueToJson(JsonValue *val);
 extern JsonValue *JsonToJsonValue(Json *json, JsonValue *jv);
 extern JsonValue *JsonValueUnpackBinary(const JsonValue *jbv);
