Let queueMax:0 disable queuing

Author: Christopher Jones

doc/api.md

@@ -1820,7 +1820,7 @@ When the number of `pool.getConnection()` calls that have been
 then any future `pool.getConnection()` calls will immediately return an error
 and will not be queued.
 
-If `queueMax` is 0, then the queue length is not limited.
+If `queueMax` is -1, then the queue length is not limited.
 
 The default value is 500.
 
@@ -1835,9 +1835,9 @@ oracledb.queueMax = 500;
 
 #### <a name="propdbqueuerequests"></a> 3.2.24 `oracledb.queueRequests`
 
-This property was removed in node-oracledb 3.0.  Queuing is now always
-enabled.  See [Connection Pool Queue](#connpoolqueue) for more
-information.
+This property was removed in node-oracledb 3.0 and queuing was always enabled.
+In node-oracledb 5.0, set `queueMax` to 0 to disable queuing.  See [Connection
+Pool Queue](#connpoolqueue) for more information.
 
 #### <a name="propdbqueuetimeout"></a> 3.2.25 `oracledb.queueTimeout`
 
@@ -2231,7 +2231,7 @@ When the number of `pool.getConnection()` calls that have been
 then any future `pool.getConnection()` calls will immediately return an error
 and will not be queued.
 
-If `queueMax` is 0, then the queue length is not limited.
+If `queueMax` is -1, then the queue length is not limited.
 
 The default value is 500.
 
@@ -2240,9 +2240,9 @@ This optional property overrides the
 
 ###### <a name="createpoolpoolattrsqueuerequests"></a> 3.3.1.1.15 `queueRequests`
 
-This property was removed in node-oracledb 3.0.  Queuing is now always
-enabled.  See [Connection Pool Queue](#connpoolqueue) for more
-information.
+This property was removed in node-oracledb 3.0 and queuing was always enabled.
+In node-oracledb 5.0, set `queueMax` to 0 to disable queuing.  See [Connection
+Pool Queue](#connpoolqueue) for more information.
 
 ###### <a name="createpoolpoolattrsqueuetimeout"></a> 3.3.1.1.16 `queueTimeout`
 
@@ -5560,9 +5560,8 @@ See [`oracledb.queueMax`](#propdbqueuemax).
 
 #### <a name="proppoolqueuerequests"></a> 8.1.10 `pool.queueRequests`
 
-This property was removed in node-oracledb 3.0.  Queuing is now always
-enabled.  See [Connection Pool Queue](#connpoolqueue) for more
-information.
+This property was removed in node-oracledb 3.0.  See [Connection Pool
+Queue](#connpoolqueue) for more information.
 
 #### <a name="proppoolqueueTimeout"></a> 8.1.11 `pool.queueTimeout`
 
@@ -9893,7 +9892,7 @@ a [`sqlnet.ora`](#tnsadmin) file or [`CONNECT_TIMEOUT`][185] in a [connection
 string](#easyconnect).  When using a connection pool, these values affect the
 time taken to establish each connection stored in the pool.  The
 [`queueTimeout`](#propdbqueuetimeout) and [`queueMax`](#propdbqueuemax) settings
-control higher level pool behavior.
+control higher-level pool behavior.
 
 With Oracle Client 19c, timeouts can be passed in [Easy Connect
 strings](#easyconnect), for example to timeout after 15 seconds:

lib/pool.js

@@ -97,7 +97,7 @@ async function getConnection(a1) {
   if (this._connectionsOut >= poolMax) {
 
     // when the queue is huge, throw error early without waiting for queue timeout
-    if (this._connRequestQueue.length >= this.queueMax && this.queueMax > 0) {
+    if (this._connRequestQueue.length >= this.queueMax && this.queueMax >= 0) {
       if (this._enableStats) {
         this._totalRequestsRejected += 1;
       }

test/list.txt

@@ -63,6 +63,7 @@ Overview of node-oracledb functional tests
         2.8.2 generates NJS-040 if request is queued and queueTimeout expires
         2.8.3 does not generate NJS-040 if request is queued for less time than queueTimeout
         2.8.4 generates NJS-076 if request exceeds queueMax
+        2.8.5 generates NJS-076 if request exceeds queueMax 0
     2.9 _enableStats & _logStats functionality
         2.9.1 does not work after the pool has been terminated
     2.10 Close method
@@ -4734,4 +4735,4 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
     239.1 disable prefetchRows by setting it to be 0
     239.2 prefetchRows is enabled with default value
     239.3 cursor bind OUT then bind IN
-    239.4 implicit binding type
+    239.4 implicit binding type

test/pool.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -863,6 +863,41 @@ describe('2. pool.js', function() {
         }
       );
     });
+
+    it('2.8.5 generates NJS-076 if request exceeds queueMax 0', function(done) {
+      oracledb.createPool(
+        {
+          user              : dbConfig.user,
+          password          : dbConfig.password,
+          connectString     : dbConfig.connectString,
+          poolMin           : 1,
+          poolMax           : 1,
+          poolIncrement     : 0,
+          queueTimeout      : 5000, // 5 seconds
+          queueMax          : 0
+        },
+        function(err, pool) {
+          should.not.exist(err);
+
+          pool.getConnection(function(err, conn1) {
+            should.not.exist(err);
+            pool.getConnection(function(err, conn) {
+              should.exist(err);
+              (err.message.startsWith("NJS-076:")).should.be.true();
+              should.not.exist(conn);
+              conn1.close(function(err) {
+                should.not.exist(err);
+
+                pool.close(function(err) {
+                  should.not.exist(err);
+                  done();
+                });
+              });
+            });
+          });
+        });
+    });
+
   });
 
   describe('2.9 _enableStats & _logStats functionality', function(){