SERVER-63850: Add the count command to API version 1

4 files changed, 43 insertions, 34 deletions

diff --git a/src/mongo/db/query/count_command.idl b/src/mongo/db/query/count_command.idl
index 85e6579555d..ef31d939ceb 100644
--- a/src/mongo/db/query/count_command.idl
+++ b/src/mongo/db/query/count_command.idl
@@ -29,10 +29,14 @@
 global:
     cpp_namespace: "mongo"
     cpp_includes:
+        - "mongo/db/namespace_string.h"
         - "mongo/db/query/count_request.h"
+        - "mongo/db/query/max_time_ms_parser.h"
 
 imports:
     - "mongo/idl/basic_types.idl"
+    - "mongo/db/auth/action_type.idl"
+    - "mongo/db/auth/access_checks.idl"
     - "mongo/db/query/hint.idl"
 
 types:
@@ -42,17 +46,11 @@ types:
         cpp_type: "std::int64_t"
         deserializer: ::count_request::countParseLimit
 
-    countSkip:
-        bson_serialization_type: any
-        description: "An int value for skip. Must be positive."
-        cpp_type: "std::int64_t"
-        deserializer: ::count_request::countParseSkip
-
     maxTimeMS:
         bson_serialization_type: any
         description: "An int representing max time ms."
-        cpp_type: "std::int64_t"
-        deserializer: ::count_request::countParseMaxTime
+        cpp_type: "std::int32_t"
+        deserializer: "::mongo::parseMaxTimeMSForIDL"
 
 commands:
     count:
@@ -61,43 +59,64 @@ commands:
         cpp_name: CountCommandRequest
         strict: true
         namespace: concatenate_with_db_or_uuid
-        api_version: ""
+        api_version: "1"
+        access_check:
+            complex:
+                - check: is_authorized_to_parse_namespace_element
+                - privilege:
+                    resource_pattern: exact_namespace
+                    action_type: find
+                - privilege:
+                    resource_pattern: cluster
+                    action_type: useUUID
+        # Dummy reply type as we won't use it to parse the count reply.
+        reply_type: OkReply
         fields:
             query:
                 description: "A query that selects which documents to count in the collection or
                 view."
                 type: object
                 default: BSONObj()
+                unstable: false
             limit:
                 description: "The maximum number of matching documents to count."
                 type: countLimit
                 optional: true
+                unstable: false
             skip:
                 description: "The number of matching documents to skip before counting subsequent
                     results."
-                type: countSkip
+                type: safeInt64
                 optional: true
+                validator: { gte: 0 }
+                unstable: false
             hint:
                 description: "The index name to use or the index specification document."
                 type: indexHint
                 default: BSONObj()
+                unstable: false
             collation:
                 description: "The collation to use in the count command."
                 type: object
                 optional: true
+                unstable: false
             fields:
                 description: "A BSONObj added by the shell. Left in for backwards compatibility."
                 type: object
                 ignore: true
+                unstable: true
             readConcern:
                 description: "A BSONObj read concern."
                 type: object
                 optional: true
+                unstable: false
             maxTimeMS:
                 type: maxTimeMS
                 optional: true
+                unstable: false
             $queryOptions:
                 description: "Unwrapped read preference."
                 cpp_name: queryOptions
                 type: object
                 optional: true
+                unstable: false
diff --git a/src/mongo/db/query/count_command_test.cpp b/src/mongo/db/query/count_command_test.cpp
index c0039f46a3d..da0326746a3 100644
--- a/src/mongo/db/query/count_command_test.cpp
+++ b/src/mongo/db/query/count_command_test.cpp
@@ -117,6 +117,19 @@ TEST(CountCommandTest, LimitCannotBeMinLong) {
         CountCommandRequest::parse(ctxt, commandObj), AssertionException, ErrorCodes::BadValue);
 }
 
+TEST(CountCommandTest, FailLargerThan32BitMaxTimeMS) {
+    const long long kLargerThan32BitInt =
+        static_cast<long long>(std::numeric_limits<int>::max()) + 1;
+    auto commandObj = BSON("count"
+                           << "TestColl"
+                           << "$db"
+                           << "TestDB"
+                           << "maxTimeMS" << kLargerThan32BitInt);
+
+    ASSERT_THROWS_CODE(
+        CountCommandRequest::parse(ctxt, commandObj), AssertionException, ErrorCodes::BadValue);
+}
+
 TEST(CountCommandTest, FailParseBadSkipValue) {
     ASSERT_THROWS_CODE(CountCommandRequest::parse(ctxt,
                                                   BSON("count"
@@ -126,7 +139,7 @@ TEST(CountCommandTest, FailParseBadSkipValue) {
                                                        << "query" << BSON("a" << BSON("$gte" << 11))
                                                        << "skip" << -1000)),
                        AssertionException,
-                       ErrorCodes::FailedToParse);
+                       51024);
 }
 
 TEST(CountCommandTest, FailParseBadCollationType) {
diff --git a/src/mongo/db/query/count_request.cpp b/src/mongo/db/query/count_request.cpp
index 0b6f1a68a71..50788947ec9 100644
--- a/src/mongo/db/query/count_request.cpp
+++ b/src/mongo/db/query/count_request.cpp
@@ -54,15 +54,5 @@ long long countParseLimit(const BSONElement& element) {
     return limit;
 }
 
-long long countParseSkip(const BSONElement& element) {
-    uassert(ErrorCodes::BadValue, "skip value is not a valid number", element.isNumber());
-    auto skip = uassertStatusOK(element.parseIntegerElementToNonNegativeLong());
-    return skip;
-}
-
-long long countParseMaxTime(const BSONElement& element) {
-    auto maxTimeVal = uassertStatusOK(parseMaxTimeMS(element));
-    return static_cast<long long>(maxTimeVal);
-}
 }  // namespace count_request
 }  // namespace mongo
diff --git a/src/mongo/db/query/count_request.h b/src/mongo/db/query/count_request.h
index 6f118d3144a..d3881297273 100644
--- a/src/mongo/db/query/count_request.h
+++ b/src/mongo/db/query/count_request.h
@@ -40,18 +40,5 @@ namespace count_request {
  * Throws on invalid values.
  */
 long long countParseLimit(const BSONElement& element);
-
-/**
- * Parses a skip for a CountCommandRequest. Errors if the value passed is negative.
- * Throws on invalid values.
- */
-long long countParseSkip(const BSONElement& element);
-
-/**
- * Parses a maxTimeMS for a CountCommandRequest. Errors if the value passed is negative.
- * Throws on invalid values.
- */
-long long countParseMaxTime(const BSONElement& element);
-
 }  // namespace count_request
 }  // namespace mongo