#81 Nested `$or` and `$and` implemented

diff --git a/tcejdb/ejdb.c b/tcejdb/ejdb.c
index f7b748b..3672cd8 100644 (file)
--- a/tcejdb/ejdb.c
+++ b/tcejdb/ejdb.c
@@ -2093,6 +2093,7 @@ static bool _qry_$and_$or_match(EJCOLL *jcoll, EJQ *ejq, const void *pkbuf, int
     }
     void *bsbuf = TCXSTRPTR(ejq->bsbuf);
     int bsbufsz = TCXSTRSIZE(ejq->bsbuf);
+
     if (!bsbuf || bsbufsz <= 0) {
         tcxstrclear(ejq->colbuf);
         tcxstrclear(ejq->bsbuf);
@@ -2110,7 +2111,7 @@ static bool _qry_$and_$or_match(EJCOLL *jcoll, EJQ *ejq, const void *pkbuf, int
     } else if (isor) {
         return _qryormatch2(jcoll, ejq, bsbuf, bsbufsz);
     } else {
-        return false;
+        return true;
     }
 }
 
@@ -3032,7 +3033,8 @@ static TCLIST* _qryexecute(EJCOLL *jcoll, const EJQ *q, uint32_t *outcount, int
         tcxstrprintf(log, "MAIN IDX: '%s'\n", midx ? midx->name : "NONE");
         tcxstrprintf(log, "ORDER FIELDS: %d\n", ofsz);
         tcxstrprintf(log, "ACTIVE CONDITIONS: %d\n", anum);
-        tcxstrprintf(log, "$OR QUERIES: %d\n", ((ejq->orqlist) ? TCLISTNUM(ejq->orqlist) : 0));
+        tcxstrprintf(log, "ROOT $OR QUERIES: %d\n", ((ejq->orqlist) ? TCLISTNUM(ejq->orqlist) : 0));
+        tcxstrprintf(log, "ROOT $AND QUERIES: %d\n", ((ejq->andqlist) ? TCLISTNUM(ejq->andqlist) : 0));
         tcxstrprintf(log, "FETCH ALL: %s\n", all ? "YES" : "NO");
     }
     if (max < UINT_MAX - skip) {

diff --git a/tcejdb/testejdb/t2.c b/tcejdb/testejdb/t2.c
index 2f229d3..ecac42a 100644 (file)
--- a/tcejdb/testejdb/t2.c
+++ b/tcejdb/testejdb/t2.c
@@ -4402,9 +4402,107 @@ void testMetaInfo() {
 void testTicket81() {
     EJCOLL *coll = ejdbcreatecoll(jb, "ticket81", NULL);
     CU_ASSERT_PTR_NOT_NULL_FATAL(coll);
-    //todo
-    //(a=1 OR c=2) AND (g=5 OR d=7)
-    //{ $and : [ {$or : [{a : 1}, {c : 2}]}, {$or : [{g : 5}, {d : 7}]} ] }
+
+    bson b;
+    bson_oid_t oid;
+
+    bson_init(&b); //true
+    bson_append_int(&b, "z", 33);
+    bson_append_int(&b, "a", 1);
+    bson_append_int(&b, "b", 3);
+    bson_append_int(&b, "c", 10);
+    bson_append_int(&b, "d", 7);
+    bson_finish(&b);
+    CU_ASSERT_TRUE(ejdbsavebson(coll, &b, &oid));
+    bson_destroy(&b);
+
+    bson_init(&b); //false
+    bson_append_int(&b, "z", 33);
+    bson_append_int(&b, "a", 11);
+    bson_append_int(&b, "b", 22);
+    bson_append_int(&b, "c", 5);
+    bson_append_int(&b, "d", 7);
+    bson_finish(&b);
+    CU_ASSERT_TRUE(ejdbsavebson(coll, &b, &oid));
+    bson_destroy(&b);
+
+    bson_init(&b); //true
+    bson_append_int(&b, "z", 33);
+    bson_append_int(&b, "b", 2);
+    bson_append_int(&b, "d", 7);
+    bson_finish(&b);
+    CU_ASSERT_TRUE(ejdbsavebson(coll, &b, &oid));
+    bson_destroy(&b);
+
+    bson_init(&b); //true
+    bson_append_int(&b, "z", 22);
+    bson_append_int(&b, "a", 1);
+    bson_append_int(&b, "b", 3);
+    bson_append_int(&b, "c", 10);
+    bson_append_int(&b, "d", 7);
+    bson_finish(&b);
+    CU_ASSERT_TRUE(ejdbsavebson(coll, &b, &oid));
+    bson_destroy(&b);
+
+    //z=33 AND (a=1 OR b=2) AND (c=5 OR d=7)
+    //{z : 33, $and : [ {$or : [{a : 1}, {b : 2}]}, {$or : [{c : 5}, {d : 7}]} ] }
+    bson_init_as_query(&b);
+    bson_append_int(&b, "z", 33);
+    bson_append_start_array(&b, "$and");
+
+    //{$or : [{a : 1}, {b : 2}]}
+    bson_append_start_object(&b, "0");
+    bson_append_start_array(&b, "$or");
+    //{a : 1}
+    bson_append_start_object(&b, "0");
+    bson_append_int(&b, "a", 1);
+    bson_append_finish_object(&b);
+    //{b : 2}
+    bson_append_start_object(&b, "1");
+    bson_append_int(&b, "b", 2);
+    bson_append_finish_object(&b);
+    bson_append_finish_array(&b);
+    bson_append_finish_object(&b); //eof {$or : [{a : 1}, {b : 2}]}
+
+    //{$or : [{c : 5}, {d : 7}]}
+    bson_append_start_object(&b, "1");
+    bson_append_start_array(&b, "$or");
+    //{c : 5}
+    bson_append_start_object(&b, "0");
+    bson_append_int(&b, "c", 5);
+    bson_append_finish_object(&b);
+    //{d : 7}
+    bson_append_start_object(&b, "1");
+    bson_append_int(&b, "d", 7);
+    bson_append_finish_object(&b);
+    bson_append_finish_array(&b);
+    bson_append_finish_object(&b); //eof {$or : [{c : 5}, {d : 7}]}
+    bson_append_finish_array(&b); //eof $and
+    bson_finish(&b);
+
+    TCXSTR *log = tcxstrnew();
+    uint32_t count = 0;
+    EJQ *q1 = ejdbcreatequery(jb, &b, NULL, 0, NULL);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(q1);
+    bson_destroy(&b);
+
+    TCLIST *q1res = ejdbqryexecute(coll, q1, &count, 0, log);
+    //fprintf(stderr, "%s", TCXSTRPTR(log));
+    CU_ASSERT_PTR_NOT_NULL_FATAL(q1res);
+    CU_ASSERT_EQUAL(count, 2);
+    CU_ASSERT_PTR_NOT_NULL(strstr(TCXSTRPTR(log), "ACTIVE CONDITIONS: 1"));
+    CU_ASSERT_PTR_NOT_NULL(strstr(TCXSTRPTR(log), "$AND QUERIES: 2"));
+
+    for (int i = 0; i < TCLISTNUM(q1res); ++i) {
+        //z=33 AND (a=1 OR b=2) AND (c=5 OR d=7)
+        CU_ASSERT_FALSE(bson_compare_long(33, TCLISTVALPTR(q1res, i), "z"));
+        CU_ASSERT_TRUE(!bson_compare_long(1, TCLISTVALPTR(q1res, i), "a") || !bson_compare_long(2, TCLISTVALPTR(q1res, i), "b"));
+        CU_ASSERT_TRUE(!bson_compare_long(5, TCLISTVALPTR(q1res, i), "c") || !bson_compare_long(7, TCLISTVALPTR(q1res, i), "d"));
+    }
+    tclistdel(q1res);
+    ejdbquerydel(q1);
+    bson_destroy(&b);
+    tcxstrdel(log);
 }
 
 int main() {