Don't generate all possible lax paths for jsonb_value_path_ops

Nikita Glukhov · Nikita Glukhov · commit d063a07bd33b · 2019-05-08T15:53:07.000+03:00
diff --git a/jsonb_gin_ops.c b/jsonb_gin_ops.c
@@ -815,6 +815,7 @@ gin_extract_jsonb_query_value_path(PG_FUNCTION_ARGS)
 			if (strategy != JsQueryMatchStrategyNumber)
 				root = extractJsonPath(PG_GETARG_JSONPATH_P(0),
 									   strategy == JsonpathExistsStrategyNumber,
+									   false,
 									   make_value_path_entry_handler,
 									   check_value_path_entry_handler,
 									   (Pointer)&e);
@@ -1287,6 +1288,7 @@ gin_extract_jsonb_query_path_value_internal(FunctionCallInfo fcinfo, bool lax)
 			if (strategy != JsQueryMatchStrategyNumber)
 				root = extractJsonPath(PG_GETARG_JSONPATH_P(0),
 									   strategy == JsonpathExistsStrategyNumber,
+									   !lax,
 									   make_path_value_entry_handler,
 									   check_path_value_entry_handler,
 									   (Pointer) &extra);
diff --git a/jsquery.h b/jsquery.h
@@ -245,7 +245,7 @@ bool isLogicalNodeType(ExtractedNodeType type);
 ExtractedNode *extractJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
 								CheckEntryHandler checkHandler, Pointer extra);
 #ifndef NO_JSONPATH
-ExtractedNode *extractJsonPath(JsonPath *jp, bool exists,
+ExtractedNode *extractJsonPath(JsonPath *jp, bool exists, bool arrayPathItems,
 							   MakeEntryHandler makeHandler,
 							   CheckEntryHandler checkHandler, Pointer extra);
 #endif
diff --git a/jsquery_extract.c b/jsquery_extract.c
@@ -1346,12 +1346,13 @@ extractJsQuery(JsQuery *jq, MakeEntryHandler makeHandler,
  * Turn jsonpath into tree of entries using user-provided handler.
  */
 ExtractedNode *
-extractJsonPath(JsonPath *jp, bool exists, MakeEntryHandler makeHandler,
+extractJsonPath(JsonPath *jp, bool exists, bool arrayPathItems,
+				MakeEntryHandler makeHandler,
 				CheckEntryHandler checkHandler, Pointer extra)
 {
 	ExtractedNode  *root;
 	JsonPathItem	jsp;
-	bool			lax = (jp->header & JSONPATH_LAX) != 0;
+	bool			lax = (jp->header & JSONPATH_LAX) != 0 && arrayPathItems;
 
 	jspInit(&jsp, jp);
 	root = exists
