Add jsonpath @? support

Nikita Glukhov · Nikita Glukhov · commit 40e6d81a2514 · 2019-04-18T19:50:35.000+03:00
diff --git a/Makefile b/Makefile
@@ -30,6 +30,8 @@ ifdef USE_ASSERT_CHECKING
 override CFLAGS += -DUSE_ASSERT_CHECKING
 endif
 
+override CPPFLAGS += $(CPPFLAGS) -I$(srcdir)/include
+
 jsquery_gram.o: jsquery_scan.c
 
 jsquery_gram.c: BISONFLAGS += -d
diff --git a/include/utils/jsonpath.h b/include/utils/jsonpath.h
@@ -0,0 +1 @@
+#define NO_JSONPATH 1
diff --git a/jsonb_gin_ops.c b/jsonb_gin_ops.c
@@ -21,6 +21,7 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/jsonb.h"
+#include "utils/jsonpath.h"
 
 #include "jsquery.h"
 
@@ -59,6 +60,7 @@ typedef struct
 #define BLOOM_BITS 2
 #define JsonbNestedContainsStrategyNumber	13
 #define JsQueryMatchStrategyNumber			14
+#define JsonpathExistsStrategyNumber		15
 
 typedef struct
 {
@@ -584,7 +586,8 @@ gin_compare_partial_jsonb_value_path(PG_FUNCTION_ARGS)
 	StrategyNumber strategy = PG_GETARG_UINT16(2);
 	int32		result;
 
-	if (strategy == JsQueryMatchStrategyNumber)
+	if (strategy == JsQueryMatchStrategyNumber ||
+		strategy ==	JsonpathExistsStrategyNumber)
 	{
 		KeyExtra *extra = (KeyExtra *)PG_GETARG_POINTER(3);
 		ExtractedNode *node = extra->node;
@@ -780,7 +783,6 @@ gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS)
 	int			i, n;
 	uint32	   *bloom;
 	Entries		e = {0};
-	JsQuery	   *jq;
 	ExtractedNode *root;
 
 	switch(strategy)
@@ -805,9 +807,20 @@ gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS)
 			break;
 
 		case JsQueryMatchStrategyNumber:
-			jq = PG_GETARG_JSQUERY(0);
-			root = extractJsQuery(jq, make_value_path_entry_handler,
-									check_value_path_entry_handler, (Pointer)&e);
+#ifndef NO_JSONPATH
+		case JsonpathExistsStrategyNumber:
+			if (strategy == JsonpathExistsStrategyNumber)
+				root = extractJsonPath(PG_GETARG_JSONPATH_P(0),
+									   make_value_path_entry_handler,
+									   check_value_path_entry_handler,
+									   (Pointer)&e);
+			else
+#endif
+				root = extractJsQuery(PG_GETARG_JSQUERY(0),
+									  make_value_path_entry_handler,
+									  check_value_path_entry_handler,
+									  (Pointer)&e);
+
 			if (root)
 			{
 				*nentries = e.count;
@@ -864,6 +877,7 @@ gin_consistent_jsonb_value_path(PG_FUNCTION_ARGS)
 			break;
 
 		case JsQueryMatchStrategyNumber:
+		case JsonpathExistsStrategyNumber:
 			if (nkeys == 0)
 				res = true;
 			else
@@ -925,6 +939,7 @@ gin_triconsistent_jsonb_value_path(PG_FUNCTION_ARGS)
 			break;
 
 		case JsQueryMatchStrategyNumber:
+		case JsonpathExistsStrategyNumber:
 			if (nkeys == 0)
 				res = GIN_MAYBE;
 			else
@@ -1047,7 +1062,8 @@ gin_compare_partial_jsonb_path_value(PG_FUNCTION_ARGS)
 	{
 		result = (key->hash > partial_key->hash) ? 1 : -1;
 	}
-	else if (strategy == JsQueryMatchStrategyNumber)
+	else if (strategy == JsQueryMatchStrategyNumber ||
+			 strategy == JsonpathExistsStrategyNumber)
 	{
 		KeyExtra *extra = (KeyExtra *)PG_GETARG_POINTER(3);
 		ExtractedNode *node = extra->node;
@@ -1245,7 +1261,6 @@ gin_extract_jsonb_query_path_value_internal(FunctionCallInfo fcinfo, bool lax)
 	int			i;
 	Entries		e = {0};
 	PathValueExtra extra;
-	JsQuery	   *jq;
 	ExtractedNode *root;
 
 	extra.entries = &e;
@@ -1259,9 +1274,20 @@ gin_extract_jsonb_query_path_value_internal(FunctionCallInfo fcinfo, bool lax)
 			break;
 
 		case JsQueryMatchStrategyNumber:
-			jq = PG_GETARG_JSQUERY(0);
-			root = extractJsQuery(jq, make_path_value_entry_handler,
-										check_path_value_entry_handler, (Pointer) &extra);
+#ifndef NO_JSONPATH
+		case JsonpathExistsStrategyNumber:
+			if (strategy == JsonpathExistsStrategyNumber)
+				root = extractJsonPath(PG_GETARG_JSONPATH_P(0),
+									   make_path_value_entry_handler,
+									   check_path_value_entry_handler,
+									   (Pointer) &extra);
+			else
+#endif
+				root = extractJsQuery(PG_GETARG_JSQUERY(0),
+									  make_path_value_entry_handler,
+									  check_path_value_entry_handler,
+									  (Pointer) &extra);
+
 			if (root)
 			{
 				*nentries = e.count;
@@ -1329,6 +1355,7 @@ gin_consistent_jsonb_path_value(PG_FUNCTION_ARGS)
 			break;
 
 		case JsQueryMatchStrategyNumber:
+		case JsonpathExistsStrategyNumber:
 			if (nkeys == 0)
 				res = true;
 			else
@@ -1390,6 +1417,7 @@ gin_triconsistent_jsonb_path_value(PG_FUNCTION_ARGS)
 			break;
 
 		case JsQueryMatchStrategyNumber:
+		case JsonpathExistsStrategyNumber:
 			if (nkeys == 0)
 				res = GIN_MAYBE;
 			else
diff --git a/jsquery--1.1.sql b/jsquery--1.1.sql
@@ -329,3 +329,27 @@ CREATE OR REPLACE FUNCTION gin_debug_query_laxpath_value(jsquery)
 	RETURNS text
 	AS 'MODULE_PATHNAME'
 	LANGUAGE C STRICT IMMUTABLE;
+
+-- add support for operator @? (jsonb, jsonpath) if type jsonpath exists in catalog
+DO LANGUAGE plpgsql
+$$
+BEGIN
+	PERFORM
+	FROM
+		pg_type t,
+		pg_namespace ns
+	WHERE
+		t.typname = 'jsonpath' AND
+		t.typnamespace = ns.oid AND
+		ns.nspname = 'pg_catalog';
+
+	IF FOUND THEN
+		ALTER OPERATOR FAMILY jsonb_path_value_ops USING gin
+			ADD OPERATOR 15 @? (jsonb, jsonpath);
+		ALTER OPERATOR FAMILY jsonb_laxpath_value_ops USING gin
+			ADD OPERATOR 15 @? (jsonb, jsonpath);
+		ALTER OPERATOR FAMILY jsonb_value_path_ops USING gin
+			ADD OPERATOR 15 @? (jsonb, jsonpath);
+	END IF;
+END
+$$;
diff --git a/jsquery.h b/jsquery.h
@@ -19,6 +19,7 @@
 #include "fmgr.h"
 #include "utils/numeric.h"
 #include "utils/jsonb.h"
+#include "utils/jsonpath.h"
 
 typedef struct
 {
@@ -243,6 +244,10 @@ bool isLogicalNodeType(ExtractedNodeType type);
 
 ExtractedNode *extractJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
 								CheckEntryHandler checkHandler, Pointer extra);
+#ifndef NO_JSONPATH
+ExtractedNode *extractJsonPath(JsonPath *jp, MakeEntryHandler makeHandler,
+							   CheckEntryHandler checkHandler, Pointer extra);
+#endif
 char *debugJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
 								CheckEntryHandler checkHandler, Pointer extra);
 bool queryNeedRecheck(ExtractedNode *node);
diff --git a/jsquery_extract.c b/jsquery_extract.c
