Disallow 'NOT #:' and 'NOT %:' transformation

Nikita Glukhov · Nikita Glukhov · commit 2539974ce52e · 2019-04-15T17:15:29.000+03:00
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -2161,7 +2161,7 @@ SELECT gin_debug_query_path_value('#:(NOT x=1) AND %:(NOT y=1) AND *:(NOT z=1)')
 SELECT gin_debug_query_path_value('NOT #:(NOT x=1) AND NOT %:(NOT y=1) AND NOT *:(NOT z=1)');
  gin_debug_query_path_value 
 ----------------------------
- #.x = 1 , entry 0         +
+ NULL                      +
  
 (1 row)
 
@@ -2370,10 +2370,7 @@ SELECT gin_debug_query_value_path('#:(NOT x=1) AND %:(NOT y=1) AND *:(NOT z=1)')
 SELECT gin_debug_query_value_path('NOT #:(NOT x=1) AND NOT %:(NOT y=1) AND NOT *:(NOT z=1)');
  gin_debug_query_value_path 
 ----------------------------
- AND                       +
-   #.x = 1 , entry 0       +
-   %.y = 1 , entry 1       +
-   *.z = 1 , entry 2       +
+ *.z = 1 , entry 0         +
  
 (1 row)
 
@@ -2933,7 +2930,7 @@ select count(*) from test_jsquery where v @@ 'similar_product_ids.#: is string':
 select count(*) from test_jsquery where v @@ 'NOT similar_product_ids.#: (NOT $ = "0440180295")'::jsquery;
  count 
 -------
-     7
+    42
 (1 row)
 
 select count(*) from test_jsquery where v @@ '$ > 2'::jsquery;
@@ -3256,7 +3253,7 @@ select count(*) from test_jsquery where v @@ 'similar_product_ids.#: is string':
 select count(*) from test_jsquery where v @@ 'NOT similar_product_ids.#: (NOT $ = "0440180295")'::jsquery;
  count 
 -------
-     7
+    42
 (1 row)
 
 select count(*) from test_jsquery where v @@ '$ > 2'::jsquery;
diff --git a/jsquery_extract.c b/jsquery_extract.c
@@ -114,6 +114,7 @@ recursiveExtract(JsQueryItem *jsq, bool not, bool indirect, PathItem *path)
 			return recursiveExtract(&elem, not, indirect, pathItem);
 		case jqiAny:
 		case jqiAll:
+			/* 'NOT *: (predicate)' is equivalent to '*: (NOT predicate)' */
 			if ((not && jsq->type == jqiAny) || (!not && jsq->type == jqiAll))
 				return NULL;
 			pathItem = (PathItem *)palloc(sizeof(PathItem));
@@ -130,19 +131,23 @@ recursiveExtract(JsQueryItem *jsq, bool not, bool indirect, PathItem *path)
 			if (!jsqGetNext(jsq, &elem))
 				return makeAnyNode(not, indirect, pathItem);
 			return recursiveExtract(&elem, not, true, pathItem);
-		case jqiAnyArray:
 		case jqiAllArray:
-			if ((not && jsq->type == jqiAnyArray) || (!not && jsq->type == jqiAllArray))
+			/* 'NOT #: (predicate)' is not equivalent to '#: (NOT predicate)' */
+			return NULL;
+		case jqiAnyArray:
+			if (not)
 				return NULL;
 			pathItem = (PathItem *)palloc(sizeof(PathItem));
 			pathItem->type = iAnyArray;
 			pathItem->parent = path;
 			if (!jsqGetNext(jsq, &elem))
 				return makeAnyNode(not, indirect, pathItem);
 			return recursiveExtract(&elem, not, true, pathItem);
-		case jqiAnyKey:
 		case jqiAllKey:
-			if ((not && jsq->type == jqiAnyKey) || (!not && jsq->type == jqiAllKey))
+			/* 'NOT %: (predicate)' is not equivalent to '%: (NOT predicate)' */
+			return NULL;
+		case jqiAnyKey:
+			if (not)
 				return NULL;
 			pathItem = (PathItem *)palloc(sizeof(PathItem));
 			pathItem->type = iAnyKey;
