CDRIVER-2001 mongoc_gridfs_file_writev takes const iovec

Author: ajdavis

build/generate-future-functions.py

@@ -87,6 +87,7 @@
 
     # Const libmongoc.
     typedef("const_mongoc_find_and_modify_opts_ptr", "const mongoc_find_and_modify_opts_t *"),
+    typedef("const_mongoc_iovec_ptr", "const mongoc_iovec_t *"),
     typedef("const_mongoc_read_prefs_ptr", "const mongoc_read_prefs_t *"),
     typedef("const_mongoc_write_concern_ptr", "const mongoc_write_concern_t *"),
 ]
@@ -310,7 +311,7 @@
     future_function("ssize_t",
                     "mongoc_gridfs_file_writev",
                     [param("mongoc_gridfs_file_ptr", "file"),
-                     param("mongoc_iovec_ptr", "iov"),
+                     param("const_mongoc_iovec_ptr", "iov"),
                      param("size_t", "iovcnt"),
                      param("uint32_t", "timeout_msec")]),
 

doc/mongoc_gridfs_file_writev.rst

@@ -10,7 +10,7 @@ Synopsis
 
   ssize_t
   mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
-                             mongoc_iovec_t *iov,
+                             const mongoc_iovec_t *iov,
                              size_t iovcnt,
                              uint32_t timeout_msec);
 

src/mongoc/mongoc-gridfs-file.c

@@ -481,7 +481,7 @@ mongoc_gridfs_file_readv (mongoc_gridfs_file_t *file,
  *  timeout_msec is unused */
 ssize_t
 mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
-                           mongoc_iovec_t *iov,
+                           const mongoc_iovec_t *iov,
                            size_t iovcnt,
                            uint32_t timeout_msec)
 {

src/mongoc/mongoc-gridfs-file.h

@@ -79,7 +79,7 @@ mongoc_gridfs_file_get_upload_date (mongoc_gridfs_file_t *file);
 
 MONGOC_EXPORT (ssize_t)
 mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
-                           mongoc_iovec_t *iov,
+                           const mongoc_iovec_t *iov,
                            size_t iovcnt,
                            uint32_t timeout_msec);
 MONGOC_EXPORT (ssize_t)

tests/mock_server/future-functions.c

@@ -642,7 +642,7 @@ background_mongoc_gridfs_file_writev (void *data)
       &return_value,
       mongoc_gridfs_file_writev (
          future_value_get_mongoc_gridfs_file_ptr (future_get_param (future, 0)),
-         future_value_get_mongoc_iovec_ptr (future_get_param (future, 1)),
+         future_value_get_const_mongoc_iovec_ptr (future_get_param (future, 1)),
          future_value_get_size_t (future_get_param (future, 2)),
          future_value_get_uint32_t (future_get_param (future, 3))
       ));
@@ -1489,7 +1489,7 @@ future_gridfs_file_seek (
 future_t *
 future_gridfs_file_writev (
    mongoc_gridfs_file_ptr file,
-   mongoc_iovec_ptr iov,
+   const_mongoc_iovec_ptr iov,
    size_t iovcnt,
    uint32_t timeout_msec)
 {
@@ -1499,7 +1499,7 @@ future_gridfs_file_writev (
    future_value_set_mongoc_gridfs_file_ptr (
       future_get_param (future, 0), file);
 
-   future_value_set_mongoc_iovec_ptr (
+   future_value_set_const_mongoc_iovec_ptr (
       future_get_param (future, 1), iov);
 
    future_value_set_size_t (

tests/mock_server/future-functions.h

@@ -305,7 +305,7 @@ future_t *
 future_gridfs_file_writev (
 
    mongoc_gridfs_file_ptr file,
-   mongoc_iovec_ptr iov,
+   const_mongoc_iovec_ptr iov,
    size_t iovcnt,
    uint32_t timeout_msec
 );

tests/mock_server/future-value.c

@@ -434,6 +434,20 @@ future_value_get_const_mongoc_find_and_modify_opts_ptr (future_value_t *future_v
    return future_value->const_mongoc_find_and_modify_opts_ptr_value;
 }
 
+void
+future_value_set_const_mongoc_iovec_ptr (future_value_t *future_value, const_mongoc_iovec_ptr value)
+{
+   future_value->type = future_value_const_mongoc_iovec_ptr_type;
+   future_value->const_mongoc_iovec_ptr_value = value;
+}
+
+const_mongoc_iovec_ptr
+future_value_get_const_mongoc_iovec_ptr (future_value_t *future_value)
+{
+   BSON_ASSERT (future_value->type == future_value_const_mongoc_iovec_ptr_type);
+   return future_value->const_mongoc_iovec_ptr_value;
+}
+
 void
 future_value_set_const_mongoc_read_prefs_ptr (future_value_t *future_value, const_mongoc_read_prefs_ptr value)
 {

tests/mock_server/future-value.h

@@ -39,6 +39,7 @@ typedef mongoc_server_description_t * mongoc_server_description_ptr;
 typedef mongoc_topology_t * mongoc_topology_ptr;
 typedef mongoc_write_concern_t * mongoc_write_concern_ptr;
 typedef const mongoc_find_and_modify_opts_t * const_mongoc_find_and_modify_opts_ptr;
+typedef const mongoc_iovec_t * const_mongoc_iovec_ptr;
 typedef const mongoc_read_prefs_t * const_mongoc_read_prefs_ptr;
 typedef const mongoc_write_concern_t * const_mongoc_write_concern_ptr;
 
@@ -73,6 +74,7 @@ typedef enum {
    future_value_mongoc_topology_ptr_type,
    future_value_mongoc_write_concern_ptr_type,
    future_value_const_mongoc_find_and_modify_opts_ptr_type,
+   future_value_const_mongoc_iovec_ptr_type,
    future_value_const_mongoc_read_prefs_ptr_type,
    future_value_const_mongoc_write_concern_ptr_type,
    future_value_void_type,
@@ -112,6 +114,7 @@ typedef struct _future_value_t
       mongoc_topology_ptr mongoc_topology_ptr_value;
       mongoc_write_concern_ptr mongoc_write_concern_ptr_value;
       const_mongoc_find_and_modify_opts_ptr const_mongoc_find_and_modify_opts_ptr_value;
+      const_mongoc_iovec_ptr const_mongoc_iovec_ptr_value;
       const_mongoc_read_prefs_ptr const_mongoc_read_prefs_ptr_value;
       const_mongoc_write_concern_ptr const_mongoc_write_concern_ptr_value;
 
@@ -391,6 +394,15 @@ const_mongoc_find_and_modify_opts_ptr
 future_value_get_const_mongoc_find_and_modify_opts_ptr (
    future_value_t *future_value);
 
+void
+future_value_set_const_mongoc_iovec_ptr(
+   future_value_t *future_value,
+   const_mongoc_iovec_ptr value);
+
+const_mongoc_iovec_ptr
+future_value_get_const_mongoc_iovec_ptr (
+   future_value_t *future_value);
+
 void
 future_value_set_const_mongoc_read_prefs_ptr(
    future_value_t *future_value,

tests/mock_server/future.c

@@ -373,6 +373,18 @@ future_get_const_mongoc_find_and_modify_opts_ptr (future_t *future)
    abort ();
 }
 
+const_mongoc_iovec_ptr
+future_get_const_mongoc_iovec_ptr (future_t *future)
+{
+   if (future_wait (future)) {
+      return future_value_get_const_mongoc_iovec_ptr (&future->return_value);
+   }
+
+   fprintf (stderr, "%s timed out\n", BSON_FUNC);
+   fflush (stderr);
+   abort ();
+}
+
 const_mongoc_read_prefs_ptr
 future_get_const_mongoc_read_prefs_ptr (future_t *future)
 {

tests/mock_server/future.h

@@ -129,6 +129,9 @@ future_get_mongoc_write_concern_ptr (future_t *future);
 const_mongoc_find_and_modify_opts_ptr
 future_get_const_mongoc_find_and_modify_opts_ptr (future_t *future);
 
+const_mongoc_iovec_ptr
+future_get_const_mongoc_iovec_ptr (future_t *future);
+
 const_mongoc_read_prefs_ptr
 future_get_const_mongoc_read_prefs_ptr (future_t *future);