summaryrefslogtreecommitdiff
path: root/src/mongo/scripting
diff options
context:
space:
mode:
authorJacob Evans <jacob.evans@mongodb.com>2019-10-21 23:51:42 +0000
committerevergreen <evergreen@mongodb.com>2019-10-21 23:51:42 +0000
commitdb9291bfafb17427adb031ba0326d1acfc52bde0 (patch)
tree1e2e4dc2fbd7eec88237270d9a1dbea82ccb2d9b /src/mongo/scripting
parent39bfc190446acd0b049c5cb29dfbbc6574a40ce1 (diff)
downloadmongo-db9291bfafb17427adb031ba0326d1acfc52bde0.tar.gz
Revert "SERVER-42748 Support using stored procedures (system.js) in map/reduce"
This reverts commit 6eac52a928f7a949713f7e7c20468ea0ecba8946.
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r--src/mongo/scripting/engine.cpp2
-rw-r--r--src/mongo/scripting/engine.h5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
index eba9c50c9be..149da7f5969 100644
--- a/src/mongo/scripting/engine.cpp
+++ b/src/mongo/scripting/engine.cpp
@@ -421,7 +421,7 @@ public:
void init(const BSONObj* data) {
_real->init(data);
}
- void setLocalDB(StringData dbName) {
+ void setLocalDB(const string& dbName) {
_real->setLocalDB(dbName);
}
void loadStored(OperationContext* opCtx, bool ignoreNotConnected = false) {
diff --git a/src/mongo/scripting/engine.h b/src/mongo/scripting/engine.h
index 4f572cad026..b50c75baed6 100644
--- a/src/mongo/scripting/engine.h
+++ b/src/mongo/scripting/engine.h
@@ -29,7 +29,6 @@
#pragma once
-#include "mongo/base/string_data.h"
#include "mongo/db/jsobj.h"
#include "mongo/db/service_context.h"
#include "mongo/platform/atomic_word.h"
@@ -66,8 +65,8 @@ public:
}
virtual void externalSetup() = 0;
- virtual void setLocalDB(StringData localDBName) {
- _localDBName = localDBName.toString();
+ virtual void setLocalDB(const std::string& localDBName) {
+ _localDBName = localDBName;
}
virtual BSONObj getObject(const char* field) = 0;