Merge pull request mongodb-partners#27 from denis-protyvenskyi/v3.2.11

v3.2.11
igorsol · Nov 30, 2016 · 187577c · 187577c
2 parents d5d935c + 6005112
commit 187577c
Show file tree

Hide file tree

Showing 6 changed files with 339 additions and 153 deletions.
diff --git a/src/rocks_engine.cpp b/src/rocks_engine.cpp
@@ -350,17 +350,17 @@ namespace mongo {
         RocksRecordStore* recordStore =
             options.capped
                 ? new RocksRecordStore(
-                      ns, ident, _db.get(), _counterManager.get(), _getIdentPrefix(ident), true,
-                      options.cappedSize ? options.cappedSize : 4096,  // default size
+                      ns, ident, _db.get(), _counterManager.get(), _durabilityManager.get(), _getIdentPrefix(ident),
+                      true, options.cappedSize ? options.cappedSize : 4096,  // default size
                       options.cappedMaxDocs ? options.cappedMaxDocs : -1)
                 : new RocksRecordStore(ns, ident, _db.get(), _counterManager.get(),
-                                       _getIdentPrefix(ident));
+                                       _durabilityManager.get(), _getIdentPrefix(ident));
 
         {
             stdx::lock_guard<stdx::mutex> lk(_identObjectMapMutex);
             _identCollectionMap[ident] = recordStore;
         }
-        return recordStore;
+        return std::move(recordStore);
     }
 
     Status RocksEngine::createSortedDataInterface(OperationContext* opCtx, StringData ident,