CDRIVER-2056: Parse zero values for localThresholdMS URI option

Author: ajdavis

src/mongoc/mongoc-topology.c

@@ -24,6 +24,7 @@
 #include "mongoc-topology-private.h"
 #include "mongoc-topology-description-apm-private.h"
 #include "mongoc-client-private.h"
+#include "mongoc-uri-private.h"
 #include "mongoc-util-private.h"
 
 #include "utlist.h"
@@ -253,9 +254,7 @@ mongoc_topology_new (const mongoc_uri_t *uri,
       topology->uri, "serverselectiontimeoutms",
       MONGOC_TOPOLOGY_SERVER_SELECTION_TIMEOUT_MS);
 
-   topology->local_threshold_msec = mongoc_uri_get_option_as_int32 (
-      topology->uri, "localthresholdms",
-      MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
+   topology->local_threshold_msec = mongoc_uri_get_local_threshold_option (topology->uri);
 
    /* Total time allowed to check a server is connectTimeoutMS.
     * Server Discovery And Monitoring Spec:

src/mongoc/mongoc-uri-private.h

@@ -39,6 +39,9 @@ bool
 mongoc_uri_parse_host            (      mongoc_uri_t  *uri,
                                   const char          *str);
 
+int32_t
+mongoc_uri_get_local_threshold_option (const mongoc_uri_t *uri);
+
 BSON_END_DECLS
 
 

src/mongoc/mongoc-uri.c

@@ -30,6 +30,7 @@
 #include "mongoc-log.h"
 #include "mongoc-handshake-private.h"
 #include "mongoc-socket.h"
+#include "mongoc-topology-private.h"
 #include "mongoc-uri-private.h"
 #include "mongoc-read-concern-private.h"
 #include "mongoc-write-concern-private.h"
@@ -1216,6 +1217,24 @@ mongoc_uri_set_appname (mongoc_uri_t *uri,
    return true;
 }
 
+/* can't use mongoc_uri_get_option_as_int32, it treats 0 specially */
+int32_t
+mongoc_uri_get_local_threshold_option (const mongoc_uri_t *uri)
+{
+   const bson_t *options;
+   bson_iter_t iter;
+   int32_t retval = MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS;
+
+   if ((options = mongoc_uri_get_options (uri)) &&
+       bson_iter_init_find_case (&iter, options, "localthresholdms") &&
+       BSON_ITER_HOLDS_INT32 (&iter)) {
+
+      retval = bson_iter_int32 (&iter);
+   }
+
+   return retval;
+}
+
 const bson_t *
 mongoc_uri_get_options (const mongoc_uri_t *uri)
 {

tests/test-mongoc-uri.c

@@ -1,6 +1,7 @@
 #include <mongoc.h>
 
 #include "mongoc-client-private.h"
+#include "mongoc-topology-private.h"
 #include "mongoc-uri-private.h"
 #include "mongoc-host-list-private.h"
 
@@ -415,7 +416,6 @@ test_mongoc_uri_functions (void)
    uri = mongoc_uri_new("mongodb://localhost/?serverselectiontimeoutms=3"
                            "&journal=true"
                            "&wtimeoutms=42"
-                           "&localthresholdms=17"
                            "&canonicalizeHostname=false");
 
    ASSERT_CMPINT(mongoc_uri_get_option_as_int32(uri, "serverselectiontimeoutms", 18), ==, 3);
@@ -426,10 +426,6 @@ test_mongoc_uri_functions (void)
    ASSERT(mongoc_uri_set_option_as_int32(uri, "wtimeoutms", 18));
    ASSERT_CMPINT(mongoc_uri_get_option_as_int32(uri, "wtimeoutms", 19), ==, 18);
 
-   ASSERT_CMPINT(mongoc_uri_get_option_as_int32(uri, "localthresholdms", 99), ==, 17);
-   ASSERT(mongoc_uri_set_option_as_int32(uri, "localthresholdms", 99));
-   ASSERT_CMPINT(mongoc_uri_get_option_as_int32(uri, "localthresholdms", 42), ==, 99);
-
    /* socketcheckintervalms isn't set, return our fallback */
    ASSERT_CMPINT(mongoc_uri_get_option_as_int32(uri, "socketcheckintervalms", 123), ==, 123);
    ASSERT(mongoc_uri_set_option_as_int32(uri, "socketcheckintervalms", 18));
@@ -833,6 +829,7 @@ test_mongoc_uri_read_concern (void)
    mongoc_uri_destroy (uri);
 }
 
+
 static void
 test_mongoc_uri_long_hostname (void)
 {
@@ -882,6 +879,32 @@ test_mongoc_uri_long_hostname (void)
    bson_free (host_and_port);
    bson_free (host);
 }
+test_mongoc_uri_local_threshold_ms (void)
+{
+   mongoc_uri_t *uri;
+
+   uri = mongoc_uri_new ("mongodb://localhost/");
+
+   /* localthresholdms isn't set, return the default */
+   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==,
+                  MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
+      ASSERT (
+      mongoc_uri_set_option_as_int32 (uri, "localthresholdms", 99));
+   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==, 99);
+
+   mongoc_uri_destroy(uri);
+
+
+   uri = mongoc_uri_new ("mongodb://localhost/?localthresholdms=0");
+
+   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==, 0);
+      ASSERT (
+      mongoc_uri_set_option_as_int32 (uri, "localthresholdms", 99));
+   ASSERT_CMPINT (mongoc_uri_get_local_threshold_option (uri), ==, 99);
+
+   mongoc_uri_destroy(uri);
+}
+
 
 void
 test_uri_install (TestSuite *suite)
@@ -896,4 +919,5 @@ test_uri_install (TestSuite *suite)
    TestSuite_Add (suite, "/Uri/functions", test_mongoc_uri_functions);
    TestSuite_Add (suite, "/Uri/compound_setters", test_mongoc_uri_compound_setters);
    TestSuite_Add (suite, "/Uri/long_hostname", test_mongoc_uri_long_hostname);
+   TestSuite_Add (suite, "/Uri/local_threshold_ms", test_mongoc_uri_local_threshold_ms);
 }