correct work for logical expression in ~~

Author: feodor

Diff for: expected/jsquery.out

@@ -1904,6 +1904,90 @@ select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb @@ 'a.g and b.d';
  f
 (1 row)
 
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and b.d';
+ ?column? 
+----------
+ [1, 3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and b.c';
+ ?column? 
+----------
+ 
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and (b.d or b.c)';
+ ?column? 
+----------
+ [1, 3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and (b.c or b.d)';
+ ?column? 
+----------
+ [1, 3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and a.c and b.d';
+ ?column?  
+-----------
+ [1, 2, 3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ '(a.b or a.c) and b.d';
+ ?column? 
+----------
+ [1, 3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ '(a.e or a.c) and b.d';
+ ?column? 
+----------
+ [2, 3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ '(a.e or a.g) and b.d';
+ ?column? 
+----------
+ 
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b or (b.d or b.c)';
+ ?column? 
+----------
+ [1]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d or (a.b or a.c)';
+ ?column? 
+----------
+ [3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d or (a.b and a.c)';
+ ?column? 
+----------
+ [3]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.f or (a.b and a.c)';
+ ?column? 
+----------
+ [1, 2]
+(1 row)
+
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d and (a.b and a.c)';
+ ?column?  
+-----------
+ [3, 1, 2]
+(1 row)
+
+select '{"a": {"b": [6,5,4], "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d and (a.b and a.c)';
+     ?column?      
+-------------------
+ [3, [6, 5, 4], 2]
+(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 for: jsquery_op.c

@@ -51,6 +51,27 @@ appendResult(ResultAccum *ra, JsonbValue *jb)
 	pushJsonbValue(&ra->jbArrayState, WJB_ELEM, jb);
 }
 
+static void
+concatResult(ResultAccum *ra, JsonbParseState *a, JsonbParseState *b)
+{
+	Jsonb			*value;
+	JsonbIterator	*it;
+	int32			r;
+	JsonbValue		v;
+
+	Assert(a);
+	Assert(b);
+
+	ra->jbArrayState = a;
+
+	value = JsonbValueToJsonb(pushJsonbValue(&b, WJB_END_ARRAY, NULL));
+	it = JsonbIteratorInit(&value->root);
+
+	while((r = JsonbIteratorNext(&it, &v, true)) != WJB_DONE)
+		if (r == WJB_ELEM)
+			pushJsonbValue(&ra->jbArrayState, WJB_ELEM, &v);
+}
+
 static int
 compareNumeric(Numeric a, Numeric b)
 {
@@ -435,14 +456,37 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb, JsQueryItem *jsqLeftArg,
 
 	switch(jsq->type) {
 		case jqiAnd:
-			jsqGetLeftArg(jsq, &elem);
-			res = recursiveExecute(&elem, jb, jsqLeftArg, ra);
-			if (res == true)
 			{
-				jsqGetRightArg(jsq, &elem);
+				JsonbParseState *saveJbArrayState = NULL;
+
+				jsqGetLeftArg(jsq, &elem);
+				if (ra && ra->missAppend == false)
+				{
+					saveJbArrayState = ra->jbArrayState;
+					ra->jbArrayState = NULL;
+				}
+
 				res = recursiveExecute(&elem, jb, jsqLeftArg, ra);
+				if (res == true)
+				{
+					jsqGetRightArg(jsq, &elem);
+					res = recursiveExecute(&elem, jb, jsqLeftArg, ra);
+				}
+
+				if (ra && ra->missAppend == false)
+				{
+					if (res == true)
+					{
+						if (saveJbArrayState != NULL)
+							/* append args lists to current */
+							concatResult(ra, saveJbArrayState, ra->jbArrayState);
+					}
+					else
+						ra->jbArrayState = saveJbArrayState;
+				}
+
+				break;
 			}
-			break;
 		case jqiOr:
 			jsqGetLeftArg(jsq, &elem);
 			res = recursiveExecute(&elem, jb, jsqLeftArg, ra);
@@ -453,9 +497,18 @@ recursiveExecute(JsQueryItem *jsq, JsonbValue *jb, JsQueryItem *jsqLeftArg,
 			}
 			break;
 		case jqiNot:
-			jsqGetArg(jsq, &elem);
-			res = !recursiveExecute(&elem, jb, jsqLeftArg, ra);
-			break;
+			{
+				bool saveMissAppend = (ra) ? ra->missAppend : true;
+
+				jsqGetArg(jsq, &elem);
+				if (ra)
+					ra->missAppend = true;
+				res = !recursiveExecute(&elem, jb, jsqLeftArg, ra);
+				if (ra)
+					ra->missAppend = saveMissAppend;
+
+				break;
+			}
 		case jqiKey:
 			if (JsonbType(jb) == jbvObject) {
 				JsonbValue	*v, key;

Diff for: sql/jsquery.sql

@@ -378,6 +378,21 @@ select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb @@ 'a.c and b.d';
 select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb @@ 'a.c and b.b';
 select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb @@ 'a.g and b.d';
 
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and b.d';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and b.c';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and (b.d or b.c)';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and (b.c or b.d)';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b and a.c and b.d';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ '(a.b or a.c) and b.d';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ '(a.e or a.c) and b.d';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ '(a.e or a.g) and b.d';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'a.b or (b.d or b.c)';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d or (a.b or a.c)';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d or (a.b and a.c)';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.f or (a.b and a.c)';
+select '{"a": {"b": 1, "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d and (a.b and a.c)';
+select '{"a": {"b": [6,5,4], "c": 2}, "b": {"d":3}}'::jsonb ~~ 'b.d and (a.b and a.c)';
+
 --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');