CDRIVER-4593: Handle double type connectionId (#1222)

* CDRIVER-4593: Handle double type connectionId

* use scopes in test_server_description_connection_id

* use cleanup instead of reset

* use ASSERT_CMPINT64

* add test for double

---------

Co-authored-by: Kevin Albertson <[email protected]>

Author: kvalagonda

src/libmongoc/src/mongoc/mongoc-server-description.c

@@ -740,7 +740,7 @@ mongoc_server_description_handle_hello (mongoc_server_description_t *sd,
             GOTO (typefailure);
          bson_oid_copy_unsafe (bson_iter_oid (&iter), &sd->service_id);
       } else if (strcmp ("connectionId", bson_iter_key (&iter)) == 0) {
-         if (!BSON_ITER_HOLDS_INT (&iter))
+         if (!BSON_ITER_HOLDS_NUMBER (&iter))
             GOTO (typefailure);
          sd->server_connection_id = bson_iter_as_int64 (&iter);
       }

src/libmongoc/tests/test-mongoc-server-description.c

@@ -388,33 +388,54 @@ test_server_description_connection_id (void)
    bson_t *hello;
    bson_error_t error;
 
-   mongoc_server_description_init (&sd, "host:1234", 1);
-   hello = BCON_NEW ("minWireVersion",
-                     BCON_INT32 (WIRE_VERSION_MIN),
-                     "maxWireVersion",
-                     BCON_INT32 (WIRE_VERSION_MAX),
-                     "connectionId",
-                     BCON_INT32 (1));
-   memset (&error, 0, sizeof (bson_error_t));
-   mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
-   BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
-   BSON_ASSERT (sd.server_connection_id == 1);
-
-   mongoc_server_description_reset (&sd);
-   bson_destroy (hello);
-   hello = BCON_NEW ("minWireVersion",
-                     BCON_INT32 (WIRE_VERSION_MIN),
-                     "maxWireVersion",
-                     BCON_INT32 (WIRE_VERSION_MAX),
-                     "connectionId",
-                     BCON_INT64 (1));
-   memset (&error, 0, sizeof (bson_error_t));
-   mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
-   BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
-   BSON_ASSERT (sd.server_connection_id == 1);
-
-   bson_destroy (hello);
-   mongoc_server_description_cleanup (&sd);
+   // Test an int32.
+   {
+      mongoc_server_description_init (&sd, "host:1234", 1);
+      hello = BCON_NEW ("minWireVersion",
+                        BCON_INT32 (WIRE_VERSION_MIN),
+                        "maxWireVersion",
+                        BCON_INT32 (WIRE_VERSION_MAX),
+                        "connectionId",
+                        BCON_INT32 (1));
+      memset (&error, 0, sizeof (bson_error_t));
+      mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
+      BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
+      ASSERT_CMPINT64 (sd.server_connection_id, ==, 1);
+      mongoc_server_description_cleanup (&sd);
+      bson_destroy (hello);
+   }
+   // Test an int64.
+   {
+      mongoc_server_description_init (&sd, "host:1234", 1);
+      hello = BCON_NEW ("minWireVersion",
+                        BCON_INT32 (WIRE_VERSION_MIN),
+                        "maxWireVersion",
+                        BCON_INT32 (WIRE_VERSION_MAX),
+                        "connectionId",
+                        BCON_INT64 (1));
+      memset (&error, 0, sizeof (bson_error_t));
+      mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
+      BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
+      ASSERT_CMPINT64 (sd.server_connection_id, ==, 1);
+      bson_destroy (hello);
+      mongoc_server_description_cleanup (&sd);
+   }
+   // Test a double.
+   {
+      mongoc_server_description_init (&sd, "host:1234", 1);
+      hello = BCON_NEW ("minWireVersion",
+                        BCON_INT32 (WIRE_VERSION_MIN),
+                        "maxWireVersion",
+                        BCON_INT32 (WIRE_VERSION_MAX),
+                        "connectionId",
+                        BCON_DOUBLE (1));
+      memset (&error, 0, sizeof (bson_error_t));
+      mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
+      BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
+      BSON_ASSERT (sd.server_connection_id == 1);
+      bson_destroy (hello);
+      mongoc_server_description_cleanup (&sd);
+   }
 }
 
 static void