Fix file pattern, add bson, remove iteration overloading

Author: GromNaN

benchmark/BaseBench.php

@@ -47,8 +47,8 @@ protected static function getDatabase(): string
         return getenv('MONGODB_DATABASE') ?: 'phplib_test';
     }
 
-    protected static function readJsonFile(string $path): stdClass
+    protected static function readJsonFile(string $path): array
     {
-        return json_decode(file_get_contents($path), false, 512, JSON_THROW_ON_ERROR);
+        return json_decode(file_get_contents($path), true, 512, JSON_THROW_ON_ERROR);
     }
 }

benchmark/DriverBench/SingleDocBench.php

@@ -4,9 +4,11 @@
 
 use Generator;
 use MongoDB\Benchmark\BaseBench;
+use MongoDB\BSON\Document;
 use PhpBench\Attributes as Bench;
 
 use function array_map;
+use function file_get_contents;
 use function range;
 
 /** @see https://github.com/mongodb/specifications/blob/ddfc8b583d49aaf8c4c19fa01255afb66b36b92e/source/benchmarking/benchmarking.rst#single-doc-benchmarks */
@@ -18,22 +20,34 @@ public function prepareDatabase(): void
         self::getCollection()->drop();
     }
 
-    public function setupFindOneByID(): void
+    public function setupFindOneById(): void
     {
-        $tweet = (array) self::readJsonFile(self::TWEET_FILE_PATH);
+        $tweet = self::readJsonFile(self::TWEET_FILE_PATH);
         $docs = array_map(fn ($id) => $tweet + ['_id' => $id], range(1, 10_000));
         self::getCollection()->insertMany($docs);
     }
 
-    #[Bench\BeforeMethods('setupFindOneByID')]
+    public static function provideFindOneByIdParams(): Generator
+    {
+        yield 'default' => [
+            'options' => [],
+        ];
+
+        yield 'bson typemap' => [
+            'options' => ['typeMap' => ['root' => 'bson']],
+        ];
+    }
+
+    /** @param array{options: array} $params */
+    #[Bench\BeforeMethods('setupFindOneById')]
+    #[Bench\ParamProviders('provideFindOneByIdParams')]
     #[Bench\Revs(1)]
-    #[Bench\Iterations(10)]
-    public function benchFindOneByID(): void
+    public function benchFindOneById(array $params): void
     {
         $collection = self::getCollection();
 
         for ($id = 1; $id <= 10_000; $id++) {
-            $collection->findOne(['_id' => $id]);
+            $collection->findOne(['_id' => $id], $params['options']);
         }
     }
 
@@ -44,16 +58,25 @@ public static function provideInsertOneParams(): Generator
             'repeat' => 10_000,
         ];
 
+        yield 'Small BSON doc' => [
+            'document' => Document::fromJSON(file_get_contents(self::SMALL_FILE_PATH)),
+            'repeat' => 10_000,
+        ];
+
         yield 'Large doc' => [
             'document' => self::readJsonFile(self::LARGE_FILE_PATH),
             'repeat' => 10,
         ];
+
+        yield 'Large BSON doc' => [
+            'document' => Document::fromJSON(file_get_contents(self::LARGE_FILE_PATH)),
+            'repeat' => 10,
+        ];
     }
 
-    /** @param array{document: object, repeat: int} $params */
+    /** @param array{document: object|array, repeat: int} $params */
     #[Bench\ParamProviders('provideInsertOneParams')]
     #[Bench\Revs(1)]
-    #[Bench\Iterations(1)]
     public function benchInsertOne(array $params): void
     {
         $collection = self::getCollection();

phpbench.json.dist

@@ -1,7 +1,7 @@
 {
     "$schema": "./vendor/phpbench/phpbench/phpbench.schema.json",
     "runner.bootstrap": "vendor/autoload.php",
-    "runner.file_pattern": ".*Bench.php$",
+    "runner.file_pattern": "*Bench.php",
     "runner.path": "benchmark",
     "runner.iterations": 3,
     "runner.revs": 10,