Update generated files for Evergreen config and future functions (#1068)

* Update future-functions generator

* Ensure collections are serialized in block style

Author: eramongodb

build/evergreen_config_generator/__init__.py

@@ -72,7 +72,7 @@ def represent_config_object(self, obj):
 
 
 def yaml_dump(obj):
-    return yaml.dump(obj, Dumper=_Dumper)
+    return yaml.dump(obj, Dumper=_Dumper, default_flow_style=False)
 
 
 def generate(config, path):
@@ -90,4 +90,4 @@ def generate(config, path):
 #
 ####################################
 ''')
-    f.write(yaml_dump(config))
+    f.write(yaml_dump(config))

build/generate-future-functions.py

@@ -32,7 +32,8 @@
 from collections import namedtuple
 from os.path import basename, dirname, join as joinpath, normpath
 
-from jinja2 import Environment, FileSystemLoader  # Please "pip install jinja2".
+# Please "pip install jinja2".
+from jinja2 import Environment, FileSystemLoader
 
 this_dir = dirname(__file__)
 template_dir = joinpath(this_dir, 'future_function_templates')
@@ -60,6 +61,7 @@
 
     # Const fundamental.
     typedef("const_char_ptr", "const char *"),
+    typedef("bool_ptr", "bool *"),
 
     # libbson.
     typedef("bson_error_ptr", "bson_error_t *"),
@@ -98,7 +100,8 @@
             "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 *"),
+    typedef("const_mongoc_write_concern_ptr",
+            "const mongoc_write_concern_t *"),
 ]
 
 type_list = [T.name for T in typedef_list]
@@ -451,6 +454,7 @@
                     [param("mongoc_topology_ptr", "topology"),
                      param("mongoc_ss_optype_t", "optype"),
                      param("const_mongoc_read_prefs_ptr", "read_prefs"),
+                     param("bool_ptr", "must_use_primary"),
                      param("bson_error_ptr", "error")]),
 
     future_function("mongoc_gridfs_ptr",

src/libmongoc/tests/mock_server/future-functions.c

@@ -1034,8 +1034,8 @@ BSON_THREAD_FUN (background_mongoc_topology_select, data)
          future_value_get_mongoc_topology_ptr (future_get_param (future, 0)),
          future_value_get_mongoc_ss_optype_t (future_get_param (future, 1)),
          future_value_get_const_mongoc_read_prefs_ptr (future_get_param (future, 2)),
-         NULL /* chosen read mode, unused here */,
-         future_value_get_bson_error_ptr (future_get_param (future, 3))
+         future_value_get_bool_ptr (future_get_param (future, 3)),
+         future_value_get_bson_error_ptr (future_get_param (future, 4))
       ));
 
    future_resolve (future, return_value);
@@ -2563,10 +2563,11 @@ future_topology_select (
    mongoc_topology_ptr topology,
    mongoc_ss_optype_t optype,
    const_mongoc_read_prefs_ptr read_prefs,
+   bool_ptr must_use_primary,
    bson_error_ptr error)
 {
    future_t *future = future_new (future_value_mongoc_server_description_ptr_type,
-                                  4);
+                                  5);
 
    future_value_set_mongoc_topology_ptr (
       future_get_param (future, 0), topology);
@@ -2577,8 +2578,11 @@ future_topology_select (
    future_value_set_const_mongoc_read_prefs_ptr (
       future_get_param (future, 2), read_prefs);
 
+   future_value_set_bool_ptr (
+      future_get_param (future, 3), must_use_primary);
+   
    future_value_set_bson_error_ptr (
-      future_get_param (future, 3), error);
+      future_get_param (future, 4), error);
 
    future_start (future, background_mongoc_topology_select);
    return future;

src/libmongoc/tests/mock_server/future-functions.h

@@ -490,6 +490,7 @@ future_topology_select (
    mongoc_topology_ptr topology,
    mongoc_ss_optype_t optype,
    const_mongoc_read_prefs_ptr read_prefs,
+   bool_ptr must_use_primary,
    bson_error_ptr error
 );
 

src/libmongoc/tests/mock_server/future-value.c

@@ -168,6 +168,20 @@ future_value_get_const_char_ptr (future_value_t *future_value)
    return future_value->value.const_char_ptr_value;
 }
 
+void
+future_value_set_bool_ptr (future_value_t *future_value, bool_ptr value)
+{
+   future_value->type = future_value_bool_ptr_type;
+   future_value->value.bool_ptr_value = value;
+}
+
+bool_ptr
+future_value_get_bool_ptr (future_value_t *future_value)
+{
+   BSON_ASSERT (future_value->type == future_value_bool_ptr_type);
+   return future_value->value.bool_ptr_value;
+}
+
 void
 future_value_set_bson_error_ptr (future_value_t *future_value, bson_error_ptr value)
 {

src/libmongoc/tests/mock_server/future-value.h

@@ -22,6 +22,7 @@ typedef char * char_ptr;
 typedef char ** char_ptr_ptr;
 typedef void * void_ptr;
 typedef const char * const_char_ptr;
+typedef bool * bool_ptr;
 typedef bson_error_t * bson_error_ptr;
 typedef bson_t * bson_ptr;
 typedef const bson_t * const_bson_ptr;
@@ -61,6 +62,7 @@ typedef enum {
    future_value_uint32_t_type,
    future_value_void_ptr_type,
    future_value_const_char_ptr_type,
+   future_value_bool_ptr_type,
    future_value_bson_error_ptr_type,
    future_value_bson_ptr_type,
    future_value_const_bson_ptr_type,
@@ -109,6 +111,7 @@ typedef struct _future_value_t
       uint32_t uint32_t_value;
       void_ptr void_ptr_value;
       const_char_ptr const_char_ptr_value;
+      bool_ptr bool_ptr_value;
       bson_error_ptr bson_error_ptr_value;
       bson_ptr bson_ptr_value;
       const_bson_ptr const_bson_ptr_value;
@@ -245,6 +248,15 @@ const_char_ptr
 future_value_get_const_char_ptr (
    future_value_t *future_value);
 
+void
+future_value_set_bool_ptr(
+   future_value_t *future_value,
+   bool_ptr value);
+
+bool_ptr
+future_value_get_bool_ptr (
+   future_value_t *future_value);
+
 void
 future_value_set_bson_error_ptr(
    future_value_t *future_value,

src/libmongoc/tests/mock_server/future.c

@@ -145,6 +145,18 @@ future_get_const_char_ptr (future_t *future)
    abort ();
 }
 
+bool_ptr
+future_get_bool_ptr (future_t *future)
+{
+   if (future_wait (future)) {
+      return future_value_get_bool_ptr (&future->return_value);
+   }
+
+   fprintf (stderr, "%s timed out\n", BSON_FUNC);
+   fflush (stderr);
+   abort ();
+}
+
 bson_error_ptr
 future_get_bson_error_ptr (future_t *future)
 {

src/libmongoc/tests/mock_server/future.h

@@ -72,6 +72,9 @@ future_get_void_ptr (future_t *future);
 const_char_ptr
 future_get_const_char_ptr (future_t *future);
 
+bool_ptr
+future_get_bool_ptr (future_t *future);
+
 bson_error_ptr
 future_get_bson_error_ptr (future_t *future);
 

src/libmongoc/tests/test-mongoc-topology-reconcile.c

@@ -246,7 +246,7 @@ _test_topology_reconcile_sharded (bool pooled)
 
    primary_read_prefs = mongoc_read_prefs_new (MONGOC_READ_PRIMARY);
    future = future_topology_select (
-      client->topology, MONGOC_SS_READ, primary_read_prefs, &error);
+      client->topology, MONGOC_SS_READ, primary_read_prefs, NULL, &error);
 
    /* mongos */
    request = mock_server_receives_any_hello (mongos);

src/libmongoc/tests/test-mongoc-topology-scanner.c

@@ -185,7 +185,7 @@ test_topology_scanner_discovery (void)
    secondary_pref = mongoc_read_prefs_new (MONGOC_READ_SECONDARY_PREFERRED);
 
    future = future_topology_select (
-      client->topology, MONGOC_SS_READ, secondary_pref, &error);
+      client->topology, MONGOC_SS_READ, secondary_pref, NULL, &error);
 
    /* a single scan discovers *and* checks the secondary */
    request = mock_server_receives_any_hello (primary);
@@ -265,7 +265,7 @@ test_topology_scanner_oscillate (void)
 
    BSON_ASSERT (!scanner->async->ncmds);
    future = future_topology_select (
-      client->topology, MONGOC_SS_READ, primary_pref, &error);
+      client->topology, MONGOC_SS_READ, primary_pref, NULL, &error);
 
    /* a single scan discovers servers 0 and 1 */
    request = mock_server_receives_any_hello (server0);