matcher: fix some inconsistencies in matcher logic.

Author: Christian Hergert

src/mongoc/mongoc-matcher-op.c

@@ -372,20 +372,15 @@ _mongoc_matcher_op_not_match (mongoc_matcher_op_not_t *not,  /* IN */
 }
 
 
-/*
- * NOTE: The compare operators are opposite since the left and right are
- * somewhat inverted being that the spec is on the left and the value on the
- * right.
- */
 #define _TYPE_CODE(l, r) ((((int)(l)) << 8) | ((int)(r)))
 #define _NATIVE_COMPARE(op, t1, t2) \
-   (bson_iter##t1(&compare->iter) op bson_iter##t2(iter))
+   (bson_iter##t2(iter) op bson_iter##t1(&compare->iter))
 #define _EQ_COMPARE(t1, t2)  _NATIVE_COMPARE(==, t1, t2)
 #define _NE_COMPARE(t1, t2)  _NATIVE_COMPARE(!=, t1, t2)
-#define _GT_COMPARE(t1, t2)  _NATIVE_COMPARE(<=, t1, t2)
-#define _GTE_COMPARE(t1, t2) _NATIVE_COMPARE(<, t1, t2)
-#define _LT_COMPARE(t1, t2)  _NATIVE_COMPARE(>=, t1, t2)
-#define _LTE_COMPARE(t1, t2) _NATIVE_COMPARE(>, t1, t2)
+#define _GT_COMPARE(t1, t2)  _NATIVE_COMPARE(>, t1, t2)
+#define _GTE_COMPARE(t1, t2) _NATIVE_COMPARE(>=, t1, t2)
+#define _LT_COMPARE(t1, t2)  _NATIVE_COMPARE(<, t1, t2)
+#define _LTE_COMPARE(t1, t2) _NATIVE_COMPARE(<=, t1, t2)
 
 
 /*

tests/test-mongoc-matcher.c

@@ -74,6 +74,44 @@ test_mongoc_matcher_basic (void)
 }
 
 
+typedef struct compare_check
+{
+   const char *op;
+   int32_t doc;
+   int32_t query;
+   bool expected;
+} compare_check;
+
+
+static void
+test_mongoc_matcher_compare (void)
+{
+   mongoc_matcher_t *matcher;
+   compare_check checks[] = {
+      { "$gt", 2, 2, false },
+      { "$gte", 2, 2, true},
+      { "$lt", 2, 2, false},
+      { "$lte", 2, 2, true},
+      { "$ne", 2, 2, false},
+      { NULL }
+   };
+   bson_t *doc;
+   bson_t *q;
+   int i;
+
+   for (i = 0; checks [i].op; i++) {
+      doc = BCON_NEW ("a", BCON_INT32 (checks[i].doc));
+      q = BCON_NEW ("a", "{", checks[i].op, BCON_INT32 (checks[i].query), "}");
+      matcher = mongoc_matcher_new (q, NULL);
+      assert (matcher);
+      assert (mongoc_matcher_match (matcher, doc) == checks[i].expected);
+      bson_destroy (q);
+      bson_destroy (doc);
+      mongoc_matcher_destroy (matcher);
+   }
+}
+
+
 static void
 test_mongoc_matcher_bad_spec (void)
 {
@@ -265,6 +303,7 @@ void
 test_matcher_install (TestSuite *suite)
 {
    TestSuite_Add (suite, "/Matcher/basic", test_mongoc_matcher_basic);
+   TestSuite_Add (suite, "/Matcher/compare", test_mongoc_matcher_compare);
    TestSuite_Add (suite, "/Matcher/bad_spec", test_mongoc_matcher_bad_spec);
    TestSuite_Add (suite, "/Matcher/eq/utf8", test_mongoc_matcher_eq_utf8);
    TestSuite_Add (suite, "/Matcher/eq/int32", test_mongoc_matcher_eq_int32);