gridfs: add mongoc_gridfs_file_remove() helper.

Author: Christian Hergert

build/cmake/libmongoc-ssl.def

@@ -103,6 +103,7 @@ mongoc_gridfs_file_list_destroy
 mongoc_gridfs_file_list_error
 mongoc_gridfs_file_list_next
 mongoc_gridfs_file_readv
+mongoc_gridfs_file_remove
 mongoc_gridfs_file_save
 mongoc_gridfs_file_seek
 mongoc_gridfs_file_set_aliases

build/cmake/libmongoc.def

@@ -104,6 +104,7 @@ mongoc_gridfs_file_list_destroy
 mongoc_gridfs_file_list_error
 mongoc_gridfs_file_list_next
 mongoc_gridfs_file_readv
+mongoc_gridfs_file_remove
 mongoc_gridfs_file_save
 mongoc_gridfs_file_seek
 mongoc_gridfs_file_set_aliases

src/libmongoc.symbols

@@ -104,6 +104,7 @@ mongoc_gridfs_file_list_destroy
 mongoc_gridfs_file_list_error
 mongoc_gridfs_file_list_next
 mongoc_gridfs_file_readv
+mongoc_gridfs_file_remove
 mongoc_gridfs_file_save
 mongoc_gridfs_file_seek
 mongoc_gridfs_file_set_aliases

src/mongoc/mongoc-gridfs-file.c

@@ -771,17 +771,61 @@ mongoc_gridfs_file_error (mongoc_gridfs_file_t *file,
 int64_t
 mongoc_gridfs_file_get_length (mongoc_gridfs_file_t *file)
 {
+   bson_return_val_if_fail (file, -1);
+
    return file->length;
 }
 
 int32_t
 mongoc_gridfs_file_get_chunk_size (mongoc_gridfs_file_t *file)
 {
+   bson_return_val_if_fail (file, -1);
+
    return file->chunk_size;
 }
 
 int64_t
 mongoc_gridfs_file_get_upload_date (mongoc_gridfs_file_t *file)
 {
+   bson_return_val_if_fail (file, -1);
+
    return file->upload_date;
 }
+
+bool
+mongoc_gridfs_file_remove (mongoc_gridfs_file_t *file,
+                           bson_error_t         *error)
+{
+   bson_t sel = BSON_INITIALIZER;
+   bool ret = false;
+
+   bson_return_val_if_fail (file, false);
+
+   BSON_APPEND_VALUE (&sel, "_id", &file->files_id);
+
+   if (!mongoc_collection_remove (file->gridfs->files,
+                                  MONGOC_REMOVE_SINGLE_REMOVE,
+                                  &sel,
+                                  NULL,
+                                  error)) {
+      goto cleanup;
+   }
+
+   bson_reinit (&sel);
+   BSON_APPEND_VALUE (&sel, "files_id", &file->files_id);
+
+   if (!mongoc_collection_remove (file->gridfs->chunks,
+                                  MONGOC_REMOVE_NONE,
+                                  &sel,
+                                  NULL,
+                                  error)) {
+      goto cleanup;
+   }
+
+   ret = true;
+
+cleanup:
+   bson_destroy (&sel);
+
+   return ret;
+}

src/mongoc/mongoc-gridfs-file.h

@@ -89,6 +89,8 @@ bool     mongoc_gridfs_file_save            (mongoc_gridfs_file_t *file);
 void     mongoc_gridfs_file_destroy         (mongoc_gridfs_file_t *file);
 bool     mongoc_gridfs_file_error           (mongoc_gridfs_file_t *file,
                                              bson_error_t         *error);
+bool     mongoc_gridfs_file_remove          (mongoc_gridfs_file_t *file,
+                                             bson_error_t         *error);
 
 
 BSON_END_DECLS

tests/test-mongoc-gridfs.c

@@ -66,6 +66,49 @@ test_create (void)
 }
 
 
+static void
+test_remove (void)
+{
+   mongoc_gridfs_t *gridfs;
+   mongoc_gridfs_file_t *file;
+   mongoc_gridfs_file_opt_t opts = { 0 };
+   mongoc_client_t *client;
+   bson_error_t error;
+   bool r;
+   char name[32];
+
+   client = mongoc_client_new (gTestUri);
+   assert (client);
+
+   gridfs = mongoc_client_get_gridfs (client, "test", "foo", &error);
+   assert (gridfs);
+
+   mongoc_gridfs_drop (gridfs, &error);
+
+
+   bson_snprintf (name, sizeof name, "test-remove.%u", rand ());
+   opts.filename = name;
+
+   file = mongoc_gridfs_create_file (gridfs, &opts);
+   assert (file);
+   assert (mongoc_gridfs_file_save (file));
+
+   r = mongoc_gridfs_file_remove (file, &error);
+   if (!r) fprintf (stderr, "%s\n", error.message);
+   assert (r);
+
+   mongoc_gridfs_file_destroy (file);
+
+   file = mongoc_gridfs_find_one_by_filename (gridfs, name, &error);
+   assert (!file);
+
+   drop_collections (gridfs, &error);
+   mongoc_gridfs_destroy (gridfs);
+
+   mongoc_client_destroy (client);
+}
+
+
 static void
 test_list (void)
 {
@@ -388,6 +431,7 @@ test_gridfs_install (TestSuite *suite)
    TestSuite_Add (suite, "/GridFS/list", test_list);
    TestSuite_Add (suite, "/GridFS/read", test_read);
    TestSuite_Add (suite, "/GridFS/stream", test_stream);
+   TestSuite_Add (suite, "/GridFS/remove", test_remove);
    TestSuite_Add (suite, "/GridFS/write", test_write);
    TestSuite_Add (suite, "/GridFS/remove_by_filename", test_remove_by_filename);