[misc] bench label correction

mariadb-corporation · Feb 3, 2023 · 5500df2 · 5500df2
1 parent 7b9001f
commit 5500df2
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/benchmarks/benchs/insert.js b/benchmarks/benchs/insert.js
@@ -22,7 +22,7 @@ for (let i = 1; i < 10; i++) {
 sqlInsert = 'INSERT INTO perfTestText(' + sqlCol + ') VALUES (?' + sqlParam + ')';
 sqlTable += ', PRIMARY KEY (id))';
 
-module.exports.title = 'insert 10 parameters of 100 characters';
+module.exports.title = 'insert 10 VARCHAR(100)';
 module.exports.displaySql = 'INSERT INTO perfTestText VALUES (?, ?, ?, ?, ?,?, ?, ?, ?, ?)';
 module.exports.benchFct = async function (conn, type, deferred) {
   const params = [];

diff --git a/benchmarks/benchs/insert_batch.js b/benchmarks/benchs/insert_batch.js
@@ -13,21 +13,21 @@ function randomString(length) {
 sqlInsert = 'INSERT INTO perfTestTextBatch(t0) VALUES (?)';
 
 module.exports.title =
-  "100 * insert 100 characters using batch method (for mariadb) or loop for other driver (batch doesn't exists)";
+  "100 * insert CHAR(100) using batch (for mariadb) or loop for other driver (batch doesn't exists)";
 module.exports.displaySql = 'INSERT INTO perfTestTextBatch VALUES (?)';
 const iterations = 100;
 module.exports.benchFct = async function (conn, type, deferred) {
   const params = [randomString(100)];
   // console.log(connType.desc);
   if (type !== 'mariadb') {
     //other driver doesn't have bulk method
-    let ended = 0;
+    const queries = [];
     for (let i = 0; i < iterations; i++) {
-      const rows = await conn.query(sqlInsert, params);
-      if (++ended === iterations) {
-        deferred.resolve(rows);
-      }
+      queries.push(conn.query(sqlInsert, params));
     }
+    const res = await Promise.all(queries);
+    deferred.resolve(res);
+    return;
   } else {
     //use batch capability
     const totalParams = new Array(iterations);

diff --git a/benchmarks/benchs/select_1.js b/benchmarks/benchs/select_1.js
diff --git a/benchmarks/benchs/select_1000_rows.js b/benchmarks/benchs/select_1000_rows.js
@@ -1,4 +1,4 @@
-module.exports.title = 'select 1000 rows';
+module.exports.title = 'select 1000 rows of CHAR(32)';
 module.exports.displaySql = 'select * from 1000 rows (int + string(32))';
 module.exports.benchFct = async function (conn, type, deferred) {
   const res = await conn.query('select * from 1000rows');

diff --git a/benchmarks/benchs/select_1000_rows_execute.js b/benchmarks/benchs/select_1000_rows_execute.js
@@ -1,4 +1,4 @@
-module.exports.title = 'select 1000 rows - BINARY';
+module.exports.title = 'select 1000 rows of CHAR(32) - BINARY';
 module.exports.displaySql = 'select * from 1000 rows (int + string(32))';
 module.exports.requireExecute = true;
 module.exports.benchFct = async function (conn, type, deferred) {

diff --git a/benchmarks/benchs/select_100_int_varchar.js → benchmarks/benchs/select_100_int.js b/benchmarks/benchs/select_100_int_varchar.js → benchmarks/benchs/select_100_int.js
diff --git a/benchmarks/benchs/select_1_int_char.js b/benchmarks/benchs/select_1_int_char.js
@@ -1,4 +1,4 @@
-module.exports.title = 'select 1 int + char';
+module.exports.title = 'select 1 int + char(32)';
 module.exports.displaySql = "select 1, 'abcdefghijabcdefghijabcdefghijaa'";
 module.exports.benchFct = async function (conn, type, deferred) {
   const rows = await conn.query("select 1, 'abcdefghijabcdefghijabcdefghijaa'");

diff --git a/benchmarks/benchs/select_1_int_char_pool.js b/benchmarks/benchs/select_1_int_char_pool.js
@@ -1,4 +1,4 @@
-module.exports.title = 'select 1 int + char with pool';
+module.exports.title = 'select 1 int + char(32) with pool';
 module.exports.displaySql = "select 1, 'abcdefghijabcdefghijabcdefghijaa'";
 module.exports.pool = true;
 module.exports.benchFct = async function (pool, type, deferred) {

diff --git a/benchmarks/benchs/select_1_int_char_random.js b/benchmarks/benchs/select_1_int_char_random.js
@@ -1,4 +1,4 @@
-module.exports.title = 'select 1 random int + char';
+module.exports.title = 'select 1 random int + char(32)';
 module.exports.displaySql = "select 1, 'abcdefghijabcdefghijabcdefghijaa'";
 module.exports.benchFct = async function (conn, type, deferred) {
   const randVal = Math.floor(Math.random() * 1000000);

diff --git a/benchmarks/benchs/select_now.js b/benchmarks/benchs/select_now.js
@@ -0,0 +1,8 @@
+const assert = require('assert');
+
+module.exports.title = 'select now()';
+module.exports.displaySql = 'select now()';
+module.exports.benchFct = async function (conn, type, deferred) {
+  const rows = await conn.query('select now()');
+  deferred.resolve(rows);
+};