teach gin extract to ignore length of array

feodor · feodor · commit bf8884a77776 · 2015-03-05T17:49:29.000+03:00
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -1974,6 +1974,20 @@ SELECT gin_debug_query_value_path('NOT #:(NOT x=1) AND NOT %:(NOT y=1) AND NOT *
  
 (1 row)
 
+SELECT gin_debug_query_value_path('(@# > 0 and #: = 16)');
+ gin_debug_query_value_path 
+----------------------------
+ NULL                      +
+ 
+(1 row)
+
+SELECT gin_debug_query_value_path('*.@# ($ = 4 or $ = 2)');
+ gin_debug_query_value_path 
+----------------------------
+ NULL                      +
+ 
+(1 row)
+
 ---table and index
 select count(*) from test_jsquery where (v->>'review_helpful_votes')::int4 > 0;
  count 
diff --git a/jsquery_extract.c b/jsquery_extract.c
@@ -50,7 +50,8 @@ recursiveExtract(JsQueryItem *jsq, bool not, bool indirect, PathItem *path)
 
 	check_stack_depth();
 
-	switch(jsq->type) {
+	switch(jsq->type)
+	{
 		case jqiAnd:
 		case jqiOr:
 			type = ((jsq->type == jqiAnd) == not) ? eOr : eAnd;
@@ -240,9 +241,12 @@ recursiveExtract(JsQueryItem *jsq, bool not, bool indirect, PathItem *path)
 			result->indirect = indirect;
 			result->isType = jsqGetIsType(jsq);
 			return result;
+		case jqiLength:
+			return NULL;
 		default:
 			elog(ERROR,"Wrong state: %d", jsq->type);
 	}
+
 	return NULL;
 }
 
diff --git a/sql/jsquery.sql b/sql/jsquery.sql
@@ -371,6 +371,8 @@ SELECT gin_debug_query_value_path('x is object');
 SELECT gin_debug_query_value_path('#:(x=1) AND %:(y=1) AND *:(z=1)');
 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)');
+SELECT gin_debug_query_value_path('(@# > 0 and #: = 16)');
+SELECT gin_debug_query_value_path('*.@# ($ = 4 or $ = 2)');
 
 ---table and index
 
