refactor(applyWriteConcern): remove check for capabilities

writeConcern has been supported since 2.6, we only need to check for server support in aggregation's $out in which case support was deferred to 3.4
mongodb · Apr 16, 2018 · 14d7f93 · 14d7f93
1 parent 7d626c0
commit 14d7f93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/collection.js b/lib/collection.js
@@ -2383,7 +2383,11 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
   }
 
   // Decorate command with writeConcern if out has been specified
-  if (pipeline.length > 0 && pipeline[pipeline.length - 1]['$out']) {
+  if (
+    pipeline.length > 0 &&
+    pipeline[pipeline.length - 1]['$out'] &&
+    self.s.topology.capabilities().commandsTakeWriteConcern
+  ) {
     applyWriteConcern(command, { db: self.s.db, collection: self }, options);
   }
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -454,11 +454,6 @@ function applyWriteConcern(target, sources, options) {
   options = options || {};
   const db = sources.db;
   const coll = sources.collection;
-  const topology = db ? db.s.topology : coll.s.topology;
-
-  if (!topology.capabilities().commandsTakeWriteConcern) {
-    return target;
-  }
 
   // NOTE: there is probably a much better place for this
   if (db && db.s.options.retryWrites) {