Merge pull request #1620 from alexispeter/mongodb-cursor-batchSize

mongodb increase batchSize to an arbitrary, high number
cargomedia · Feb 2, 2015 · 8a6d698 · 8a6d698
2 parents ee807b2 + 0f21202
commit 8a6d698
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/library/CM/MongoDb/Client.php b/library/CM/MongoDb/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-class CM_MongoDb_Client {
+class CM_MongoDb_Client extends CM_Class_Abstract {
 
     /** @var CM_MongoDb_Client|null $_client */
     private $_client = null;
@@ -130,6 +130,10 @@ public function findOne($collection, array $criteria = null, array $projection =
      * @return Iterator
      */
     public function find($collection, array $criteria = null, array $projection = null, array $aggregation = null) {
+        $batchSize = null;
+        if (isset(self::_getConfig()->batchSize)) {
+            $batchSize = (int) self::_getConfig()->batchSize;
+        }
         $criteria = (array) $criteria;
         $projection = (array) $projection;
         CM_Debug::getInstance()->incStats('mongo', "find `{$collection}`: " . CM_Params::jsonEncode(['projection'  => $projection,
@@ -144,10 +148,17 @@ public function find($collection, array $criteria = null, array $projection = nu
             if ($criteria) {
                 array_unshift($pipeline, ['$match' => $criteria]);
             }
-            $resultCursor = $collection->aggregateCursor($pipeline);
+            $options = [];
+            if (null !== $batchSize) {
+                $options['cursor'] = ['batchSize' => $batchSize];
+            }
+            $resultCursor = $collection->aggregateCursor($pipeline, $options);
         } else {
             $resultCursor = $collection->find($criteria, $projection);
         }
+        if (null !== $batchSize) {
+            $resultCursor->batchSize($batchSize);
+        }
         return $resultCursor;
     }
 

diff --git a/resources/config/default.php b/resources/config/default.php
@@ -46,6 +46,8 @@
 
     $config->CM_Db_Db->delayedEnabled = true;
 
+    $config->CM_MongoDb_Client->batchSize = null;
+
     $config->CM_Model_User->class = 'CM_Model_User';
 
     $config->CM_Params->class = 'CM_Params';

diff --git a/tests/library/CM/MongoDb/ClientTest.php b/tests/library/CM/MongoDb/ClientTest.php
@@ -146,6 +146,26 @@ public function testFind() {
         $this->assertEquals([['foo' => 1], ['foo' => 1], ['foo' => 2], ['foo' => 3]], $actual);
     }
 
+    public function testFindBatchSize() {
+        $mongoDb = CM_Service_Manager::getInstance()->getMongoDb();
+        $collectionName = 'findBatchSize';
+        CM_Config::get()->CM_MongoDb_Client->batchSize = null;
+
+        $cursor = $mongoDb->find($collectionName);
+        $this->assertSame(0, $cursor->info()['batchSize']);
+        $cursor = $mongoDb->find($collectionName, null, null, ['$match' => ['foo' => 'bar']]);
+        $this->assertSame(0, $cursor->info()['batchSize']);
+        $this->assertSame(101, $cursor->info()['query']['cursor']['batchSize']);
+
+        CM_Config::get()->CM_MongoDb_Client->batchSize = 10;
+
+        $cursor = $mongoDb->find($collectionName);
+        $this->assertSame(10, $cursor->info()['batchSize']);
+        $cursor = $mongoDb->find($collectionName, null, null, ['$match' => ['foo' => 'bar']]);
+        $this->assertSame(10, $cursor->info()['batchSize']);
+        $this->assertSame(10, $cursor->info()['query']['cursor']['batchSize']);
+    }
+
     public function testFindAndModify() {
         $mongoDb = CM_Service_Manager::getInstance()->getMongoDb();
         $collectionName = 'findAndModify';