gridfs: add mongoc_gridfs_remove_by_filename()

Author: Christian Hergert

build/cmake/libmongoc-ssl.def

@@ -116,6 +116,7 @@ mongoc_gridfs_find_one
 mongoc_gridfs_find_one_by_filename
 mongoc_gridfs_get_chunks
 mongoc_gridfs_get_files
+mongoc_gridfs_remove_by_filename
 mongoc_index_opt_get_default
 mongoc_index_opt_init
 mongoc_init

build/cmake/libmongoc.def

@@ -117,6 +117,7 @@ mongoc_gridfs_find_one
 mongoc_gridfs_find_one_by_filename
 mongoc_gridfs_get_chunks
 mongoc_gridfs_get_files
+mongoc_gridfs_remove_by_filename
 mongoc_index_opt_get_default
 mongoc_index_opt_init
 mongoc_init

src/libmongoc.symbols

@@ -117,6 +117,7 @@ mongoc_gridfs_find_one
 mongoc_gridfs_find_one_by_filename
 mongoc_gridfs_get_chunks
 mongoc_gridfs_get_files
+mongoc_gridfs_remove_by_filename
 mongoc_index_opt_get_default
 mongoc_index_opt_init
 mongoc_init

src/mongoc/mongoc-error.h

@@ -44,6 +44,7 @@ typedef enum
    MONGOC_ERROR_NAMESPACE,
    MONGOC_ERROR_COMMAND,
    MONGOC_ERROR_COLLECTION,
+   MONGOC_ERROR_GRIDFS,
 } mongoc_error_domain_t;
 
 
@@ -81,8 +82,12 @@ typedef enum
 
    MONGOC_ERROR_COLLECTION_INSERT_FAILED,
 
+   MONGOC_ERROR_GRIDFS_INVALID_FILENAME,
+
    MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND = 59,
    MONGOC_ERROR_QUERY_NOT_TAILABLE = 13051,
+
+   /* Dup with query failure. */
    MONGOC_ERROR_PROTOCOL_ERROR = 17,
 } mongoc_error_code_t;
 

src/mongoc/mongoc-gridfs.c

@@ -21,6 +21,7 @@
 #include "mongoc-client-private.h"
 #include "mongoc-collection.h"
 #include "mongoc-collection-private.h"
+#include "mongoc-error.h"
 #include "mongoc-index.h"
 #include "mongoc-gridfs.h"
 #include "mongoc-gridfs-private.h"
@@ -301,3 +302,108 @@ mongoc_gridfs_get_chunks (mongoc_gridfs_t *gridfs)
 
    return gridfs->chunks;
 }
+
+
+bool
+mongoc_gridfs_remove_by_filename (mongoc_gridfs_t *gridfs,
+                                  const char      *filename,
+                                  bson_error_t    *error)
+{
+   mongoc_bulk_operation_t *bulk_files = NULL;
+   mongoc_bulk_operation_t *bulk_chunks = NULL;
+   mongoc_cursor_t *cursor = NULL;
+   bson_error_t files_error;
+   bson_error_t chunks_error;
+   const bson_t *doc;
+   const char *key;
+   char keybuf[16];
+   int count = 0;
+   bool chunks_ret;
+   bool files_ret;
+   bool ret = false;
+   bson_iter_t iter;
+   bson_t *files_q;
+   bson_t *chunks_q;
+   bson_t q = BSON_INITIALIZER;
+   bson_t fields = BSON_INITIALIZER;
+   bson_t ar = BSON_INITIALIZER;
+
+   bson_return_val_if_fail (gridfs, false);
+
+   if (!filename) {
+      bson_set_error (error,
+                      MONGOC_ERROR_GRIDFS,
+                      MONGOC_ERROR_GRIDFS_INVALID_FILENAME,
+                      "A non-NULL filename must be specified.");
+      return false;
+   }
+
+   /*
+    * Find all files matching this filename. Hopefully just one, but not
+    * strictly required!
+    */
+
+   BSON_APPEND_UTF8 (&q, "filename", filename);
+   BSON_APPEND_INT32 (&fields, "_id", 1);
+
+   cursor = mongoc_collection_find (gridfs->files, MONGOC_QUERY_NONE, 0, 0, 0,
+                                    &q, &fields, NULL);
+   BSON_ASSERT (cursor);
+
+   while (mongoc_cursor_next (cursor, &doc)) {
+      if (bson_iter_init_find (&iter, doc, "_id")) {
+         const bson_value_t *value = bson_iter_value (&iter);
+
+         bson_uint32_to_string (count, &key, keybuf, sizeof keybuf);
+         BSON_APPEND_VALUE (&ar, key, value);
+      }
+   }
+
+   if (mongoc_cursor_error (cursor, error)) {
+      goto failure;
+   }
+
+   bulk_files = mongoc_collection_create_bulk_operation (gridfs->files, false, NULL);
+   bulk_chunks = mongoc_collection_create_bulk_operation (gridfs->chunks, false, NULL);
+
+   files_q = BCON_NEW ("_id", "{", "$in", BCON_ARRAY (&ar), "}");
+   chunks_q = BCON_NEW ("files_id", "{", "$in", BCON_ARRAY (&ar), "}");
+
+   mongoc_bulk_operation_remove (bulk_files, files_q);
+   mongoc_bulk_operation_remove (bulk_chunks, chunks_q);
+
+   files_ret = mongoc_bulk_operation_execute (bulk_files, NULL, &files_error);
+   chunks_ret = mongoc_bulk_operation_execute (bulk_chunks, NULL, &chunks_error);
+
+   if (error) {
+      if (!files_ret) {
+         memcpy (error, &files_error, sizeof *error);
+      } else if (!chunks_ret) {
+         memcpy (error, &chunks_error, sizeof *error);
+      }
+   }
+
+   ret = (files_ret && chunks_ret);
+
+failure:
+   if (cursor) {
+      mongoc_cursor_destroy (cursor);
+   }
+   if (bulk_files) {
+      mongoc_bulk_operation_destroy (bulk_files);
+   }
+   if (bulk_chunks) {
+      mongoc_bulk_operation_destroy (bulk_chunks);
+   }
+   bson_destroy (&q);
+   bson_destroy (&fields);
+   bson_destroy (&ar);
+   if (files_q) {
+      bson_destroy (files_q);
+   }
+   if (chunks_q) {
+      bson_destroy (chunks_q);
+   }
+
+   return ret;
+}

src/mongoc/mongoc-gridfs.h

@@ -56,6 +56,9 @@ bool                       mongoc_gridfs_drop                    (mongoc_gridfs_
 void                       mongoc_gridfs_destroy                 (mongoc_gridfs_t          *gridfs);
 mongoc_collection_t       *mongoc_gridfs_get_files               (mongoc_gridfs_t          *gridfs);
 mongoc_collection_t       *mongoc_gridfs_get_chunks              (mongoc_gridfs_t          *gridfs);
+bool                       mongoc_gridfs_remove_by_filename      (mongoc_gridfs_t          *gridfs,
+                                                                  const char               *filename,
+                                                                  bson_error_t             *error);
 
 
 BSON_END_DECLS

tests/test-mongoc-gridfs.c

@@ -323,6 +323,54 @@ test_stream (void)
 }
 
 
+static void
+test_remove_by_filename (void)
+{
+   mongoc_gridfs_t *gridfs;
+   mongoc_gridfs_file_t *file;
+   mongoc_gridfs_file_opt_t opt = { 0 };
+   mongoc_client_t *client;
+   bson_error_t error;
+   bool ret;
+
+   client = mongoc_client_new (gTestUri);
+   assert (client);
+
+   gridfs = get_test_gridfs (client, "fs_remove_by_filename", &error);
+   assert (gridfs);
+
+   mongoc_gridfs_drop (gridfs, &error);
+
+   opt.filename = "foo_file_1.txt";
+   file = mongoc_gridfs_create_file (gridfs, &opt);
+   assert (file);
+   assert (mongoc_gridfs_file_save (file));
+   mongoc_gridfs_file_destroy (file);
+
+   opt.filename = "foo_file_2.txt";
+   file = mongoc_gridfs_create_file (gridfs, &opt);
+   assert (file);
+   assert (mongoc_gridfs_file_save (file));
+
+   ret = mongoc_gridfs_remove_by_filename (gridfs, "foo_file_1.txt", &error);
+   if (!ret) fprintf (stderr, "ERROR: %s\n", error.message);
+   assert (ret);
+   mongoc_gridfs_file_destroy (file);
+
+   file = mongoc_gridfs_find_one_by_filename (gridfs, "foo_file_1.txt", &error);
+   assert (!file);
+
+   file = mongoc_gridfs_find_one_by_filename (gridfs, "foo_file_2.txt", &error);
+   assert (file);
+   mongoc_gridfs_file_destroy (file);
+
+   drop_collections (gridfs, &error);
+   mongoc_gridfs_destroy (gridfs);
+
+   mongoc_client_destroy (client);
+}
+
+
 static void
 cleanup_globals (void)
 {
@@ -341,6 +389,7 @@ test_gridfs_install (TestSuite *suite)
    TestSuite_Add (suite, "/GridFS/read", test_read);
    TestSuite_Add (suite, "/GridFS/stream", test_stream);
    TestSuite_Add (suite, "/GridFS/write", test_write);
+   TestSuite_Add (suite, "/GridFS/remove_by_filename", test_remove_by_filename);
 
    atexit (cleanup_globals);
 }