Vendor in libmongoc latest (#658)

Author: kmahar

Sources/CLibMongoC/include/CLibMongoC_mongoc-apm.h

@@ -99,6 +99,9 @@ mongoc_apm_command_started_get_host (const mongoc_apm_command_started_t *event);
 MONGOC_EXPORT (uint32_t)
 mongoc_apm_command_started_get_server_id (
    const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_started_get_service_id (
+   const mongoc_apm_command_started_t *event);
 MONGOC_EXPORT (void *)
 mongoc_apm_command_started_get_context (
    const mongoc_apm_command_started_t *event);
@@ -126,6 +129,9 @@ mongoc_apm_command_succeeded_get_host (
 MONGOC_EXPORT (uint32_t)
 mongoc_apm_command_succeeded_get_server_id (
    const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_succeeded_get_service_id (
+   const mongoc_apm_command_succeeded_t *event);
 MONGOC_EXPORT (void *)
 mongoc_apm_command_succeeded_get_context (
    const mongoc_apm_command_succeeded_t *event);
@@ -155,6 +161,9 @@ mongoc_apm_command_failed_get_host (const mongoc_apm_command_failed_t *event);
 MONGOC_EXPORT (uint32_t)
 mongoc_apm_command_failed_get_server_id (
    const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_failed_get_service_id (
+   const mongoc_apm_command_failed_t *event);
 MONGOC_EXPORT (void *)
 mongoc_apm_command_failed_get_context (
    const mongoc_apm_command_failed_t *event);

Sources/CLibMongoC/include/CLibMongoC_mongoc-client-session.h

@@ -91,6 +91,12 @@ mongoc_session_opts_set_causal_consistency (mongoc_session_opt_t *opts,
 MONGOC_EXPORT (bool)
 mongoc_session_opts_get_causal_consistency (const mongoc_session_opt_t *opts);
 
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_snapshot (mongoc_session_opt_t *opts, bool snapshot);
+
+MONGOC_EXPORT (bool)
+mongoc_session_opts_get_snapshot (const mongoc_session_opt_t *opts);
+
 MONGOC_EXPORT (void)
 mongoc_session_opts_set_default_transaction_opts (
    mongoc_session_opt_t *opts, const mongoc_transaction_opt_t *txn_opts);

Sources/CLibMongoC/include/CLibMongoC_mongoc-client.h

@@ -274,6 +274,12 @@ mongoc_client_set_server_api (mongoc_client_t *client,
                               const mongoc_server_api_t *api,
                               bson_error_t *error);
 
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_get_handshake_description (mongoc_client_t *client,
+                                         uint32_t server_id,
+                                         bson_t *opts,
+                                         bson_error_t *error);
+
 BSON_END_DECLS
 
 

Sources/CLibMongoC/include/CLibMongoC_mongoc-error.h

@@ -131,7 +131,9 @@ typedef enum {
    MONGOC_ERROR_CLIENT_API_ALREADY_SET,
    MONGOC_ERROR_CLIENT_API_FROM_POOL,
    MONGOC_ERROR_POOL_API_ALREADY_SET,
-   MONGOC_ERROR_POOL_API_TOO_LATE
+   MONGOC_ERROR_POOL_API_TOO_LATE,
+
+   MONGOC_ERROR_CLIENT_INVALID_LOAD_BALANCER,
 } mongoc_error_code_t;
 
 MONGOC_EXPORT (bool)

Sources/CLibMongoC/include/CLibMongoC_mongoc-uri.h

@@ -44,6 +44,7 @@
 #define MONGOC_URI_GSSAPISERVICENAME "gssapiservicename"
 #define MONGOC_URI_HEARTBEATFREQUENCYMS "heartbeatfrequencyms"
 #define MONGOC_URI_JOURNAL "journal"
+#define MONGOC_URI_LOADBALANCED "loadbalanced"
 #define MONGOC_URI_LOCALTHRESHOLDMS "localthresholdms"
 #define MONGOC_URI_MAXIDLETIMEMS "maxidletimems"
 #define MONGOC_URI_MAXPOOLSIZE "maxpoolsize"

Sources/CLibMongoC/mongoc/mongoc-apm-private.h

@@ -55,6 +55,7 @@ struct _mongoc_apm_command_started_t {
    int64_t operation_id;
    const mongoc_host_list_t *host;
    uint32_t server_id;
+   bson_oid_t service_id;
    void *context;
 };
 
@@ -67,6 +68,7 @@ struct _mongoc_apm_command_succeeded_t {
    int64_t operation_id;
    const mongoc_host_list_t *host;
    uint32_t server_id;
+   bson_oid_t service_id;
    void *context;
 };
 
@@ -80,6 +82,7 @@ struct _mongoc_apm_command_failed_t {
    int64_t operation_id;
    const mongoc_host_list_t *host;
    uint32_t server_id;
+   bson_oid_t service_id;
    void *context;
 };
 
@@ -155,6 +158,7 @@ mongoc_apm_command_started_init (mongoc_apm_command_started_t *event,
                                  int64_t operation_id,
                                  const mongoc_host_list_t *host,
                                  uint32_t server_id,
+                                 const bson_oid_t *service_id,
                                  bool *is_redacted, /* out */
                                  void *context);
 
@@ -177,6 +181,7 @@ mongoc_apm_command_succeeded_init (mongoc_apm_command_succeeded_t *event,
                                    int64_t operation_id,
                                    const mongoc_host_list_t *host,
                                    uint32_t server_id,
+                                   const bson_oid_t *service_id,
                                    bool force_redaction,
                                    void *context);
 
@@ -193,6 +198,7 @@ mongoc_apm_command_failed_init (mongoc_apm_command_failed_t *event,
                                 int64_t operation_id,
                                 const mongoc_host_list_t *host,
                                 uint32_t server_id,
+                                const bson_oid_t *service_id,
                                 bool force_redaction,
                                 void *context);
 

Sources/CLibMongoC/mongoc/mongoc-apm.c

@@ -19,6 +19,8 @@
 #include "mongoc-cmd-private.h"
 #include "mongoc-handshake-private.h"
 
+static bson_oid_t kObjectIdZero = {{0}};
+
 /*
  * An Application Performance Management (APM) implementation, complying with
  * MongoDB's Command Monitoring Spec:
@@ -74,6 +76,7 @@ mongoc_apm_command_started_init (mongoc_apm_command_started_t *event,
                                  int64_t operation_id,
                                  const mongoc_host_list_t *host,
                                  uint32_t server_id,
+                                 const bson_oid_t *service_id,
                                  bool *is_redacted, /* out */
                                  void *context)
 {
@@ -129,6 +132,8 @@ mongoc_apm_command_started_init (mongoc_apm_command_started_t *event,
    event->host = host;
    event->server_id = server_id;
    event->context = context;
+
+   bson_oid_copy_unsafe (service_id, &event->service_id);
 }
 
 
@@ -159,6 +164,7 @@ mongoc_apm_command_started_init_with_cmd (mongoc_apm_command_started_t *event,
                                     cmd->operation_id,
                                     &cmd->server_stream->sd->host,
                                     cmd->server_stream->sd->id,
+                                    &cmd->server_stream->sd->service_id,
                                     is_redacted,
                                     context);
 
@@ -197,6 +203,7 @@ mongoc_apm_command_succeeded_init (mongoc_apm_command_succeeded_t *event,
                                    int64_t operation_id,
                                    const mongoc_host_list_t *host,
                                    uint32_t server_id,
+                                   const bson_oid_t *service_id,
                                    bool force_redaction,
                                    void *context)
 {
@@ -220,6 +227,8 @@ mongoc_apm_command_succeeded_init (mongoc_apm_command_succeeded_t *event,
    event->host = host;
    event->server_id = server_id;
    event->context = context;
+
+   bson_oid_copy_unsafe (service_id, &event->service_id);
 }
 
 
@@ -254,6 +263,7 @@ mongoc_apm_command_failed_init (mongoc_apm_command_failed_t *event,
                                 int64_t operation_id,
                                 const mongoc_host_list_t *host,
                                 uint32_t server_id,
+                                const bson_oid_t *service_id,
                                 bool force_redaction,
                                 void *context)
 {
@@ -278,6 +288,8 @@ mongoc_apm_command_failed_init (mongoc_apm_command_failed_t *event,
    event->host = host;
    event->server_id = server_id;
    event->context = context;
+
+   bson_oid_copy_unsafe (service_id, &event->service_id);
 }
 
 
@@ -351,6 +363,19 @@ mongoc_apm_command_started_get_server_id (
 }
 
 
+const bson_oid_t *
+mongoc_apm_command_started_get_service_id (
+   const mongoc_apm_command_started_t *event)
+{
+   if (0 == bson_oid_compare (&event->service_id, &kObjectIdZero)) {
+      /* serviceId is unset. */
+      return NULL;
+   }
+
+   return &event->service_id;
+}
+
+
 void *
 mongoc_apm_command_started_get_context (
    const mongoc_apm_command_started_t *event)
@@ -417,6 +442,19 @@ mongoc_apm_command_succeeded_get_server_id (
 }
 
 
+const bson_oid_t *
+mongoc_apm_command_succeeded_get_service_id (
+   const mongoc_apm_command_succeeded_t *event)
+{
+   if (0 == bson_oid_compare (&event->service_id, &kObjectIdZero)) {
+      /* serviceId is unset. */
+      return NULL;
+   }
+
+   return &event->service_id;
+}
+
+
 void *
 mongoc_apm_command_succeeded_get_context (
    const mongoc_apm_command_succeeded_t *event)
@@ -487,6 +525,19 @@ mongoc_apm_command_failed_get_server_id (
 }
 
 
+const bson_oid_t *
+mongoc_apm_command_failed_get_service_id (
+   const mongoc_apm_command_failed_t *event)
+{
+   if (0 == bson_oid_compare (&event->service_id, &kObjectIdZero)) {
+      /* serviceId is unset. */
+      return NULL;
+   }
+
+   return &event->service_id;
+}
+
+
 void *
 mongoc_apm_command_failed_get_context (const mongoc_apm_command_failed_t *event)
 {

Sources/CLibMongoC/mongoc/mongoc-change-stream.c

@@ -15,6 +15,7 @@
  */
 
 #include <CLibMongoC_bson.h>
+#include "mongoc-cluster-private.h"
 #include "mongoc-change-stream-private.h"
 #include "mongoc-collection-private.h"
 #include "mongoc-client-private.h"
@@ -239,23 +240,12 @@ _make_cursor (mongoc_change_stream_t *stream)
    bson_t reply;
    bson_t getmore_opts = BSON_INITIALIZER;
    bson_iter_t iter;
-   mongoc_server_description_t *sd;
-   uint32_t server_id;
+   mongoc_server_stream_t *server_stream;
 
    BSON_ASSERT (stream);
    BSON_ASSERT (!stream->cursor);
    bson_init (&command);
    bson_copy_to (&(stream->opts.extra), &command_opts);
-   sd = mongoc_client_select_server (
-      stream->client, false /* for_writes */, stream->read_prefs, &stream->err);
-   if (!sd) {
-      goto cleanup;
-   }
-   server_id = mongoc_server_description_id (sd);
-   bson_append_int32 (&command_opts, "serverId", 8, server_id);
-   bson_append_int32 (&getmore_opts, "serverId", 8, server_id);
-   stream->max_wire_version = sd->max_wire_version;
-   mongoc_server_description_destroy (sd);
 
    if (bson_iter_init_find (&iter, &command_opts, "sessionId")) {
       if (!_mongoc_client_session_from_iter (
@@ -293,6 +283,19 @@ _make_cursor (mongoc_change_stream_t *stream)
       goto cleanup;
    }
 
+   server_stream = mongoc_cluster_stream_for_reads (
+      &stream->client->cluster, stream->read_prefs, cs, &reply, &stream->err);
+   if (!server_stream) {
+      bson_destroy (&stream->err_doc);
+      bson_copy_to (&reply, &stream->err_doc);
+      bson_destroy (&reply);
+      goto cleanup;
+   }
+   bson_append_int32 (&command_opts, "serverId", 8, server_stream->sd->id);
+   bson_append_int32 (&getmore_opts, "serverId", 8, server_stream->sd->id);
+   stream->max_wire_version = server_stream->sd->max_wire_version;
+   mongoc_server_stream_cleanup (server_stream);
+
    if (stream->read_concern && !bson_has_field (&command_opts, "readConcern")) {
       mongoc_read_concern_append (stream->read_concern, &command_opts);
    }

Sources/CLibMongoC/mongoc/mongoc-client-private.h

@@ -94,6 +94,8 @@ BSON_BEGIN_DECLS
 #define WIRE_VERSION_4_9 12
 /* version corresponding to server 5.0 release */
 #define WIRE_VERSION_5_0 13
+/* first version to support snapshot reads */
+#define WIRE_VERSION_SNAPSHOT_READS 13
 
 struct _mongoc_collection_t;
 
@@ -146,22 +148,10 @@ typedef enum {
 BSON_STATIC_ASSERT2 (mongoc_cmd_rw,
                      MONGOC_CMD_RW == (MONGOC_CMD_READ | MONGOC_CMD_WRITE));
 
-typedef enum { MONGOC_RR_SRV, MONGOC_RR_TXT } mongoc_rr_type_t;
-
-typedef struct _mongoc_rr_data_t {
-   /* Number of records returned by DNS. */
-   uint32_t count;
-
-   /* Set to lowest TTL found when polling SRV records. */
-   uint32_t min_ttl;
-
-   /* Set to the resulting host list when polling SRV records */
-   mongoc_host_list_t *hosts;
-
-   /* Set to the TXT record when polling for TXT */
-   char *txt_record_opts;
-} mongoc_rr_data_t;
 
+/* TODO (CDRIVER-4052): Move MONGOC_RR_DEFAULT_BUFFER_SIZE and
+ * _mongoc_client_get_rr to mongoc-topology-private.h or in a separate file.
+ * There is no reason these should be in mongoc-client. */
 #define MONGOC_RR_DEFAULT_BUFFER_SIZE 1024
 bool
 _mongoc_client_get_rr (const char *service,

Sources/CLibMongoC/mongoc/mongoc-client-session-private.h

@@ -38,13 +38,9 @@ struct _mongoc_transaction_opt_t {
    int64_t max_commit_time_ms;
 };
 
-typedef enum {
-   MONGOC_SESSION_NO_OPTS = 0,
-   MONGOC_SESSION_CAUSAL_CONSISTENCY = (1 << 0),
-} mongoc_session_flag_t;
-
 struct _mongoc_session_opt_t {
-   mongoc_session_flag_t flags;
+   mongoc_optional_t causal_consistency;
+   mongoc_optional_t snapshot;
    mongoc_transaction_opt_t default_txn_opts;
 };
 
@@ -83,6 +79,9 @@ struct _mongoc_client_session_t {
    uint32_t client_generation;
    uint32_t server_id;
    bson_t *recovery_token;
+   uint32_t snapshot_time_timestamp;
+   uint32_t snapshot_time_increment;
+   bool snapshot_time_set;
 
    /* For testing only */
    int64_t with_txn_timeout_ms;
@@ -100,6 +99,7 @@ _mongoc_cluster_time_greater (const bson_t *new, const bson_t *old);
 void
 _mongoc_client_session_handle_reply (mongoc_client_session_t *session,
                                      bool is_acknowledged,
+                                     const char *cmd_name,
                                      const bson_t *reply);
 
 mongoc_server_session_t *
@@ -152,5 +152,12 @@ void
 _mongoc_client_session_pin (mongoc_client_session_t *session,
                             uint32_t server_id);
 
+void
+_mongoc_client_session_set_snapshot_time (mongoc_client_session_t *session,
+                                          uint32_t t,
+                                          uint32_t i);
+
+void
+_mongoc_client_session_clear_snapshot_time (mongoc_client_session_t *session);
 
 #endif /* MONGOC_CLIENT_SESSION_PRIVATE_H */