comments

Author: nbbeeken

test/benchmarks/driver_bench/src/driver.mts

@@ -102,7 +102,7 @@ export function snakeToCamel(name: string) {
 import type mongodb from '../../../../mongodb.js';
 export type { mongodb };
 
-const { MongoClient /* GridFSBucket */ } = require(path.join(MONGODB_DRIVER_PATH));
+const { MongoClient, GridFSBucket } = require(path.join(MONGODB_DRIVER_PATH));
 
 const DB_NAME = 'perftest';
 const COLLECTION_NAME = 'corpus';
@@ -124,6 +124,7 @@ export function metrics(test_name: string, result: number, count: number) {
     },
     metrics: [
       { name: 'megabytes_per_second', value: result },
+      // Reporting the count so we can verify programmatically or in UI how many iterations we reached
       { name: 'count', value: count }
     ]
   } as const;
@@ -135,16 +136,28 @@ export function metrics(test_name: string, result: number, count: number) {
  */
 export class DriverTester {
   private utilClient: mongodb.MongoClient;
-  private client: mongodb.MongoClient;
+  public client: mongodb.MongoClient;
   constructor() {
     this.utilClient = new MongoClient(MONGODB_URI, MONGODB_CLIENT_OPTIONS);
     this.client = new MongoClient(MONGODB_URI, MONGODB_CLIENT_OPTIONS);
   }
 
-  get ns() {
+  private get ns() {
     return this.utilClient.db(DB_NAME).collection(COLLECTION_NAME);
   }
 
+  public get db() {
+    return this.client.db(DB_NAME);
+  }
+
+  public get collection() {
+    return this.client.db(DB_NAME).collection(COLLECTION_NAME);
+  }
+
+  public get bucket(): mongodb.GridFSBucket {
+    return new GridFSBucket(this.db);
+  }
+
   async drop() {
     await this.ns.drop().catch(() => null);
     await this.utilClient
@@ -154,7 +167,7 @@ export class DriverTester {
   }
 
   async create() {
-    return await this.utilClient.db(DB_NAME).createCollection(COLLECTION_NAME);
+    await this.utilClient.db(DB_NAME).createCollection(COLLECTION_NAME);
   }
 
   async load(filePath: string, type: 'json' | 'string' | 'buffer'): Promise<any> {

test/benchmarks/driver_bench/src/suites/multi_bench/find_many_and_empty_cursor.mts

@@ -7,9 +7,12 @@ let collection: mongodb.Collection;
 
 export async function before() {
   await driver.drop();
-  collection = await driver.create();
+  await driver.create();
+
   const tweet = await driver.load('single_and_multi_document/tweet.json', 'json');
   await driver.insertManyOf(tweet, 10000);
+
+  collection = driver.collection;
 }
 
 export async function run() {

test/benchmarks/driver_bench/src/suites/multi_bench/small_doc_bulk_insert.mts

@@ -4,15 +4,20 @@ export const taskSize = 2.75;
 
 let collection: mongodb.Collection;
 let documents: any[];
+let smallDoc: any;
 
 export async function before() {
-  const smallDoc = await driver.load('single_and_multi_document/small_doc.json', 'json');
-  documents = Array.from({ length: 10000 }, () => ({ ...smallDoc })) as any[];
+  smallDoc = await driver.load('single_and_multi_document/small_doc.json', 'json');
 }
 
 export async function beforeEach() {
   await driver.drop();
-  collection = await driver.create();
+  await driver.create();
+
+  // Make new "documents" so the _id field is not carried over from the last run
+  documents = Array.from({ length: 10000 }, () => ({ ...smallDoc })) as any[];
+
+  collection = driver.collection;
 }
 
 export async function run() {