Add JsonValueInitBinary()

Nikita Glukhov · Nikita Glukhov · commit 5d43d5c1bd09 · 2022-07-27T00:46:13.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -65,10 +65,7 @@ JsonToJsonValue(Json *json, JsonValue *jv)
 	if (!jv)
 		jv = palloc(sizeof(JsonValue));
 
-	jv->type = jbvBinary;
-	jv->val.binary.data = &json->root;
-
-	return jv;
+	return JsonValueInitBinary(jv, &json->root);
 }
 
 static void
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -135,12 +135,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
 	if (binary)
 		Assert(binary->type == jbvBinary);
 	else
-	{
-		jbv.type = jbvBinary;
-		jbv.val.binary.data = jc;
-
-		binary = &jbv;
-	}
+		binary = JsonValueInitBinary(&jbv, jc);
 
 	return convertToJsonb(binary, encoder);
 }
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -3475,8 +3475,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;
+		JsonValueInitBinary(&jbv, JsonRoot(jb));
 	}
 
 	rettuple = populate_composite(&cache->c.io.composite, cache->argtype,
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
@@ -313,7 +313,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);
@@ -625,7 +624,7 @@ executeJsonPath(JsonPath *path, void *vars, JsonPathVarCallback getVar,
 	jspInit(&jsp, path);
 
 	if (!JsonbExtractScalar(&json->root, &jbv))
-		JsonbInitBinary(&jbv, json);
+		JsonValueInitBinary(&jbv, JsonRoot(json));
 
 	cxt.vars = vars;
 	cxt.getVar = getVar;
@@ -2093,7 +2092,7 @@ executeKeyValueMethod(JsonPathExecContext *cxt, JsonPathItem *jsp,
 
 		jsonb = JsonbValueToJsonb(keyval);
 
-		JsonbInitBinary(&obj, jsonb);
+		JsonValueInitBinary(&obj, JsonRoot(jsonb));
 
 		baseObject = setBaseObject(cxt, &obj, cxt->lastGeneratedObjectId++);
 
@@ -2233,7 +2232,7 @@ getJsonPathVariableFromJsonb(void *varsJsonb, char *varName, int varNameLength,
 	*value = *v;
 	pfree(v);
 
-	JsonbInitBinary(baseObject, vars);
+	JsonValueInitBinary(baseObject, JsonRoot(vars));
 	return 1;
 }
 
@@ -2615,18 +2614,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.
  */
@@ -3115,7 +3102,7 @@ JsonItemFromDatum(Datum val, Oid typid, int32 typmod, JsonbValue *res)
 					Assert(res);
 				}
 				else
-					JsonbInitBinary(jbv, jb);
+					JsonValueInitBinary(jbv, JsonRoot(jb));
 				break;
 			}
 		case JSONOID:
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -231,6 +231,15 @@ JsonIteratorFree(JsonIterator *it)
 		it = JsonIteratorFreeAndGetParent(it);
 }
 
+static inline JsonValue *
+JsonValueInitBinary(JsonValue *val, JsonContainer *cont)
+{
+	val->type = jbvBinary;
+	val->val.binary.data = cont;
+
+	return val;
+}
+
 extern Json *JsonValueToJson(JsonValue *val);
 extern JsonValue *JsonToJsonValue(Json *json, JsonValue *jv);
 extern JsonValue *JsonValueUnpackBinary(const JsonValue *jbv);

Original file line number	Diff line number	Diff line change
`@@ -3475,8 +3475,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,`
`3475`	`3475`	`jsv.val.jsonb = &jbv;`
`3476`	`3476`
`3477`	`3477`	`/* fill binary jsonb value pointing to jb */`
`3478`		`- jbv.type = jbvBinary;`
`3479`		`- jbv.val.binary.data = &jb->root;`
	`3478`	`+ JsonValueInitBinary(&jbv, JsonRoot(jb));`
`3480`	`3479`	`}`
`3481`	`3480`
`3482`	`3481`	`rettuple = populate_composite(&cache->c.io.composite, cache->argtype,`