[misc] ensuring pool test stability

mariadb-corporation · Jul 13, 2018 · fd360c4 · fd360c4
1 parent 1f40093
commit fd360c4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/benchmarks/common_benchmarks.js b/benchmarks/common_benchmarks.js
@@ -59,7 +59,7 @@ function Bench() {
   config.charsetNumber = 224;
   config.trace = false;
 
-  const poolConfig = Object.assign({connectionLimit: 10},config);
+  const poolConfig = Object.assign({ connectionLimit: 10 }, config);
   // config.debug = true;
   // if (!mariasql && process.platform === "win32") {
   //   config.socketPath = "\\\\.\\pipe\\MySQL";
@@ -336,7 +336,16 @@ Bench.prototype.fill = function(val, length, right) {
 
 Bench.prototype.add = function(title, displaySql, fct, onComplete, isPromise, usePool, conn) {
   const self = this;
-  const addTest = getAddTest(self, this.suite, fct, this.minSamples, title, displaySql, onComplete, usePool);
+  const addTest = getAddTest(
+    self,
+    this.suite,
+    fct,
+    this.minSamples,
+    title,
+    displaySql,
+    onComplete,
+    usePool
+  );
 
   if (conn) {
     addTest(conn, conn.desc);

diff --git a/lib/pool.js b/lib/pool.js
@@ -136,7 +136,7 @@ function Pool(options) {
       //connections are all used, stack demand.
       return new Promise((resolve, reject) => {
         const task = {
-          timeout: new Date().getTime() + opts.acquireTimeout,
+          timeout: Date.now() + opts.acquireTimeout,
           reject: reject,
           resolve: resolve,
           sql: sql,
@@ -155,10 +155,7 @@ function Pool(options) {
 
     const conn = idleConnections.shift();
     activeConnections[conn.threadId] = conn;
-    if (
-      opts.minDelayValidation <= 0 ||
-      new Date().getTime() - conn.lastUse > opts.minDelayValidation
-    ) {
+    if (opts.minDelayValidation <= 0 || Date.now() - conn.lastUse > opts.minDelayValidation) {
       try {
         await conn.ping();
         return conn;
@@ -188,7 +185,7 @@ function Pool(options) {
         throw err;
       }
     } else {
-      conn.lastUse = new Date().getTime();
+      conn.lastUse = Date.now();
       return conn;
     }
   };
@@ -258,7 +255,7 @@ function Pool(options) {
    */
   const overlayNewConnection = function(conn, self) {
     idleConnections.push(conn);
-    conn.lastUse = new Date().getTime();
+    conn.lastUse = Date.now();
     const initialEndFct = conn.end;
     conn.end = async () => {
       try {
@@ -339,7 +336,7 @@ function Pool(options) {
         conn
           .query(task.sql, task.values)
           .then(res => {
-            conn.lastUse = new Date().getTime();
+            conn.lastUse = Date.now();
             conn.end().catch(err => {});
             task.resolve(res);
           })
@@ -348,15 +345,15 @@ function Pool(options) {
             task.reject(err);
           });
       } else {
-        conn.lastUse = new Date().getTime();
+        conn.lastUse = Date.now();
         task.resolve(conn);
       }
     }
   };
 
   const resetTimeoutToNextTask = () => {
     //handle next Timer
-    const currTime = new Date().getTime();
+    const currTime = Date.now();
     let nextTask;
     while ((nextTask = taskQueue.peekFront())) {
       if (nextTask.timeout < currTime) {

diff --git a/test/integration/test-pool.js b/test/integration/test-pool.js
@@ -218,22 +218,21 @@ describe("Pool", () => {
           assert.equal(pool.idleConnections(), 1);
           assert.equal(pool.taskQueueSize(), 0);
 
-          pool.query("do 1");
-          pool.query("do 1").then(() => {
-            assert.equal(pool.activeConnections(), 1);
-            assert.equal(pool.totalConnections(), 1);
-            assert.equal(pool.idleConnections(), 0);
-            assert.equal(pool.taskQueueSize(), 0);
-            setTimeout(() => {
-              //connection recreated
-              assert.equal(pool.activeConnections(), 0);
-              assert.equal(pool.totalConnections(), 2);
-              assert.equal(pool.idleConnections(), 2);
-              assert.equal(pool.taskQueueSize(), 0);
-              pool.end();
-              done();
-            }, 250);
-          });
+          setTimeout(() => {
+
+            pool.query("do 1");
+            pool.query("do 1").then(() => {
+              setTimeout(() => {
+                //connection recreated
+                assert.equal(pool.activeConnections(), 0);
+                assert.equal(pool.totalConnections(), 2);
+                assert.equal(pool.idleConnections(), 2);
+                assert.equal(pool.taskQueueSize(), 0);
+                pool.end();
+                done();
+              }, 250);
+            });
+          }, 250);
         });
       });
     }, 500);