SWIFT-1409 Vendor libmongoc 1.19.2 [r1.2 backport] (#700)

Author: kmahar

Sources/CLibMongoC/include/CLibMongoC_bson-version.h

@@ -39,7 +39,7 @@
  *
  * BSON micro version component (e.g. 3 if %BSON_VERSION is 1.2.3)
  */
-#define BSON_MICRO_VERSION (1)
+#define BSON_MICRO_VERSION (2)
 
 
 /**
@@ -54,7 +54,7 @@
  *
  * BSON version.
  */
-#define BSON_VERSION (1.19.1)
+#define BSON_VERSION (1.19.2)
 
 
 /**
@@ -63,7 +63,7 @@
  * BSON version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define BSON_VERSION_S "1.19.1"
+#define BSON_VERSION_S "1.19.2"
 
 
 /**

Sources/CLibMongoC/include/CLibMongoC_mongoc-version.h

@@ -39,7 +39,7 @@
  *
  * MONGOC micro version component (e.g. 3 if %MONGOC_VERSION is 1.2.3)
  */
-#define MONGOC_MICRO_VERSION (1)
+#define MONGOC_MICRO_VERSION (2)
 
 
 /**
@@ -55,7 +55,7 @@
  *
  * MONGOC version.
  */
-#define MONGOC_VERSION (1.19.1)
+#define MONGOC_VERSION (1.19.2)
 
 
 /**
@@ -64,7 +64,7 @@
  * MONGOC version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define MONGOC_VERSION_S "1.19.1"
+#define MONGOC_VERSION_S "1.19.2"
 
 
 /**

Sources/CLibMongoC/mongoc/mongoc-topology.c

@@ -563,7 +563,12 @@ mongoc_topology_destroy (mongoc_topology_t *topology)
       bson_mutex_destroy (&topology->apm_mutex);
       mongoc_cond_destroy (&topology->srv_polling_cond);
    }
-   _mongoc_topology_description_monitor_closed (&topology->description);
+
+   if (topology->valid) {
+      /* Do not emit a topology_closed event. A topology opening event was not
+       * emitted. */
+      _mongoc_topology_description_monitor_closed (&topology->description);
+   }
 
    mongoc_uri_destroy (topology->uri);
    mongoc_topology_description_destroy (&topology->description);

Tests/MongoSwiftTests/DNSSeedlistTests.swift

@@ -93,11 +93,6 @@ final class DNSSeedlistTests: MongoSwiftTestCase {
             // this particular test case requires SSL is disabled. see DRIVERS-1324.
             let requiresTLS = fileName != "txt-record-with-overridden-ssl-option.json"
 
-            // skipping due to a libmongoc bug. TODO: SWIFT-1343 unskip.
-            guard fileName != "loadBalanced-replicaSet-errors.json" else {
-                continue
-            }
-
             // TLS requirement for this test case is not met.
             guard (requiresTLS && MongoSwiftTestCase.ssl) || (!requiresTLS && !MongoSwiftTestCase.ssl) else {
                 print("Skipping test file \(fileName); TLS requirement not met")

etc/vendor-libmongoc.sh

@@ -5,7 +5,7 @@ set -eou pipefail
 PWD=`pwd`
 LIBMONGOC_MAJOR_VERSION=1
 LIBMONGOC_MINOR_VERSION=19
-LIBMONGOC_PATCH_VERSION=1
+LIBMONGOC_PATCH_VERSION=2
 LIBMONGOC_PRERELEASE_VERSION=
 
 LIBMONGOC_FULL_VERSION=${LIBMONGOC_MAJOR_VERSION}.${LIBMONGOC_MINOR_VERSION}.${LIBMONGOC_PATCH_VERSION}${LIBMONGOC_PRERELEASE_VERSION:+-$LIBMONGOC_PRERELEASE_VERSION}