Pass toaster id to encode method

Nikita Glukhov · Nikita Glukhov · commit 14d48214f69d · 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
@@ -166,7 +166,9 @@ JsonbValueToOrigJsonbDatum(JsonValue *val, Json *orig_json)
 	if (val->type != jbvBinary &&
 		JsonRoot(orig_json)->ops->encode)
 	{
-		void	   *res = JsonRoot(orig_json)->ops->encode(val, &jsonbContainerOps);
+		void	   *res =
+			JsonRoot(orig_json)->ops->encode(val, &jsonbContainerOps,
+											 JsonRoot(orig_json)->toasterid);
 
 		if (res)
 			return PointerGetDatum(res);
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -126,7 +126,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
 		void	   *res;
 
 		JsonValueInitBinary(&bin, jc);
-		res = jc->ops->encode(&bin, ops);
+		res = jc->ops->encode(&bin, ops, jc->toasterid);
 
 		if (res)
 			return res;
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -64,7 +64,7 @@ struct JsonContainerOps
 								int estimated_len);
 	JsonContainer  *(*copy)(JsonContainer *jc);
 	void			(*free)(JsonContainer *jc);
-	void		   *(*encode)(JsonValue *jc, JsonContainerOps *ops);
+	void		   *(*encode)(JsonValue *jc, JsonContainerOps *ops, Oid toasterid);
 };
 
 typedef struct CompressedObject
