summaryrefslogtreecommitdiff
path: root/src/mongo/scripting/engine.cpp
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2017-03-07 12:00:08 -0500
committerMaria van Keulen <maria@mongodb.com>2017-03-07 12:00:08 -0500
commit589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 (patch)
treec7a090ffdd56a91ae677e2492c61b820af44f964 /src/mongo/scripting/engine.cpp
parent3cba97198638df3750e3b455e2ad57af7ee536ae (diff)
downloadmongo-589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79.tar.gz
SERVER-27938 Rename all OperationContext variables to opCtx
This commit is an automated rename of all whole word instances of txn, _txn, and txnPtr to opCtx, _opCtx, and opCtxPtr, respectively in all .cpp and .h files in src/mongo.
Diffstat (limited to 'src/mongo/scripting/engine.cpp')
-rw-r--r--src/mongo/scripting/engine.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
index 514568589bb..76b56a60ba9 100644
--- a/src/mongo/scripting/engine.cpp
+++ b/src/mongo/scripting/engine.cpp
@@ -192,8 +192,8 @@ public:
void rollback() {}
};
-void Scope::storedFuncMod(OperationContext* txn) {
- txn->recoveryUnit()->registerChange(new StoredFuncModLogOpHandler());
+void Scope::storedFuncMod(OperationContext* opCtx) {
+ opCtx->recoveryUnit()->registerChange(new StoredFuncModLogOpHandler());
}
void Scope::validateObjectIdString(const string& str) {
@@ -202,7 +202,7 @@ void Scope::validateObjectIdString(const string& str) {
uassert(10430, "invalid object id: not hex", std::isxdigit(str.at(i)));
}
-void Scope::loadStored(OperationContext* txn, bool ignoreNotConnected) {
+void Scope::loadStored(OperationContext* opCtx, bool ignoreNotConnected) {
if (_localDBName.size() == 0) {
if (ignoreNotConnected)
return;
@@ -216,7 +216,7 @@ void Scope::loadStored(OperationContext* txn, bool ignoreNotConnected) {
_loadedVersion = lastVersion;
string coll = _localDBName + ".system.js";
- auto directDBClient = DBDirectClientFactory::get(txn).create(txn);
+ auto directDBClient = DBDirectClientFactory::get(opCtx).create(opCtx);
unique_ptr<DBClientCursor> c =
directDBClient->query(coll, Query(), 0, 0, NULL, QueryOption_SlaveOk, 0);
@@ -344,7 +344,7 @@ public:
_pools.push_front(toStore);
}
- std::shared_ptr<Scope> tryAcquire(OperationContext* txn, const string& poolName) {
+ std::shared_ptr<Scope> tryAcquire(OperationContext* opCtx, const string& poolName) {
stdx::lock_guard<stdx::mutex> lk(_mutex);
for (Pools::iterator it = _pools.begin(); it != _pools.end(); ++it) {
@@ -353,7 +353,7 @@ public:
_pools.erase(it);
scope->incTimesUsed();
scope->reset();
- scope->registerOperation(txn);
+ scope->registerOperation(opCtx);
return scope;
}
}
@@ -402,8 +402,8 @@ public:
void reset() {
_real->reset();
}
- void registerOperation(OperationContext* txn) {
- _real->registerOperation(txn);
+ void registerOperation(OperationContext* opCtx) {
+ _real->registerOperation(opCtx);
}
void unregisterOperation() {
_real->unregisterOperation();
@@ -411,14 +411,14 @@ public:
void init(const BSONObj* data) {
_real->init(data);
}
- void localConnectForDbEval(OperationContext* txn, const char* dbName) {
+ void localConnectForDbEval(OperationContext* opCtx, const char* dbName) {
invariant(!"localConnectForDbEval should only be called from dbEval");
}
void setLocalDB(const string& dbName) {
_real->setLocalDB(dbName);
}
- void loadStored(OperationContext* txn, bool ignoreNotConnected = false) {
- _real->loadStored(txn, ignoreNotConnected);
+ void loadStored(OperationContext* opCtx, bool ignoreNotConnected = false) {
+ _real->loadStored(opCtx, ignoreNotConnected);
}
void externalSetup() {
_real->externalSetup();
@@ -532,20 +532,20 @@ private:
};
/** Get a scope from the pool of scopes matching the supplied pool name */
-unique_ptr<Scope> ScriptEngine::getPooledScope(OperationContext* txn,
+unique_ptr<Scope> ScriptEngine::getPooledScope(OperationContext* opCtx,
const string& db,
const string& scopeType) {
const string fullPoolName = db + scopeType;
- std::shared_ptr<Scope> s = scopeCache.tryAcquire(txn, fullPoolName);
+ std::shared_ptr<Scope> s = scopeCache.tryAcquire(opCtx, fullPoolName);
if (!s) {
s.reset(newScope());
- s->registerOperation(txn);
+ s->registerOperation(opCtx);
}
unique_ptr<Scope> p;
p.reset(new PooledScope(fullPoolName, s));
p->setLocalDB(db);
- p->loadStored(txn, true);
+ p->loadStored(opCtx, true);
return p;
}