rebase fixes

Author: kevinAlbs

src/libmongoc/src/mongoc/mongoc-cmd.c

@@ -628,7 +628,6 @@ _mongoc_cmd_parts_assemble_mongod (mongoc_cmd_parts_t *parts,
       case MONGOC_TOPOLOGY_UNKNOWN:
       case MONGOC_TOPOLOGY_LOAD_BALANCED:
       case MONGOC_TOPOLOGY_DESCRIPTION_TYPES:
-      case MONGOC_TOPOLOGY_LOADBALANCED:
       default:
          /* must not call this function w/ sharded, load balanced, or unknown topology type */
          BSON_ASSERT (false);

src/libmongoc/src/mongoc/mongoc-topology-background-monitoring.c

@@ -146,7 +146,7 @@ _mongoc_topology_background_monitoring_start (mongoc_topology_t *topology)
 
    _mongoc_handshake_freeze ();
    _mongoc_topology_description_monitor_opening (&topology->description);
-   if (topology->description.type == MONGOC_TOPOLOGY_LOADBALANCED) {
+   if (topology->description.type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
       /* Do not proceed to start monitoring threads. */
       return;
    }

src/libmongoc/src/mongoc/mongoc-topology-description-apm.c

@@ -122,7 +122,7 @@ _mongoc_topology_description_monitor_opening (mongoc_topology_description_t *td)
     * - emit a server changed event Unknown => LoadBalancer
     * - emit a topology changed event
     */
-   if (td->type == MONGOC_TOPOLOGY_LOADBALANCED) {
+   if (td->type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
       mongoc_server_description_t *prev_sd;
 
       /* LoadBalanced deployments must have exactly one host listed. */
@@ -134,7 +134,7 @@ _mongoc_topology_description_monitor_opening (mongoc_topology_description_t *td)
          mongoc_topology_description_destroy (prev_td);
          _mongoc_topology_description_copy_to (td, prev_td);
       }
-      sd->type = MONGOC_SERVER_LOADBALANCER;
+      sd->type = MONGOC_SERVER_LOAD_BALANCER;
       _mongoc_topology_description_monitor_server_changed (td, prev_sd, sd);
       mongoc_server_description_destroy (prev_sd);
       if (td->apm_callbacks.topology_changed) {
@@ -175,7 +175,7 @@ _mongoc_topology_description_monitor_closed (
    if (td->apm_callbacks.topology_closed) {
       mongoc_apm_topology_closed_t event;
 
-      if (td->type == MONGOC_TOPOLOGY_LOADBALANCED) {
+      if (td->type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
          mongoc_server_description_t *sd;
 
          /* LoadBalanced deployments must have exactly one host listed. */

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

@@ -353,8 +353,8 @@ _mongoc_topology_description_server_is_candidate (
          return false;
       }
 
-   case MONGOC_TOPOLOGY_LOADBALANCED:
-      return desc_type == MONGOC_SERVER_LOADBALANCER;
+   case MONGOC_TOPOLOGY_LOAD_BALANCED:
+      return desc_type == MONGOC_SERVER_LOAD_BALANCER;
 
    default:
       return false;
@@ -718,7 +718,7 @@ mongoc_topology_description_suitable_servers (
 
    /* Load balanced clusters --
     * Always select the only server. */
-   if (topology->type == MONGOC_TOPOLOGY_LOADBALANCED) {
+   if (topology->type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
       BSON_ASSERT (topology->servers->items_len == 1);
       server = (mongoc_server_description_t *) mongoc_set_get_item (
          topology->servers, 0);
@@ -1807,7 +1807,7 @@ _mongoc_topology_description_type (mongoc_topology_description_t *topology)
       return "RSWithPrimary";
    case MONGOC_TOPOLOGY_SINGLE:
       return "Single";
-   case MONGOC_TOPOLOGY_LOADBALANCED:
+   case MONGOC_TOPOLOGY_LOAD_BALANCED:
       return "LoadBalanced";
    case MONGOC_TOPOLOGY_DESCRIPTION_TYPES:
    default:

src/libmongoc/src/mongoc/mongoc-topology.c

@@ -1011,7 +1011,7 @@ mongoc_topology_select_server_id (mongoc_topology_t *topology,
    if (topology->single_threaded) {
       _mongoc_topology_description_monitor_opening (&topology->description);
 
-      if (topology->description.type == MONGOC_TOPOLOGY_LOADBALANCED) {
+      if (topology->description.type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
          /* Bypass server selection loop. Always select the only server. */
          // LBTODO: this will not work for PHP. Single threaded server selection must imply connection establishment.
          selected_server = mongoc_topology_description_select (
@@ -1123,7 +1123,7 @@ mongoc_topology_select_server_id (mongoc_topology_t *topology,
       selected_server = mongoc_topology_description_select (
          &topology->description, optype, read_prefs, local_threshold_ms);
 
-      if (topology->description.type == MONGOC_TOPOLOGY_LOADBALANCED) {
+      if (topology->description.type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
          /* Bypass server selection loop. Always select the only server. */
          if (!selected_server) {
             bson_mutex_unlock (&topology->mutex);

src/libmongoc/tests/json-test.c

@@ -53,7 +53,7 @@ topology_type_from_test (const char *type)
    } else if (strcmp (type, "Sharded") == 0) {
       return MONGOC_TOPOLOGY_SHARDED;
    } else if (strcmp (type, "LoadBalanced") == 0) {
-      return MONGOC_TOPOLOGY_LOADBALANCED;
+      return MONGOC_TOPOLOGY_LOAD_BALANCED;
    }
 
    fprintf (stderr, "can't parse this: %s", type);
@@ -83,7 +83,7 @@ server_type_from_test (const char *type)
    } else if (strcmp (type, "Unknown") == 0) {
       return MONGOC_SERVER_UNKNOWN;
    } else if (strcmp (type, "LoadBalancer") == 0) {
-      return MONGOC_SERVER_LOADBALANCER;
+      return MONGOC_SERVER_LOAD_BALANCER;
    }
    fprintf (stderr, "ERROR: Unknown server type %s\n", type);
    BSON_ASSERT (0);