Add JsonValueInitBinary()

Author: Nikita Glukhov

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 *
@@ -716,11 +710,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);
 }
 
 #ifdef JSON_FLATTEN_INTO_JSONEXT

src/backend/utils/adt/jsonb_util.c

@@ -136,13 +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.uniquified = JsonContainerIsUniquified(jc);
-
-		binary = &jbv;
-	}
+		binary = JsonValueInitBinary(&jbv, jc);
 
 	if (!binary->val.binary.uniquified)
 		binary = JsonValueUniquify(&uniquified, binary);
@@ -654,15 +648,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);
 	}
 }
 

src/backend/utils/adt/jsonfuncs.c

@@ -3538,9 +3538,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 		jsv.val.jsonb = &jbv;
 
 		/* fill binary jsonb value pointing to jb */
-		jbv.type = jbvBinary;
-		jbv.val.binary.data = &jb->root;
-		jbv.val.binary.uniquified = true;
+		JsonValueInitBinary(&jbv, JsonRoot(jb));
 	}
 
 	rettuple = populate_composite(&cache->c.io.composite, cache->argtype,

src/backend/utils/adt/jsonpath_exec.c

@@ -247,7 +247,6 @@ static void JsonValueListInitIterator(const JsonValueList *jvl,
 static JsonbValue *JsonValueListNext(const JsonValueList *jvl,
 									 JsonValueListIterator *it);
 static int	JsonbType(JsonbValue *jb);
-static JsonbValue *JsonbInitBinary(JsonbValue *jbv, Jsonb *jb);
 static int	JsonbType(JsonbValue *jb);
 static JsonbValue *getScalar(JsonbValue *scalar, enum jbvType type);
 static JsonbValue *wrapItemsInArray(const JsonValueList *items);
@@ -646,7 +645,7 @@ executeJsonPath(JsonPath *path, Jsonb *vars, Jsonb *json, bool throwErrors,
 	jspInit(&jsp, path);
 
 	if (!JsonbExtractScalar(&json->root, &jbv))
-		JsonbInitBinary(&jbv, json);
+		JsonValueInitBinary(&jbv, JsonRoot(json));
 
 	if (vars && !JsonContainerIsObject(&vars->root))
 	{
@@ -2119,7 +2118,7 @@ executeKeyValueMethod(JsonPathExecContext *cxt, JsonPathItem *jsp,
 
 		jsonb = JsonbValueToJsonb(keyval);
 
-		JsonbInitBinary(&obj, jsonb);
+		JsonValueInitBinary(&obj, JsonRoot(jsonb));
 
 		baseObject = setBaseObject(cxt, &obj, cxt->lastGeneratedObjectId++);
 
@@ -2238,7 +2237,7 @@ getJsonPathVariable(JsonPathExecContext *cxt, JsonPathItem *variable,
 						pnstrdup(varName, varNameLength))));
 	}
 
-	JsonbInitBinary(&tmp, vars);
+	JsonValueInitBinary(&tmp, JsonRoot(vars));
 	setBaseObject(cxt, &tmp, 1);
 }
 
@@ -2617,18 +2616,6 @@ JsonValueListNext(const JsonValueList *jvl, JsonValueListIterator *it)
 	return result;
 }
 
-/*
- * Initialize a binary JsonbValue with the given jsonb container.
- */
-static JsonbValue *
-JsonbInitBinary(JsonbValue *jbv, Jsonb *jb)
-{
-	jbv->type = jbvBinary;
-	jbv->val.binary.data = &jb->root;
-
-	return jbv;
-}
-
 /*
  * Returns jbv* type of JsonbValue. Note, it never returns jbvBinary as is.
  */

src/common/jsonapi.c

@@ -1329,13 +1329,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)
@@ -1348,12 +1345,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;
 

src/include/utils/json_generic.h

@@ -369,6 +369,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);