Use json cache in jsonb_contains(), jsonb_object_field(), jsonb_object_field_text()

Nikita Glukhov · Nikita Glukhov · commit d4ebd635e4a5 · 2017-05-02T22:14:02.000+03:00
diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c
@@ -115,11 +115,19 @@ jsonb_contains(PG_FUNCTION_ARGS)
 {
 	Jsonb	   *val = PG_GETARG_JSONB(0);
 	Jsonb	   *tmpl = PG_GETARG_JSONB(1);
+	JsonCacheContext oldcxt;
+	bool		res;
 
 	if (JB_ROOT_IS_OBJECT(val) != JB_ROOT_IS_OBJECT(tmpl))
 		PG_RETURN_BOOL(false);
 
-	PG_RETURN_BOOL(JsonbDeepContains(JsonRoot(val), JsonRoot(tmpl)));
+	oldcxt = JsonCacheSwitchToFunc(fcinfo);
+
+	res = JsonbDeepContains(JsonRoot(val), JsonRoot(tmpl));
+
+	JsonCacheSwitchTo(oldcxt);
+
+	PG_RETURN_BOOL(res);
 }
 
 Datum
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -764,14 +764,19 @@ jsonb_object_field(PG_FUNCTION_ARGS)
 	Jsonb	   *jb = PG_GETARG_JSONB(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	JsonbValue *v;
+	JsonCacheContext oldcxt;
 
 	if (!JB_ROOT_IS_OBJECT(jb))
 		PG_RETURN_NULL();
 
+	oldcxt = JsonCacheSwitchToFunc(fcinfo);
+
 	v = findJsonbValueFromContainerLen(&jb->root, JB_FOBJECT,
 									   VARDATA_ANY(key),
 									   VARSIZE_ANY_EXHDR(key));
 
+	JsonCacheSwitchTo(oldcxt);
+
 	if (v != NULL)
 		PG_RETURN_JSONB(JsonbValueToJsonb(v));
 
@@ -803,14 +808,19 @@ jsonb_object_field_text(PG_FUNCTION_ARGS)
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	JsonbValue *v;
 	JsonbValue	vbuf;
+	JsonCacheContext oldcxt;
 
 	if (!JB_ROOT_IS_OBJECT(jb))
 		PG_RETURN_NULL();
 
+	oldcxt = JsonCacheSwitchToFunc(fcinfo);
+
 	v = findJsonbValueFromContainerLen(&jb->root, JB_FOBJECT,
 									   VARDATA_ANY(key),
 									   VARSIZE_ANY_EXHDR(key));
 
+	JsonCacheSwitchTo(oldcxt);
+
 	if (v != NULL)
 	{
 		text	   *result = NULL;
@@ -1444,13 +1454,23 @@ get_scalar(void *state, char *token, JsonTokenType tokentype)
 Datum
 jsonb_extract_path(PG_FUNCTION_ARGS)
 {
-	return get_jsonb_path_all(fcinfo, false);
+	JsonCacheContext	oldcxt = JsonCacheSwitchToFunc(fcinfo);
+	Datum				result = get_jsonb_path_all(fcinfo, false);
+
+	JsonCacheSwitchTo(oldcxt);
+
+	PG_RETURN_DATUM(result);
 }
 
 Datum
 jsonb_extract_path_text(PG_FUNCTION_ARGS)
 {
-	return get_jsonb_path_all(fcinfo, true);
+	JsonCacheContext	oldcxt = JsonCacheSwitchToFunc(fcinfo);
+	Datum				result = get_jsonb_path_all(fcinfo, true);
+
+	JsonCacheSwitchTo(oldcxt);
+
+	PG_RETURN_DATUM(result);
 }
 
 static Datum
