Merge pull request #410

docs/includes/apiargs-MongoDBCollection-method-find-option.yaml

@@ -80,6 +80,19 @@ interface: phpmethod
 operation: ~
 optional: true
 ---
+arg_name: option
+name: hint
+type: string|array|object
+description: |
+  The index to use. Specify either the index name as a string or the index key
+  pattern as a document. If specified, then the query system will only consider
+  plans using the hinted index.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
 source:
   file: apiargs-common-option.yaml
   ref: maxTimeMS
@@ -93,6 +106,39 @@ source:
   ref: readPreference
 ---
 arg_name: option
+name: max
+type: array|object
+description: |
+  The exclusive upper bound for a specific index.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
+name: maxScan
+type: integer
+description: |
+  Maximum number of documents or index keys to scan when executing the query.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
+name: min
+type: array|object
+description: |
+  The inclusive lower bound for a specific index.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
 name: oplogReplay
 type: boolean
 description: |
@@ -120,6 +166,41 @@ operation: ~
 optional: true
 ---
 arg_name: option
+name: returnKey
+type: boolean
+description: |
+  If true, returns only the index keys in the resulting documents.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
+name: showRecordId
+type: boolean
+description: |
+  Determines whether to return the record identifier for each document. If true,
+  adds a field $recordId to the returned documents.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
+name: snapshot
+type: boolean
+description: |
+  Prevents the cursor from returning a document more than once because of an
+  intervening write operation.
+
+  .. versionadded:: 1.2
+interface: phpmethod
+operation: ~
+optional: true
+---
+arg_name: option
 name: allowPartialResults
 type: boolean
 description: |

docs/includes/apiargs-MongoDBCollection-method-findOne-option.yaml

@@ -18,6 +18,10 @@ source:
   file: apiargs-MongoDBCollection-method-find-option.yaml
   ref: comment
 ---
+source:
+  file: apiargs-MongoDBCollection-method-find-option.yaml
+  ref: hint
+---
 source:
   file: apiargs-common-option.yaml
   ref: maxTimeMS
@@ -36,6 +40,26 @@ source:
 post: |
   This will be used for the returned result document.
 ---
+source:
+  file: apiargs-MongoDBCollection-method-find-option.yaml
+  ref: max
+---
+source:
+  file: apiargs-MongoDBCollection-method-find-option.yaml
+  ref: maxScan
+---
+source:
+  file: apiargs-MongoDBCollection-method-find-option.yaml
+  ref: min
+---
+source:
+  file: apiargs-MongoDBCollection-method-find-option.yaml
+  ref: returnKey
+---
+source:
+  file: apiargs-MongoDBCollection-method-find-option.yaml
+  ref: showRecordId
+---
 source:
   file: apiargs-MongoDBCollection-method-find-option.yaml
   ref: modifiers

src/Operation/Find.php

@@ -70,12 +70,23 @@ class Find implements Executable
      *    NON_TAILABLE, TAILABLE, or TAILABLE_AWAIT. The default is
      *    NON_TAILABLE.
      *
+     *  * hint (string|document): The index to use. Specify either the index
+     *    name as a string or the index key pattern as a document. If specified,
+     *    then the query system will only consider plans using the hinted index.
+     *
      *  * limit (integer): The maximum number of documents to return.
      *
+     *  * max (document): The exclusive upper bound for a specific index.
+     *
+     *  * maxScan (integer): Maximum number of documents or index keys to scan
+     *    when executing the query.
+     *
      *  * maxTimeMS (integer): The maximum amount of time to allow the query to
      *    run. If "$maxTimeMS" also exists in the modifiers document, this
      *    option will take precedence.
      *
+     *  * min (document): The inclusive upper bound for a specific index.
+     *
      *  * modifiers (document): Meta operators that modify the output or
      *    behavior of a query. Use of these operators is deprecated in favor of
      *    named options.
@@ -97,8 +108,18 @@ class Find implements Executable
      *
      *  * readPreference (MongoDB\Driver\ReadPreference): Read preference.
      *
+     *  * returnKey (boolean): If true, returns only the index keys in the
+     *    resulting documents.
+     *
+     *  * showRecordId (boolean): Determines whether to return the record
+     *    identifier for each document. If true, adds a field $recordId to the
+     *    returned documents.
+     *
      *  * skip (integer): The number of documents to skip before returning.
      *
+     *  * snapshot (boolean): Prevents the cursor from returning a document more
+     *    than once because of an intervening write operation.
+     *
      *  * sort (document): The order in which to return matching documents. If
      *    "$orderby" also exists in the modifiers document, this option will
      *    take precedence.
@@ -146,14 +167,30 @@ class Find implements Executable
             }
         }
 
+        if (isset($options['hint']) && ! is_string($options['hint']) && ! is_array($options['hint']) && ! is_object($options['hint'])) {
+            throw InvalidArgumentException::invalidType('"hint" option', $options['hint'], 'string or array or object');
+        }
+
         if (isset($options['limit']) && ! is_integer($options['limit'])) {
             throw InvalidArgumentException::invalidType('"limit" option', $options['limit'], 'integer');
         }
 
+        if (isset($options['max']) && ! is_array($options['max']) && ! is_object($options['max'])) {
+            throw InvalidArgumentException::invalidType('"max" option', $options['max'], 'array or object');
+        }
+
+        if (isset($options['maxScan']) && ! is_integer($options['maxScan'])) {
+            throw InvalidArgumentException::invalidType('"maxScan" option', $options['maxScan'], 'integer');
+        }
+
         if (isset($options['maxTimeMS']) && ! is_integer($options['maxTimeMS'])) {
             throw InvalidArgumentException::invalidType('"maxTimeMS" option', $options['maxTimeMS'], 'integer');
         }
 
+        if (isset($options['min']) && ! is_array($options['min']) && ! is_object($options['min'])) {
+            throw InvalidArgumentException::invalidType('"min" option', $options['min'], 'array or object');
+        }
+
         if (isset($options['modifiers']) && ! is_array($options['modifiers']) && ! is_object($options['modifiers'])) {
             throw InvalidArgumentException::invalidType('"modifiers" option', $options['modifiers'], 'array or object');
         }
@@ -178,10 +215,22 @@ class Find implements Executable
             throw InvalidArgumentException::invalidType('"readPreference" option', $options['readPreference'], 'MongoDB\Driver\ReadPreference');
         }
 
+        if (isset($options['returnKey']) && ! is_bool($options['returnKey'])) {
+            throw InvalidArgumentException::invalidType('"returnKey" option', $options['returnKey'], 'boolean');
+        }
+
+        if (isset($options['showRecordId']) && ! is_bool($options['showRecordId'])) {
+            throw InvalidArgumentException::invalidType('"showRecordId" option', $options['showRecordId'], 'boolean');
+        }
+
         if (isset($options['skip']) && ! is_integer($options['skip'])) {
             throw InvalidArgumentException::invalidType('"skip" option', $options['skip'], 'integer');
         }
 
+        if (isset($options['snapshot']) && ! is_bool($options['snapshot'])) {
+            throw InvalidArgumentException::invalidType('"snapshot" option', $options['snapshot'], 'boolean');
+        }
+
         if (isset($options['sort']) && ! is_array($options['sort']) && ! is_object($options['sort'])) {
             throw InvalidArgumentException::invalidType('"sort" option', $options['sort'], 'array or object');
         }
@@ -249,14 +298,16 @@ class Find implements Executable
             }
         }
 
-        foreach (['allowPartialResults', 'batchSize', 'comment', 'limit', 'maxTimeMS', 'noCursorTimeout', 'oplogReplay', 'projection', 'readConcern', 'skip', 'sort'] as $option) {
+        foreach (['allowPartialResults', 'batchSize', 'comment', 'hint', 'limit', 'maxScan', 'maxTimeMS', 'noCursorTimeout', 'oplogReplay', 'projection', 'readConcern', 'returnKey', 'showRecordId', 'skip', 'snapshot', 'sort'] as $option) {
             if (isset($this->options[$option])) {
                 $options[$option] = $this->options[$option];
             }
         }
 
-        if (isset($this->options['collation'])) {
-            $options['collation'] = (object) $this->options['collation'];
+        foreach (['collation', 'max', 'min'] as $option) {
+            if (isset($this->options[$option])) {
+                $options[$option] = (object) $this->options[$option];
+            }
         }
 
         $modifiers = empty($this->options['modifiers']) ? [] : (array) $this->options['modifiers'];

src/Operation/FindOne.php

@@ -48,10 +48,21 @@ class FindOne implements Executable
      *  * comment (string): Attaches a comment to the query. If "$comment" also
      *    exists in the modifiers document, this option will take precedence.
      *
+     *  * hint (string|document): The index to use. Specify either the index
+     *    name as a string or the index key pattern as a document. If specified,
+     *    then the query system will only consider plans using the hinted index.
+     *
+     *  * max (document): The exclusive upper bound for a specific index.
+     *
+     *  * maxScan (integer): Maximum number of documents or index keys to scan
+     *    when executing the query.
+     *
      *  * maxTimeMS (integer): The maximum amount of time to allow the query to
      *    run. If "$maxTimeMS" also exists in the modifiers document, this
      *    option will take precedence.
      *
+     *  * min (document): The inclusive upper bound for a specific index.
+     *
      *  * modifiers (document): Meta-operators modifying the output or behavior
      *    of a query.
      *
@@ -65,6 +76,13 @@ class FindOne implements Executable
      *
      *  * readPreference (MongoDB\Driver\ReadPreference): Read preference.
      *
+     *  * returnKey (boolean): If true, returns only the index keys in the
+     *    resulting documents.
+     *
+     *  * showRecordId (boolean): Determines whether to return the record
+     *    identifier for each document. If true, adds a field $recordId to the
+     *    returned documents.
+     *
      *  * skip (integer): The number of documents to skip before returning.
      *
      *  * sort (document): The order in which to return matching documents. If

tests/Operation/FindFunctionalTest.php

@@ -3,6 +3,7 @@
 namespace MongoDB\Tests\Operation;
 
 use MongoDB\Driver\BulkWrite;
+use MongoDB\Operation\CreateIndexes;
 use MongoDB\Operation\Find;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
@@ -28,6 +29,57 @@ class FindFunctionalTest extends FunctionalTestCase
         );
     }
 
+    public function testHintOption()
+    {
+        $bulkWrite = new BulkWrite;
+        $bulkWrite->insert(['_id' => 1, 'x' => 1]);
+        $bulkWrite->insert(['_id' => 2, 'x' => 2]);
+        $bulkWrite->insert(['_id' => 3, 'y' => 3]);
+        $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
+
+        $createIndexes = new CreateIndexes($this->getDatabaseName(), $this->getCollectionName(), [
+            ['key' => ['x' => 1], 'sparse' => true, 'name' => 'sparse_x'],
+            ['key' => ['y' => 1]],
+        ]);
+        $createIndexes->execute($this->getPrimaryServer());
+
+        $hintsUsingSparseIndex = [
+            ['x' => 1],
+            'sparse_x',
+        ];
+
+        foreach ($hintsUsingSparseIndex as $hint) {
+            $operation = new Find($this->getDatabaseName(), $this->getCollectionName(), [], ['hint' => $hint]);
+            $cursor = $operation->execute($this->getPrimaryServer());
+
+            $expectedDocuments = [
+                (object) ['_id' => 1, 'x' => 1],
+                (object) ['_id' => 2, 'x' => 2],
+            ];
+
+            $this->assertEquals($expectedDocuments, $cursor->toArray());
+        }
+
+        $hintsNotUsingSparseIndex = [
+            ['_id' => 1],
+            ['y' => 1],
+            'y_1',
+        ];
+
+        foreach ($hintsNotUsingSparseIndex as $hint) {
+            $operation = new Find($this->getDatabaseName(), $this->getCollectionName(), [], ['hint' => $hint]);
+            $cursor = $operation->execute($this->getPrimaryServer());
+
+            $expectedDocuments = [
+                (object) ['_id' => 1, 'x' => 1],
+                (object) ['_id' => 2, 'x' => 2],
+                (object) ['_id' => 3, 'y' => 3],
+            ];
+
+            $this->assertEquals($expectedDocuments, $cursor->toArray());
+        }
+    }
+
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocuments
      */

tests/Operation/FindTest.php

@@ -48,14 +48,30 @@ class FindTest extends TestCase
             $options[][] = ['cursorType' => $value];
         }
 
+        foreach ($this->getInvalidHintValues() as $value) {
+            $options[][] = ['hint' => $value];
+        }
+
         foreach ($this->getInvalidIntegerValues() as $value) {
             $options[][] = ['limit' => $value];
         }
 
+        foreach ($this->getInvalidDocumentValues() as $value) {
+            $options[][] = ['max' => $value];
+        }
+
+        foreach ($this->getInvalidIntegerValues() as $value) {
+            $options[][] = ['maxScan' => $value];
+        }
+
         foreach ($this->getInvalidIntegerValues() as $value) {
             $options[][] = ['maxTimeMS' => $value];
         }
 
+        foreach ($this->getInvalidDocumentValues() as $value) {
+            $options[][] = ['min' => $value];
+        }
+
         foreach ($this->getInvalidDocumentValues() as $value) {
             $options[][] = ['modifiers' => $value];
         }
@@ -76,10 +92,22 @@ class FindTest extends TestCase
             $options[][] = ['readPreference' => $value];
         }
 
+        foreach ($this->getInvalidBooleanValues() as $value) {
+            $options[][] = ['returnKey' => $value];
+        }
+
+        foreach ($this->getInvalidBooleanValues() as $value) {
+            $options[][] = ['showRecordId' => $value];
+        }
+
         foreach ($this->getInvalidIntegerValues() as $value) {
             $options[][] = ['skip' => $value];
         }
 
+        foreach ($this->getInvalidBooleanValues() as $value) {
+            $options[][] = ['snapshot' => $value];
+        }
+
         foreach ($this->getInvalidDocumentValues() as $value) {
             $options[][] = ['sort' => $value];
         }
@@ -91,6 +119,11 @@ class FindTest extends TestCase
         return $options;
     }
 
+    private function getInvalidHintValues()
+    {
+        return [123, 3.14, true];
+    }
+
     /**
      * @expectedException MongoDB\Exception\InvalidArgumentException
      * @dataProvider provideInvalidConstructorCursorTypeOptions