add ALL quantifier for *, % and * path elements

postgrespro · Mar 3, 2015 · 8493798 · 8493798
1 parent 7d55ad0
commit 8493798
Show file tree

Hide file tree

Showing 8 changed files with 328 additions and 30 deletions.
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -1238,6 +1238,163 @@ select 'a = /* noindex */ 5'::jsquery;
  "a" = 5
 (1 row)
 
+--ALL
+select 'a.*: = 4';
+ ?column? 
+----------
+ a.*: = 4
+(1 row)
+
+select '%: = 4';
+ ?column? 
+----------
+ %: = 4
+(1 row)
+
+select '#:.i = 4';
+ ?column? 
+----------
+ #:.i = 4
+(1 row)
+
+select '[]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '[2,3,4]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '[2,3,5]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '[2,3,5]' @@ '# ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '[2,3,"x"]' @@ '#: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":2,"b":3,"c":4}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":2,"b":3,"c":5}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":2,"b":3,"c":5}' @@ '% ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":2,"b":3,"c":"x"}' @@ '%: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":2,"b":3,"c":4}' @@ '*: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":2,"b":3,"c":5}' @@ '*: ($ > 1 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":2,"b":3,"c":4}' @@ '*: ($ is object OR ($> 1 and $ < 5))'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":2,"b":3,"c":5}' @@ '*: ($ is object OR ($> 1 and $ < 5))'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"b":{"ba":3, "bb":4}}' @@ '*: ($ is object OR ($ > 1 and $ < 5))'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"b":{"ba":3, "bb":5}}' @@ '*: ($ is object OR ($> 1 and $ < 5))'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":{"ba":3, "bb":4}}' @@ '*: ($ is object OR ($ > 0 and $ < 5))'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":{"ba":3, "bb":5}}' @@ '*: ($ is object OR ($> 0 and $ < 5))'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":{"ba":3, "bb":5}}' @@ '* ($ > 0 and $ < 5)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":{"ba":3, "bb":5}}' @@ '*: ($ is object OR $ is numeric)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":[5,6]}' @@ '*: ($ is object OR $ is numeric)'::jsquery;
+ ?column? 
+----------
+ f
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":[5,6]}' @@ '*: ($ is object OR $ is array OR $ is numeric)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
+select '{"a":{"aa":1, "ab":2}, "b":[5,6, {"c":8}]}' @@ '*: ($ is object OR $ is array OR $ is numeric)'::jsquery;
+ ?column? 
+----------
+ t
+(1 row)
+
 --extract entries for index scan
 SELECT gin_debug_query_path_value('NOT NOT NOT x(y(NOT (a=1) and NOT (b=2)) OR NOT NOT (c=3)) and z = 5');
  gin_debug_query_path_value 

diff --git a/jsquery.h b/jsquery.h
@@ -30,11 +30,11 @@ typedef struct
 #define PG_RETURN_JSQUERY(p)	PG_RETURN_POINTER(p)
 
 typedef enum JsQueryItemType {
-		jqiNull = jbvNull, 
-		jqiString = jbvString, 
-		jqiNumeric = jbvNumeric, 
-		jqiBool = jbvBool, 
-		jqiArray = jbvArray, 
+		jqiNull = jbvNull,
+		jqiString = jbvString,
+		jqiNumeric = jbvNumeric,
+		jqiBool = jbvBool,
+		jqiArray = jbvArray,
 		jqiAnd,
 		jqiOr,
 		jqiNot,
@@ -49,6 +49,9 @@ typedef enum JsQueryItemType {
 		jqiAny,
 		jqiAnyArray,
 		jqiAnyKey,
+		jqiAll,
+		jqiAllArray,
+		jqiAllKey,
 		jqiKey,
 		jqiCurrent,
 		jqiIn,
@@ -60,7 +63,7 @@ typedef enum JsQueryItemType {
  * JsQueryItemType should not use two high bits
  */
 typedef enum JsQueryHint {
-		jsqIndexDefault = 0x00, 
+		jsqIndexDefault = 0x00,
 		jsqForceIndex = 0x80,
 		jsqNoIndex = 0x40
 } JsQueryHint;
@@ -70,10 +73,10 @@ typedef enum JsQueryHint {
 /*
  * Support functions to parse/construct binary value.
  * Unlike many other representation of expression the first/main
- * node is not an operation but left operand of expression. That 
+ * node is not an operation but left operand of expression. That
  * allows to implement cheep follow-path descending in jsonb
- * structure and then execute operator with right operand which 
- * is always a constant. 
+ * structure and then execute operator with right operand which
+ * is always a constant.
  */
 
 typedef struct JsQueryItem {
@@ -86,7 +89,7 @@ typedef struct JsQueryItem {
 		struct {
 			char		*data;  /* for bool, numeric and string/key */
 			int			datalen; /* filled only for string/key */
-		} value; 
+		} value;
 
 		struct {
 			int32	left;
@@ -126,7 +129,7 @@ typedef struct JsQueryParseItem JsQueryParseItem;
 
 struct JsQueryParseItem {
 	JsQueryItemType	type;
-	JsQueryHint	 	hint;	
+	JsQueryHint	 	hint;
 	JsQueryParseItem	*next; /* next in path */
 
 	union {

diff --git a/jsquery_gram.y b/jsquery_gram.y
@@ -306,6 +306,9 @@ key:
 	'*'								{ $$ = makeItemType(jqiAny); }
 	| '#'							{ $$ = makeItemType(jqiAnyArray); }
 	| '%'							{ $$ = makeItemType(jqiAnyKey); }
+	| '*' ':'						{ $$ = makeItemType(jqiAll); }
+	| '#' ':'						{ $$ = makeItemType(jqiAllArray); }
+	| '%' ':'						{ $$ = makeItemType(jqiAllKey); }
 	| '$'							{ $$ = makeItemType(jqiCurrent); }
 	| STRING_P						{ $$ = makeItemKey(&$1); }
 	| IN_P							{ $$ = makeItemKey(&$1); }

diff --git a/jsquery_io.c b/jsquery_io.c
@@ -116,6 +116,9 @@ flattenJsQueryParseItem(StringInfo buf, JsQueryParseItem *item)
 		case jqiAny:
 		case jqiAnyArray:
 		case jqiAnyKey:
+		case jqiAll:
+		case jqiAllArray:
+		case jqiAllKey:
 			break;
 		default:
 			elog(ERROR, "Unknown type: %d", item->type);
@@ -310,15 +313,15 @@ printJsQueryItem(StringInfo buf, JsQueryItem *v, bool inKey, bool printBracketes
 			printJsQueryItem(buf, &elem, false, true);
 			appendStringInfoChar(buf, ')');
 			break;
-		case jqiAny:
+		case jqiCurrent:
 			if (inKey)
 				appendStringInfoChar(buf, '.');
-			appendStringInfoChar(buf, '*');
+			appendStringInfoChar(buf, '$');
 			break;
-		case jqiCurrent:
+		case jqiAny:
 			if (inKey)
 				appendStringInfoChar(buf, '.');
-			appendStringInfoChar(buf, '$');
+			appendStringInfoChar(buf, '*');
 			break;
 		case jqiAnyArray:
 			if (inKey)
@@ -330,6 +333,24 @@ printJsQueryItem(StringInfo buf, JsQueryItem *v, bool inKey, bool printBracketes
 				appendStringInfoChar(buf, '.');
 			appendStringInfoChar(buf, '%');
 			break;
+		case jqiAll:
+			if (inKey)
+				appendStringInfoChar(buf, '.');
+			appendStringInfoChar(buf, '*');
+			appendStringInfoChar(buf, ':');
+			break;
+		case jqiAllArray:
+			if (inKey)
+				appendStringInfoChar(buf, '.');
+			appendStringInfoChar(buf, '#');
+			appendStringInfoChar(buf, ':');
+			break;
+		case jqiAllKey:
+			if (inKey)
+				appendStringInfoChar(buf, '.');
+			appendStringInfoChar(buf, '%');
+			appendStringInfoChar(buf, ':');
+			break;
 		default:
 			elog(ERROR, "Unknown JsQueryItem type: %d", v->type);
 	}