CDRIVER-3974 Append Versioned API options to all commands (#792)

Author: alcaeus

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

@@ -785,22 +785,6 @@ _is_retryable_read (const mongoc_cmd_parts_t *parts,
 }
 
 
-static bool
-_txn_in_progress (mongoc_cmd_parts_t *parts)
-{
-   mongoc_client_session_t *cs;
-
-   cs = parts->prohibit_lsid ? NULL : parts->assembled.session;
-   if (!cs) {
-      return false;
-   }
-
-   return (_mongoc_client_session_txn_in_progress (cs)
-      /* commitTransaction and abortTransaction count as in progress, too. */
-      || parts->assembled.is_txn_finish);
-}
-
-
 /*
  *--------------------------------------------------------------------------
  *
@@ -988,13 +972,10 @@ mongoc_cmd_parts_assemble (mongoc_cmd_parts_t *parts,
             &parts->assembled_body, "$clusterTime", 12, cluster_time);
       }
 
-      /* Add versioned server api, if it is set. Do not add api if we are
-         sending a getmore, or if we are in a transaction. */
+      /* Add versioned server api, if it is set. */
       if (parts->client->api) {
-         if (!is_get_more && !_txn_in_progress (parts)) {
-            _mongoc_cmd_append_server_api (&parts->assembled_body,
-                                           parts->client->api);
-         }
+         _mongoc_cmd_append_server_api (&parts->assembled_body,
+                                        parts->client->api);
       }
 
       if (!is_get_more) {

src/libmongoc/tests/json/versioned_api/crud-api-version-1-strict.json

@@ -651,7 +651,7 @@
       ]
     },
     {
-      "description": "find command with declared API version appends to the command, but getMore does not",
+      "description": "find and getMore append API version",
       "operations": [
         {
           "name": "find",
@@ -712,14 +712,10 @@
                       "long"
                     ]
                   },
-                  "apiVersion": {
-                    "$$exists": false
-                  },
-                  "apiStrict": {
-                    "$$exists": false
-                  },
+                  "apiVersion": "1",
+                  "apiStrict": true,
                   "apiDeprecationErrors": {
-                    "$$exists": false
+                    "$$unsetOrMatches": false
                   }
                 }
               }
@@ -1111,4 +1107,4 @@
       ]
     }
   ]
-}
+}

src/libmongoc/tests/json/versioned_api/crud-api-version-1.json

@@ -599,7 +599,7 @@
       ]
     },
     {
-      "description": "estimatedDocumentCount appends declared API version",
+      "description": "estimatedDocumentCount appends declared API version on 4.9.0 or greater",
       "operations": [
         {
           "name": "estimatedDocumentCount",
@@ -643,7 +643,7 @@
       ]
     },
     {
-      "description": "find command with declared API version appends to the command, but getMore does not",
+      "description": "find and getMore append API version",
       "operations": [
         {
           "name": "find",
@@ -704,15 +704,11 @@
                       "long"
                     ]
                   },
-                  "apiVersion": {
-                    "$$exists": false
-                  },
+                  "apiVersion": "1",
                   "apiStrict": {
-                    "$$exists": false
+                    "$$unsetOrMatches": false
                   },
-                  "apiDeprecationErrors": {
-                    "$$exists": false
-                  }
+                  "apiDeprecationErrors": true
                 }
               }
             }
@@ -1103,4 +1099,4 @@
       ]
     }
   ]
-}
+}

src/libmongoc/tests/json/versioned_api/test-commands-deprecation-errors.json

@@ -71,4 +71,4 @@
       ]
     }
   ]
-}
+}