RUBY-2902 send comment explicitly in GetMore (#2425)

Author: comandeo-mongo

lib/mongo/cursor.rb

@@ -423,6 +423,11 @@ def get_more_operation
         else
           nil
         end,
+        comment: if view.respond_to?(:options) && view.options.is_a?(Hash)
+          view.options[:comment]
+        else
+          nil
+        end,
       }
       Operation::GetMore.new(spec)
     end

lib/mongo/operation/get_more/command_builder.rb

@@ -30,6 +30,7 @@ def selector(connection)
             collection: spec.fetch(:coll_name),
             batchSize: spec[:batch_size],
             maxTimeMS: spec[:max_time_ms],
+            comment: spec[:comment],
           }.compact
         end
       end

spec/spec_tests/data/change_streams_unified/change-streams.yml

@@ -136,3 +136,44 @@ tests:
                 pipeline:
                   - $changeStream: {}
                 comment: "comment"
+
+  - description: "Test that comment is set on getMore"
+    runOnRequirements:
+      - minServerVersion: "4.4.0"
+        topologies: [ single, replicaset ]
+    operations:
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+          comment: "comment"
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: &new_document
+            _id: 1
+            a: 1
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                pipeline:
+                  - $changeStream: {}
+                comment: "comment"
+          - commandStartedEvent:
+              command:
+                insert: *collection0
+                documents:
+                  - *new_document
+          - commandStartedEvent:
+              command:
+                getMore: { $$type: [ int, long ] }
+                collection: *collection0
+                comment: "comment"
+              commandName: getMore
+              databaseName: *database0

spec/spec_tests/data/crud_unified/aggregate.yml

@@ -125,9 +125,10 @@ tests:
               commandName: aggregate
               databaseName: *database0Name
 
-  - description: "aggregate with comment does not set comment on getMore"
+  - description: "aggregate with comment sets comment on getMore"
     runOnRequirements:
-      - minServerVersion: "3.6.0"
+      - minServerVersion: "4.4.0"
+        topologies: [ single, replicaset ]
     operations:
       - name: aggregate
         arguments:
@@ -157,14 +158,14 @@ tests:
                 getMore: { $$type: [ int, long ] }
                 collection: *collection0Name
                 batchSize: 2
-                comment: { $$exists: false }
+                comment: "comment"
               commandName: getMore
               databaseName: *database0Name
           - commandStartedEvent:
               command:
                 getMore: { $$type: [ int, long ] }
                 collection: *collection0Name
                 batchSize: 2
-                comment: { $$exists: false }
+                comment: "comment"
               commandName: getMore
               databaseName: *database0Name

spec/spec_tests/data/crud_unified/find-comment.yml

@@ -88,9 +88,10 @@ tests:
                 filter: *filter
                 comment: *comment
 
-  - description: "find with comment does not set comment on getMore"
+  - description: "find with comment sets comment on getMore"
     runOnRequirements:
-      - minServerVersion: "3.6"
+      - minServerVersion: "4.4.0"
+        topologies: [ single, replicaset ]
     operations:
       - name: find
         object: *collection0
@@ -118,10 +119,10 @@ tests:
                 getMore: { $$type: [ int, long ] }
                 collection: *collection0Name
                 batchSize: 2
-                comment: { $$exists: false }
+                comment: "comment"
           - commandStartedEvent:
               command:
                 getMore: { $$type: [ int, long ] }
                 collection: *collection0Name
                 batchSize: 2
-                comment: { $$exists: false }
+                comment: "comment"