refactor(execute-operation): pass topology as first parameter

There is no longer any ambiguity around what is passed in as the
first parameter to `executeOperation`.  This allows us to optimize
by removing a conditional, and centralizing options and session
management to the `TopologyBase`.

NODE-1088

Author: mbroadst

lib/admin.js

@@ -69,7 +69,7 @@ Admin.prototype.command = function(command, options, callback) {
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
   options = args.length ? args.shift() : {};
 
-  return executeOperation(this.s.db, this.s.db.executeDbAdminCommand.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.executeDbAdminCommand.bind(this.s.db), [
     command,
     options,
     callback
@@ -91,7 +91,7 @@ Admin.prototype.buildInfo = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
 
   const cmd = { buildinfo: 1 };
-  return executeOperation(this.s.db, this.s.db.executeDbAdminCommand.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.executeDbAdminCommand.bind(this.s.db), [
     cmd,
     undefined,
     callback
@@ -113,7 +113,7 @@ Admin.prototype.serverInfo = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
 
   const cmd = { buildinfo: 1 };
-  return executeOperation(this.s.db, this.s.db.executeDbAdminCommand.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.executeDbAdminCommand.bind(this.s.db), [
     cmd,
     options,
     callback
@@ -132,7 +132,7 @@ define.classMethod('serverInfo', { callback: true, promise: true });
  */
 Admin.prototype.serverStatus = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
-  return executeOperation(this.s.db, serverStatus, [this, options, callback]);
+  return executeOperation(this.s.db.s.topology, serverStatus, [this, options, callback]);
 };
 
 var serverStatus = function(self, options, callback) {
@@ -160,7 +160,7 @@ Admin.prototype.ping = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
 
   const cmd = { ping: 1 };
-  return executeOperation(this.s.db, this.s.db.executeDbAdminCommand.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.executeDbAdminCommand.bind(this.s.db), [
     cmd,
     options,
     callback
@@ -218,7 +218,7 @@ Admin.prototype.addUser = function(username, password, options, callback) {
   // Set the db name to admin
   options.dbName = 'admin';
 
-  return executeOperation(this.s.db, this.s.db.addUser.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.addUser.bind(this.s.db), [
     username,
     password,
     options,
@@ -253,7 +253,7 @@ Admin.prototype.removeUser = function(username, options, callback) {
   // Set the db name
   options.dbName = 'admin';
 
-  return executeOperation(this.s.db, this.s.db.removeUser.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.removeUser.bind(this.s.db), [
     username,
     options,
     callback
@@ -278,7 +278,7 @@ Admin.prototype.validateCollection = function(collectionName, options, callback)
   options = args.length ? args.shift() : {};
   options = options || {};
 
-  return executeOperation(this.s.db, validateCollection, [this, collectionName, options, callback]);
+  return executeOperation(this.s.db.s.topology, validateCollection, [this, collectionName, options, callback]);
 };
 
 var validateCollection = function(self, collectionName, options, callback) {
@@ -324,7 +324,7 @@ Admin.prototype.listDatabases = function(options, callback) {
 
   var cmd = { listDatabases: 1 };
   if (options.nameOnly) cmd.nameOnly = Number(cmd.nameOnly);
-  return executeOperation(this.s.db, this.s.db.executeDbAdminCommand.bind(this.s.db), [
+  return executeOperation(this.s.db.s.topology, this.s.db.executeDbAdminCommand.bind(this.s.db), [
     cmd,
     options,
     callback
@@ -343,7 +343,7 @@ define.classMethod('listDatabases', { callback: true, promise: true });
  */
 Admin.prototype.replSetGetStatus = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
-  return executeOperation(this.s.db, replSetGetStatus, [this, options, callback]);
+  return executeOperation(this.s.db.s.topology, replSetGetStatus, [this, options, callback]);
 };
 
 var replSetGetStatus = function(self, options, callback) {

lib/bulk/ordered.js

@@ -588,7 +588,7 @@ OrderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
       : this.s.promiseLibrary.reject(emptyBatchError);
   }
 
-  return executeOperation(this, executeCommands, [this, callback]);
+  return executeOperation(this.s.topology, executeCommands, [this, callback]);
 };
 
 define.classMethod('execute', { callback: true, promise: false });

lib/bulk/unordered.js

@@ -602,7 +602,7 @@ UnorderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
       : this.s.promiseLibrary.reject(emptyBatchError);
   }
 
-  return executeOperation(this, executeBatches, [this, callback]);
+  return executeOperation(this.s.topology, executeBatches, [this, callback]);
 };
 
 define.classMethod('execute', { callback: true, promise: false });