Fix '#' queries on empty arrays

Nikita Glukhov · Nikita Glukhov · commit 15087814bdff · 2019-04-15T17:15:50.000+03:00
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -2682,7 +2682,7 @@ select count(*) from test_jsquery where v @@ '$'::jsquery;
 select count(*) from test_jsquery where v @@ 'similar_product_ids.#'::jsquery;
  count 
 -------
-  1001
+   950
 (1 row)
 
 select count(*) from test_jsquery where v @@ '$ . ? (review_votes > 10) . review_rating < 7'::jsquery;
@@ -2960,7 +2960,7 @@ select count(*) from test_jsquery where v @@ '$'::jsquery;
 select count(*) from test_jsquery where v @@ 'similar_product_ids.#'::jsquery;
  count 
 -------
-  1001
+   950
 (1 row)
 
 select count(*) from test_jsquery where v @@ '$ . ? (review_votes > 10) . review_rating < 7'::jsquery;
diff --git a/jsquery_op.c b/jsquery_op.c
@@ -604,7 +604,9 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb, JsQueryItem *jsqLeftArg,
 
 				if (hasNext == false)
 				{
-					res = true;
+					if (jsq->type == jqiAllArray ||
+						JsonContainerSize(jb->val.binary.data) > 0)
+						res = true;
 
 					while(ra && (r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)
 						if (r == WJB_ELEM)

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,9 @@ recursiveExecute(JsQueryItem jsq, JsonbValue jb, JsQueryItem *jsqLeftArg,`
`604`	`604`
`605`	`605`	`if (hasNext == false)`
`606`	`606`	`{`
`607`		`- res = true;`
	`607`	`+ if (jsq->type == jqiAllArray \|\|`
	`608`	`+ JsonContainerSize(jb->val.binary.data) > 0)`
	`609`	`+ res = true;`
`608`	`610`
`609`	`611`	`while(ra && (r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)`
`610`	`612`	`if (r == WJB_ELEM)`