CDRIVER-1975 allow mixed $ and non-$ query ops

Author: ajdavis

src/mongoc/mongoc-cursor.c

@@ -203,34 +203,6 @@ _has_dollar_fields (const bson_t *bson)
 }
 
 
-/* true if there are any non-$ keys. precondition: bson must be valid. */
-static bool
-_has_nondollar_fields (const bson_t *bson)
-{
-   bson_iter_t iter;
-   const char *key;
-
-   BSON_ASSERT (bson_iter_init (&iter, bson));
-   while (bson_iter_next (&iter)) {
-      key = bson_iter_key (&iter);
-
-      if (key[0] != '$') {
-         return true;
-      }
-   }
-
-   return false;
-}
-
-
-/* true if there are $ and non-$ keys. precondition: bson must be valid. */
-static bool
-_mixed_dollar_non_dollar (const bson_t *bson)
-{
-   return _has_dollar_fields (bson) && _has_nondollar_fields (bson);
-}
-
-
 #define MARK_FAILED(c) \
    do { \
       (c)->done = true; \
@@ -412,15 +384,6 @@ _mongoc_cursor_new (mongoc_client_t             *client,
                bson_append_iter (&opts, key + 1, -1, &iter);
             }
          }
-      } else {
-         /* whole document is query, like "{a: 1}" or "{$or: [...]}" */
-         if (_mixed_dollar_non_dollar (query)) {
-            bson_set_error (&error, MONGOC_ERROR_CURSOR,
-                            MONGOC_ERROR_CURSOR_INVALID_CURSOR,
-                            "Cannot mix top-level query with dollar keys such "
-                            "as $orderby. Use {$query: {},...} instead.");
-            GOTO (done);
-         }
       }
    }
 
@@ -667,7 +630,7 @@ _mongoc_cursor_monitor_legacy_query (mongoc_cursor_t        *cursor,
       /* successful */
       RETURN (true);
    }
-   
+
    bson_init (&doc);
    bson_strncpy (db, cursor->ns, cursor->dblen + 1);
 

tests/test-mongoc-collection-find.c

@@ -413,6 +413,22 @@ test_dollar_or (void)
 }
 
 
+static void
+test_mixed_dollar_nondollar (void)
+{
+   test_collection_find_t test_data = TEST_COLLECTION_FIND_INIT;
+
+   test_data.docs = "[{'a': 1}, {'a': 1, 'b': 2}, {'a': 2}]";
+   test_data.query_input = "{'a': 1, '$or': [{'b': 1}, {'b': 2}]}";
+   test_data.expected_op_query = test_data.query_input;
+   test_data.expected_find_command =
+      "{'find': 'collection', 'filter': {'a': 1, '$or': [{'b': 1}, {'b': 2}]}}";
+
+   test_data.expected_result = "[{'a': 1, 'b': 2}]";
+   _test_collection_find (&test_data);
+}
+
+
 /* test that we can query for a document by a key named "filter" */
 static void
 test_key_named_filter (void)
@@ -1085,7 +1101,7 @@ _test_tailable_timeout (bool pooled)
    } else {
       client = test_framework_client_new ();
    }
-   
+
    database = mongoc_client_get_database (client, "test");
    collection_name = gen_collection_name ("test");
 
@@ -1123,7 +1139,7 @@ _test_tailable_timeout (bool pooled)
    mongoc_collection_destroy (collection);
    mongoc_database_destroy (database);
    bson_free (collection_name);
-   
+
    if (pooled) {
       mongoc_client_pool_push (pool, client);
       mongoc_client_pool_destroy (pool);
@@ -1152,13 +1168,15 @@ test_tailable_timeout_pooled (void)
 void
 test_collection_find_install (TestSuite *suite)
 {
-   TestSuite_AddLive (suite, "/Collection/find/dollar_query",
-                      test_dollar_query);
-   TestSuite_AddLive (suite, "/Collection/find/dollar_or",
-                      test_dollar_or);
-   TestSuite_AddLive (suite, "/Collection/find/key_named_filter",
-                      test_key_named_filter);
-   TestSuite_AddLive (suite, "/Collection/find/key_named_filter/$query",
+   TestSuite_AddLive (
+      suite, "/Collection/find/dollar_query", test_dollar_query);
+   TestSuite_AddLive (suite, "/Collection/find/dollar_or", test_dollar_or);
+   TestSuite_AddLive (suite,
+                      "/Collection/find/mixed_dollar_nondollar",
+                      test_mixed_dollar_nondollar);
+   TestSuite_AddLive (suite, "/Collection/find/key_named_filter", test_key_named_filter);
+   TestSuite_AddLive (suite,
+                      "/Collection/find/key_named_filter/$query",
                       test_key_named_filter_with_dollar_query);
    TestSuite_AddLive (suite, "/Collection/find/subdoc_named_filter",
                       test_subdoc_named_filter);

tests/test-mongoc-cursor.c

@@ -122,38 +122,6 @@ test_clone (void)
 }
 
 
-static void
-test_invalid_query (void)
-{
-   mongoc_client_t *client;
-   mongoc_cursor_t *cursor;
-   bson_error_t error;
-   const bson_t *doc = NULL;
-   bson_t *q;
-   bool r;
-
-   client = test_framework_client_new ();
-   assert (client);
-
-   q = BCON_NEW ("foo", BCON_INT32 (1), "$orderby", "{", "}");
-
-   cursor = _mongoc_cursor_new (client, "test.test", MONGOC_QUERY_NONE, 0, 1, 1,
-                                false, q, NULL, NULL, NULL);
-   assert (!mongoc_cursor_is_alive (cursor));
-   r = mongoc_cursor_next (cursor, &doc);
-   assert (!r);
-   mongoc_cursor_error (cursor, &error);
-   assert (strstr (error.message, "$query"));
-   assert (error.domain == MONGOC_ERROR_CURSOR);
-   assert (error.code == MONGOC_ERROR_CURSOR_INVALID_CURSOR);
-   assert (doc == NULL);
-
-   bson_destroy (q);
-   mongoc_cursor_destroy (cursor);
-   mongoc_client_destroy (client);
-}
-
-
 static void
 test_limit (void)
 {
@@ -1514,7 +1482,6 @@ test_cursor_install (TestSuite *suite)
 {
    TestSuite_AddLive (suite, "/Cursor/get_host", test_get_host);
    TestSuite_AddLive (suite, "/Cursor/clone", test_clone);
-   TestSuite_AddLive (suite, "/Cursor/invalid_query", test_invalid_query);
    TestSuite_AddLive (suite, "/Cursor/limit", test_limit);
    TestSuite_AddLive (suite, "/Cursor/kill/live", test_kill_cursor_live);
    TestSuite_Add (suite, "/Cursor/kill/single", test_kill_cursors_single);