postgrespro
diff --git a/‎jsonb_gin_ops.c
Copy file name to clipboardExpand all lines: jsonb_gin_ops.c
+4Lines changed: 4 additions & 0 deletions b/‎jsonb_gin_ops.c
Copy file name to clipboardExpand all lines: jsonb_gin_ops.c
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎jsquery_extract.c
Copy file name to clipboardExpand all lines: jsquery_extract.c
+11-2Lines changed: 11 additions & 2 deletions b/‎jsquery_extract.c
Copy file name to clipboardExpand all lines: jsquery_extract.c
+11-2Lines changed: 11 additions & 2 deletions
@@ -343,6 +343,8 @@ make_bloom_entry_handler(ExtractedNode *node, Pointer extra)
 
 	if (!node->bounds.inequality)
 	{
+		if (node->bounds.exact->type == jqiAny)
+			return -1;
 		key = make_gin_query_key(node->bounds.exact, lossy ? 0 : hash);
 	}
 	else
@@ -824,6 +826,8 @@ make_hash_entry_handler(ExtractedNode *node, Pointer extra)
 
 	if (!node->bounds.inequality)
 	{
+		if (node->bounds.exact->type == jqiAny)
+			return -1;
 		key = make_gin_query_key(node->bounds.exact, hash);
 	}
 	else
 
@@ -109,6 +109,8 @@ recursiveExtract(char *jqBase, int32 jqPos,	bool indirect, PathItem *path)
 			pathItem->type = iAnyArray;
 			pathItem->parent = path;
 			return recursiveExtract(jqBase, nextPos, true, pathItem);
+		case jqiCurrent:
+			return recursiveExtract(jqBase, nextPos, indirect, path);
 		case jqiEqual:
 			read_int32(arg, jqBase, jqPos);
 			result = (ExtractedNode *)palloc(sizeof(ExtractedNode));
@@ -407,8 +409,15 @@ processGroup(ExtractedNode *node, int start, int end)
 
 		if (!child->bounds.inequality)
 		{
-			exact = child->bounds.exact;
-			break;
+			if (child->bounds.exact->type == jqiAny)
+			{
+				continue;
+			}
+			else
+			{
+				exact = child->bounds.exact;
+				break;
+			}
 		}
 
 		if (child->bounds.leftBound)
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,8 @@ make_bloom_entry_handler(ExtractedNode *node, Pointer extra)`
`343`	`343`
`344`	`344`	`if (!node->bounds.inequality)`
`345`	`345`	`{`
	`346`	`+ if (node->bounds.exact->type == jqiAny)`
	`347`	`+ return -1;`
`346`	`348`	`key = make_gin_query_key(node->bounds.exact, lossy ? 0 : hash);`
`347`	`349`	`}`
`348`	`350`	`else`
`@@ -824,6 +826,8 @@ make_hash_entry_handler(ExtractedNode *node, Pointer extra)`
`824`	`826`
`825`	`827`	`if (!node->bounds.inequality)`
`826`	`828`	`{`
	`829`	`+ if (node->bounds.exact->type == jqiAny)`
	`830`	`+ return -1;`
`827`	`831`	`key = make_gin_query_key(node->bounds.exact, hash);`
`828`	`832`	`}`
`829`	`833`	`else`