Add jsonpath @@ support

Nikita Glukhov · Nikita Glukhov · commit 60c0c719fccd · 2019-05-08T15:53:07.000+03:00
diff --git a/jsonb_gin_ops.c b/jsonb_gin_ops.c
@@ -61,6 +61,7 @@ typedef struct
 #define JsonbNestedContainsStrategyNumber	13
 #define JsQueryMatchStrategyNumber			14
 #define JsonpathExistsStrategyNumber		15
+#define JsonpathMatchStrategyNumber			16
 
 typedef struct
 {
@@ -587,7 +588,8 @@ gin_compare_partial_jsonb_value_path(PG_FUNCTION_ARGS)
 	int32		result;
 
 	if (strategy == JsQueryMatchStrategyNumber ||
-		strategy ==	JsonpathExistsStrategyNumber)
+		strategy ==	JsonpathExistsStrategyNumber ||
+		strategy ==	JsonpathMatchStrategyNumber)
 	{
 		KeyExtra *extra = (KeyExtra *)PG_GETARG_POINTER(3);
 		ExtractedNode *node = extra->node;
@@ -809,8 +811,10 @@ gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS)
 		case JsQueryMatchStrategyNumber:
 #ifndef NO_JSONPATH
 		case JsonpathExistsStrategyNumber:
-			if (strategy == JsonpathExistsStrategyNumber)
+		case JsonpathMatchStrategyNumber:
+			if (strategy != JsQueryMatchStrategyNumber)
 				root = extractJsonPath(PG_GETARG_JSONPATH_P(0),
+									   strategy == JsonpathExistsStrategyNumber,
 									   make_value_path_entry_handler,
 									   check_value_path_entry_handler,
 									   (Pointer)&e);
@@ -878,6 +882,7 @@ gin_consistent_jsonb_value_path(PG_FUNCTION_ARGS)
 
 		case JsQueryMatchStrategyNumber:
 		case JsonpathExistsStrategyNumber:
+		case JsonpathMatchStrategyNumber:
 			if (nkeys == 0)
 				res = true;
 			else
@@ -940,6 +945,7 @@ gin_triconsistent_jsonb_value_path(PG_FUNCTION_ARGS)
 
 		case JsQueryMatchStrategyNumber:
 		case JsonpathExistsStrategyNumber:
+		case JsonpathMatchStrategyNumber:
 			if (nkeys == 0)
 				res = GIN_MAYBE;
 			else
@@ -1063,7 +1069,8 @@ gin_compare_partial_jsonb_path_value(PG_FUNCTION_ARGS)
 		result = (key->hash > partial_key->hash) ? 1 : -1;
 	}
 	else if (strategy == JsQueryMatchStrategyNumber ||
-			 strategy == JsonpathExistsStrategyNumber)
+			 strategy == JsonpathExistsStrategyNumber ||
+			 strategy == JsonpathMatchStrategyNumber)
 	{
 		KeyExtra *extra = (KeyExtra *)PG_GETARG_POINTER(3);
 		ExtractedNode *node = extra->node;
@@ -1276,8 +1283,10 @@ gin_extract_jsonb_query_path_value_internal(FunctionCallInfo fcinfo, bool lax)
 		case JsQueryMatchStrategyNumber:
 #ifndef NO_JSONPATH
 		case JsonpathExistsStrategyNumber:
-			if (strategy == JsonpathExistsStrategyNumber)
+		case JsonpathMatchStrategyNumber:
+			if (strategy != JsQueryMatchStrategyNumber)
 				root = extractJsonPath(PG_GETARG_JSONPATH_P(0),
+									   strategy == JsonpathExistsStrategyNumber,
 									   make_path_value_entry_handler,
 									   check_path_value_entry_handler,
 									   (Pointer) &extra);
@@ -1356,6 +1365,7 @@ gin_consistent_jsonb_path_value(PG_FUNCTION_ARGS)
 
 		case JsQueryMatchStrategyNumber:
 		case JsonpathExistsStrategyNumber:
+		case JsonpathMatchStrategyNumber:
 			if (nkeys == 0)
 				res = true;
 			else
@@ -1418,6 +1428,7 @@ gin_triconsistent_jsonb_path_value(PG_FUNCTION_ARGS)
 
 		case JsQueryMatchStrategyNumber:
 		case JsonpathExistsStrategyNumber:
+		case JsonpathMatchStrategyNumber:
 			if (nkeys == 0)
 				res = GIN_MAYBE;
 			else
diff --git a/jsquery--1.1.sql b/jsquery--1.1.sql
@@ -330,7 +330,7 @@ CREATE OR REPLACE FUNCTION gin_debug_query_laxpath_value(jsquery)
 	AS 'MODULE_PATHNAME'
 	LANGUAGE C STRICT IMMUTABLE;
 
--- add support for operator @? (jsonb, jsonpath) if type jsonpath exists in catalog
+-- add support for operators @?, @@ (jsonb, jsonpath) if type jsonpath exists in catalog
 DO LANGUAGE plpgsql
 $$
 BEGIN
@@ -346,10 +346,16 @@ BEGIN
 	IF FOUND THEN
 		ALTER OPERATOR FAMILY jsonb_path_value_ops USING gin
 			ADD OPERATOR 15 @? (jsonb, jsonpath);
+		ALTER OPERATOR FAMILY jsonb_path_value_ops USING gin
+			ADD OPERATOR 16 @@ (jsonb, jsonpath);
 		ALTER OPERATOR FAMILY jsonb_laxpath_value_ops USING gin
 			ADD OPERATOR 15 @? (jsonb, jsonpath);
+		ALTER OPERATOR FAMILY jsonb_laxpath_value_ops USING gin
+			ADD OPERATOR 16 @@ (jsonb, jsonpath);
 		ALTER OPERATOR FAMILY jsonb_value_path_ops USING gin
 			ADD OPERATOR 15 @? (jsonb, jsonpath);
+		ALTER OPERATOR FAMILY jsonb_value_path_ops USING gin
+			ADD OPERATOR 16 @@ (jsonb, jsonpath);
 	END IF;
 END
 $$;
diff --git a/jsquery.h b/jsquery.h
@@ -245,7 +245,8 @@ bool isLogicalNodeType(ExtractedNodeType type);
 ExtractedNode *extractJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
 								CheckEntryHandler checkHandler, Pointer extra);
 #ifndef NO_JSONPATH
-ExtractedNode *extractJsonPath(JsonPath *jp, MakeEntryHandler makeHandler,
+ExtractedNode *extractJsonPath(JsonPath *jp, bool exists,
+							   MakeEntryHandler makeHandler,
 							   CheckEntryHandler checkHandler, Pointer extra);
 #endif
 char *debugJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
diff --git a/jsquery_extract.c b/jsquery_extract.c
@@ -1346,15 +1346,17 @@ extractJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
  * Turn jsonpath into tree of entries using user-provided handler.
  */
 ExtractedNode *
-extractJsonPath(JsonPath *jp, MakeEntryHandler makeHandler,
+extractJsonPath(JsonPath *jp, bool exists, MakeEntryHandler makeHandler,
 				CheckEntryHandler checkHandler, Pointer extra)
 {
 	ExtractedNode  *root;
 	JsonPathItem	jsp;
-	bool				lax = (jp->header & JSONPATH_LAX) != 0;
+	bool			lax = (jp->header & JSONPATH_LAX) != 0;
 
 	jspInit(&jsp, jp);
-	root = recursiveExtractJsonPathExpr(&jsp, lax, false, NULL);
+	root = exists
+		? extractJsonPathExists(&jsp, lax, NULL)
+		: recursiveExtractJsonPathExpr(&jsp, lax, false, NULL);
 	if (root)
 	{
 		flatternTree(root);
