Add jsonpath JsonbInitBinary()

Author: Nikita Glukhov

src/backend/utils/adt/jsonpath_exec.c

@@ -148,6 +148,16 @@ JsonValueListNext(const JsonValueList *jvl, JsonValueListIterator *it)
 	return lfirst(it->lcell);
 }
 
+static inline JsonbValue *
+JsonbInitBinary(JsonbValue *jbv, Jsonb *jb)
+{
+	jbv->type = jbvBinary;
+	jbv->val.binary.data = &jb->root;
+	jbv->val.binary.len = VARSIZE_ANY_EXHDR(jb);
+
+	return jbv;
+}
+
 /********************Execute functions for JsonPath***************************/
 
 /*
@@ -250,11 +260,7 @@ computeJsonPathVariable(JsonPathItem *variable, List *vars, JsonbValue *value)
 				if (JB_ROOT_IS_SCALAR(jb))
 					JsonbExtractScalar(&jb->root, value);
 				else
-				{
-					value->type = jbvBinary;
-					value->val.binary.data = &jb->root;
-					value->val.binary.len = VARSIZE_ANY_EXHDR(jb);
-				}
+					JsonbInitBinary(value, jb);
 			}
 			break;
 		default:
@@ -1728,8 +1734,7 @@ recursiveExecuteNoUnwrap(JsonPathExecContext *cxt, JsonPathItem *jsp,
 
 						jsonb = JsonbValueToJsonb(keyval);
 
-						obj.val.binary.data = &jsonb->root;
-						obj.val.binary.len = VARSIZE(jsonb) - VARHDRSZ;
+						JsonbInitBinary(&obj, jsonb);
 
 						res = recursiveExecuteNext(cxt, jsp, &elem, &obj, found, true);
 
@@ -1855,15 +1860,11 @@ executeJsonPath(JsonPath *path, List *vars, Jsonb *json, JsonValueList *foundJso
 	JsonPathItem	jsp;
 	JsonbValue		jbv;
 
-	jbv.type = jbvBinary;
-	jbv.val.binary.data = &json->root;
-	jbv.val.binary.len = VARSIZE_ANY_EXHDR(json);
-
 	jspInit(&jsp, path);
 
 	cxt.vars = vars;
 	cxt.lax = (path->header & JSONPATH_LAX) != 0;
-	cxt.root = &jbv;
+	cxt.root = JsonbInitBinary(&jbv, json);
 	cxt.innermostArraySize = -1;
 
 	return recursiveExecute(&cxt, &jsp, &jbv, foundJson);