Simplify RESET handling

Removed RESET that does not mute ACK_FAILURE handling.

Author: lutovich

src/v1/internal/connection-holder.js

@@ -70,8 +70,7 @@ export default class ConnectionHolder {
 
     this._referenceCount--;
     if (this._referenceCount === 0) {
-      // release a connection without muting ACK_FAILURE, this is the last action on this connection
-      return this._releaseConnection(true);
+      return this._releaseConnection();
     }
     return this._connectionPromise;
   }
@@ -85,9 +84,7 @@ export default class ConnectionHolder {
       return this._connectionPromise;
     }
     this._referenceCount = 0;
-    // release a connection and mute ACK_FAILURE, this might be called concurrently with other
-    // operations and thus should ignore failure handling
-    return this._releaseConnection(false);
+    return this._releaseConnection();
   }
 
   /**
@@ -97,14 +94,10 @@ export default class ConnectionHolder {
    * @return {Promise} - promise resolved then connection is returned to the pool.
    * @private
    */
-  _releaseConnection(sync) {
+  _releaseConnection() {
     this._connectionPromise = this._connectionPromise.then(connection => {
       if (connection) {
-        if(sync) {
-          connection.reset();
-        } else {
-          connection.resetAsync();
-        }
+        connection.reset();
         connection.sync();
         connection._release();
       }

src/v1/internal/connector.js

@@ -315,8 +315,8 @@ class Connection {
   }
 
   /** Queue a RESET-message to be sent to the database. Mutes failure handling. */
-  resetAsync( observer ) {
-    log("C", "RESET_ASYNC");
+  reset(observer) {
+    log('C', 'RESET');
     this._isHandlingFailure = true;
     let self = this;
     let wrappedObs = {
@@ -330,14 +330,6 @@ class Connection {
       }
     };
     this._queueObserver(wrappedObs);
-    this._packer.packStruct( RESET, [], (err) => this._handleFatalError(err) );
-    this._chunker.messageBoundary();
-  }
-
-  /** Queue a RESET-message to be sent to the database */
-  reset(observer) {
-    log('C', 'RESET');
-    this._queueObserver(observer);
     this._packer.packStruct(RESET, [], (err) => this._handleFatalError(err));
     this._chunker.messageBoundary();
   }

test/internal/connection-holder.test.js

@@ -168,7 +168,7 @@ describe('ConnectionHolder', () => {
     connectionHolder.initializeConnection();
 
     connectionHolder.close().then(() => {
-      expect(connection.isReleasedOnceOnSessionClose()).toBeTruthy();
+      expect(connection.isReleasedOnce()).toBeTruthy();
       done();
     });
   });
@@ -201,11 +201,11 @@ describe('ConnectionHolder', () => {
     connectionHolder.initializeConnection();
 
     connectionHolder.close().then(() => {
-      expect(connection1.isReleasedOnceOnSessionClose()).toBeTruthy();
+      expect(connection1.isReleasedOnce()).toBeTruthy();
 
       connectionHolder.initializeConnection();
       connectionHolder.close().then(() => {
-        expect(connection2.isReleasedOnceOnSessionClose()).toBeTruthy();
+        expect(connection2.isReleasedOnce()).toBeTruthy();
         done();
       });
     });

test/internal/fake-connection.js

@@ -31,7 +31,6 @@ export default class FakeConnection {
     this.creationTimestamp = Date.now();
 
     this.resetInvoked = 0;
-    this.resetAsyncInvoked = 0;
     this.syncInvoked = 0;
     this.releaseInvoked = 0;
     this.initializationInvoked = 0;
@@ -54,10 +53,6 @@ export default class FakeConnection {
     this.resetInvoked++;
   }
 
-  resetAsync() {
-    this.resetAsyncInvoked++;
-  }
-
   sync() {
     this.syncInvoked++;
   }
@@ -75,17 +70,6 @@ export default class FakeConnection {
     return this._open;
   }
 
-  isReleasedOnceOnSessionClose() {
-    return this.isReleasedOnSessionCloseTimes(1);
-  }
-
-  isReleasedOnSessionCloseTimes(times) {
-    return this.resetAsyncInvoked === times &&
-      this.resetInvoked === 0 &&
-      this.syncInvoked === times &&
-      this.releaseInvoked === times;
-  }
-
   isNeverReleased() {
     return this.isReleasedTimes(0);
   }
@@ -95,8 +79,7 @@ export default class FakeConnection {
   }
 
   isReleasedTimes(times) {
-    return this.resetAsyncInvoked === 0 &&
-      this.resetInvoked === times &&
+    return this.resetInvoked === times &&
       this.syncInvoked === times &&
       this.releaseInvoked === times;
   }

test/v1/session.test.js

@@ -77,13 +77,13 @@ describe('session', () => {
     const session = newSessionWithConnection(connection);
 
     session.close(() => {
-      expect(connection.isReleasedOnceOnSessionClose()).toBeTruthy();
+      expect(connection.isReleasedOnce()).toBeTruthy();
 
       session.close(() => {
-        expect(connection.isReleasedOnceOnSessionClose()).toBeTruthy();
+        expect(connection.isReleasedOnce()).toBeTruthy();
 
         session.close(() => {
-          expect(connection.isReleasedOnceOnSessionClose()).toBeTruthy();
+          expect(connection.isReleasedOnce()).toBeTruthy();
           done();
         });
       });