Merge with jsquery 0.36.

Author: akorotkov

expected/jsquery.out

@@ -354,7 +354,7 @@ select 'a in (0,1,2)'::jsquery;
  "a" IN (0, 1, 2)
 (1 row)
 
-select 'a in (0,null, "null", xxx, "zzz", 2)'::jsquery;
+select 'a IN (0,null, "null", xxx, "zzz", 2)'::jsquery;
                   jsquery                  
 -------------------------------------------
  "a" IN (0, null, "null", "xxx", "zzz", 2)
@@ -786,3 +786,33 @@ select '[1,2,3]'::jsonb @@ '#($ = 2)';
  t
 (1 row)
 
+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%.b=3';
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ 'a.%=3';
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%.%="hey"';
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%="hey"';
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a": {"b": 3, "c": "hey"}, "x": [5,6]}'::jsonb @@ '%=[5,6]';
+ ?column? 
+----------
+ t
+(1 row)
+

jsonb_gin_ops.c

@@ -179,7 +179,7 @@ get_query_path_bloom(PathItem *pathItem, bool *lossy)
 			val = get_bloom_value(hash);
 			res |= val;
 		}
-		else if (pathItem->type == iAny)
+		else if (pathItem->type == iAny || pathItem->type == iAnyKey)
 		{
 			*lossy = true;
 		}
@@ -783,7 +783,7 @@ get_query_path_hash(PathItem *pathItem, uint32 *hash)
 	}
 	else
 	{
-		if (pathItem->type == iAny)
+		if (pathItem->type == iAny || pathItem->type == iAnyKey)
 		{
 			return false;
 		}

jsquery.h

@@ -49,9 +49,10 @@ struct JsQueryItem {
 		jqiGreaterOrEqual = '}',
 		jqiContains = '@',
 		jqiContained = '^',
-		jqiOverlap = '%',
+		jqiOverlap = 'O',
 		jqiAny = '*',
 		jqiAnyArray = '#',
+		jqiAnyKey = '%',
 		jqiKey = 'K',
 		jqiCurrent = '$',
 		jqiIn = 'I'
@@ -108,7 +109,8 @@ typedef enum
 {
 	iAny = 1,
 	iAnyArray,
-	iKey
+	iKey,
+	iAnyKey
 } PathItemType;
 
 typedef struct PathItem PathItem;

jsquery_constr.c

@@ -118,6 +118,7 @@ copyJsQuery(StringInfo buf, char *jqBase, int32 jqPos)
 		case jqiAny:
 		case jqiCurrent:
 		case jqiAnyArray:
+		case jqiAnyKey:
 			break;
 		default:
 			elog(ERROR, "Unknown JsQueryItem type: %d", type);

jsquery_extract.c

@@ -109,6 +109,12 @@ recursiveExtract(char *jqBase, int32 jqPos,	bool indirect, PathItem *path)
 			pathItem->type = iAnyArray;
 			pathItem->parent = path;
 			return recursiveExtract(jqBase, nextPos, true, pathItem);
+		case jqiAnyKey:
+			Assert(nextPos != 0);
+			pathItem = (PathItem *)palloc(sizeof(PathItem));
+			pathItem->type = iAnyKey;
+			pathItem->parent = path;
+			return recursiveExtract(jqBase, nextPos, true, pathItem);
 		case jqiCurrent:
 			return recursiveExtract(jqBase, nextPos, indirect, path);
 		case jqiEqual: