[CDRIVER-4404] mongocrypt queryType option is now a string (#1042)

Author: vector-of-bool

src/libmongoc/doc/mongoc_client_encryption_encrypt_opts_set_query_type.rst

@@ -8,16 +8,18 @@ Synopsis
 
 .. code-block:: c
 
-   typedef enum { MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY } mongoc_encrypt_query_type_t;
+   #define MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY "equality"
 
    MONGOC_EXPORT (void)
     mongoc_client_encryption_encrypt_opts_set_query_type (
-        mongoc_client_encryption_encrypt_opts_t *opts, mongoc_encrypt_query_type_t query_type);
+        mongoc_client_encryption_encrypt_opts_t *opts, const char* query_type);
 
 .. important:: |qenc:api-is-experimental|
 .. versionadded:: 1.22.0
 
-Sets a query type for explicit encryption.
+Sets a query type for explicit encryption. Currently, the only supported value
+for ``query_type`` is ``"equality"``.
+
 Only applies when the algorithm set by :symbol:`mongoc_client_encryption_encrypt_opts_set_algorithm()` is "Indexed".
 It is an error to set the query type when algorithm is not "Indexed".
 

src/libmongoc/src/mongoc/mongoc-client-side-encryption.c

@@ -405,10 +405,7 @@ struct _mongoc_client_encryption_encrypt_opts_t {
       int64_t value;
       bool set;
    } contention_factor;
-   struct {
-      mongoc_encrypt_query_type_t value;
-      bool set;
-   } query_type;
+   char *query_type;
 };
 
 mongoc_client_encryption_encrypt_opts_t *
@@ -427,6 +424,7 @@ mongoc_client_encryption_encrypt_opts_destroy (
    bson_value_destroy (&opts->keyid);
    bson_free (opts->algorithm);
    bson_free (opts->keyaltname);
+   bson_free (opts->query_type);
    bson_free (opts);
 }
 
@@ -481,14 +479,13 @@ mongoc_client_encryption_encrypt_opts_set_contention_factor (
 
 void
 mongoc_client_encryption_encrypt_opts_set_query_type (
-   mongoc_client_encryption_encrypt_opts_t *opts,
-   mongoc_encrypt_query_type_t query_type)
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *query_type)
 {
    if (!opts) {
       return;
    }
-   opts->query_type.value = query_type;
-   opts->query_type.set = true;
+   bson_free (opts->query_type);
+   opts->query_type = query_type ? bson_strdup (query_type) : NULL;
 }
 
 /*--------------------------------------------------------------------------
@@ -2422,7 +2419,6 @@ mongoc_client_encryption_remove_key_alt_name (
       }
    }
 
-fail:
    bson_destroy (&query);
    bson_destroy (&local_reply);
 
@@ -2511,7 +2507,7 @@ mongoc_client_encryption_encrypt (mongoc_client_encryption_t *client_encryption,
           opts->algorithm,
           &opts->keyid,
           opts->keyaltname,
-          opts->query_type.set ? &opts->query_type.value : NULL,
+          opts->query_type,
           opts->contention_factor.set ? &opts->contention_factor.value : NULL,
           value,
           ciphertext,

src/libmongoc/src/mongoc/mongoc-client-side-encryption.h

@@ -33,6 +33,9 @@ struct _mongoc_cursor_t;
 #define MONGOC_ENCRYPT_ALGORITHM_INDEXED "Indexed"
 #define MONGOC_ENCRYPT_ALGORITHM_UNINDEXED "Unindexed"
 
+#define MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY "equality"
+
+
 BSON_BEGIN_DECLS
 
 typedef struct _mongoc_auto_encryption_opts_t mongoc_auto_encryption_opts_t;
@@ -237,12 +240,9 @@ MONGOC_EXPORT (void)
 mongoc_client_encryption_encrypt_opts_set_contention_factor (
    mongoc_client_encryption_encrypt_opts_t *opts, int64_t contention_factor);
 
-typedef enum { MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY } mongoc_encrypt_query_type_t;
-
 MONGOC_EXPORT (void)
 mongoc_client_encryption_encrypt_opts_set_query_type (
-   mongoc_client_encryption_encrypt_opts_t *opts,
-   mongoc_encrypt_query_type_t query_type);
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *query_type);
 
 MONGOC_EXPORT (mongoc_client_encryption_datakey_opts_t *)
 mongoc_client_encryption_datakey_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;

src/libmongoc/src/mongoc/mongoc-crypt-private.h

@@ -89,7 +89,7 @@ _mongoc_crypt_explicit_encrypt (_mongoc_crypt_t *crypt,
                                 const char *algorithm,
                                 const bson_value_t *keyid,
                                 char *keyaltname,
-                                const mongoc_encrypt_query_type_t *query_type,
+                                const char *query_type,
                                 const int64_t *contention_factor,
                                 const bson_value_t *value_in,
                                 bson_value_t *value_out,

src/libmongoc/src/mongoc/mongoc-crypt.c

@@ -994,8 +994,8 @@ _mongoc_crypt_new (const bson_t *kms_providers,
       const char *s =
          mongocrypt_crypt_shared_lib_version_string (crypt->handle, &len);
       if (!s || len == 0) {
-         // empty/null version string indicates that crypt_shared was not loaded by
-         // libmongocrypt
+         // empty/null version string indicates that crypt_shared was not loaded
+         // by libmongocrypt
          bson_set_error (
             error,
             MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION,
@@ -1132,7 +1132,7 @@ _mongoc_crypt_explicit_encrypt (_mongoc_crypt_t *crypt,
                                 const char *algorithm,
                                 const bson_value_t *keyid,
                                 char *keyaltname,
-                                const mongoc_encrypt_query_type_t *query_type,
+                                const char *query_type,
                                 const int64_t *contention_factor,
                                 const bson_value_t *value_in,
                                 bson_value_t *value_out,
@@ -1156,38 +1156,14 @@ _mongoc_crypt_explicit_encrypt (_mongoc_crypt_t *crypt,
       goto fail;
    }
 
-   if (NULL != algorithm &&
-       0 == strcmp (algorithm, MONGOC_ENCRYPT_ALGORITHM_INDEXED)) {
-      if (!mongocrypt_ctx_setopt_index_type (state_machine->ctx,
-                                             MONGOCRYPT_INDEX_TYPE_EQUALITY)) {
-         _ctx_check_error (state_machine->ctx, error, true);
-         goto fail;
-      }
-   } else if (NULL != algorithm &&
-              0 == strcmp (algorithm, MONGOC_ENCRYPT_ALGORITHM_UNINDEXED)) {
-      if (!mongocrypt_ctx_setopt_index_type (state_machine->ctx,
-                                             MONGOCRYPT_INDEX_TYPE_NONE)) {
-         _ctx_check_error (state_machine->ctx, error, true);
-         goto fail;
-      }
-   } else {
-      if (!mongocrypt_ctx_setopt_algorithm (
-             state_machine->ctx, algorithm, -1)) {
-         _ctx_check_error (state_machine->ctx, error, true);
-         goto fail;
-      }
+   if (!mongocrypt_ctx_setopt_algorithm (state_machine->ctx, algorithm, -1)) {
+      _ctx_check_error (state_machine->ctx, error, true);
+      goto fail;
    }
 
    if (query_type != NULL) {
-      mongocrypt_query_type_t converted = 0;
-
-      switch (*query_type) {
-      case MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY:
-         converted = MONGOCRYPT_QUERY_TYPE_EQUALITY;
-         break;
-      }
-      if (!mongocrypt_ctx_setopt_query_type (state_machine->ctx, converted)) {
-         _ctx_check_error (state_machine->ctx, error, true);
+      if (!mongocrypt_ctx_setopt_query_type (
+             state_machine->ctx, query_type, -1)) {
          goto fail;
       }
    }