summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/clienttests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/dbtests/clienttests.cpp')
-rw-r--r--src/mongo/dbtests/clienttests.cpp120
1 files changed, 60 insertions, 60 deletions
diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp
index 9cb2d0b70c1..722618b9320 100644
--- a/src/mongo/dbtests/clienttests.cpp
+++ b/src/mongo/dbtests/clienttests.cpp
@@ -47,17 +47,17 @@ using std::vector;
class Base {
public:
Base(string coll) : _ns("test." + coll) {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.dropDatabase("test");
}
virtual ~Base() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.dropCollection(_ns);
}
@@ -74,20 +74,20 @@ class DropIndex : public Base {
public:
DropIndex() : Base("dropindex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.insert(ns(), BSON("x" << 2));
ASSERT_EQUALS(1u, db.getIndexSpecs(ns()).size());
- ASSERT_OK(dbtests::createIndex(&txn, ns(), BSON("x" << 1)));
+ ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("x" << 1)));
ASSERT_EQUALS(2u, db.getIndexSpecs(ns()).size());
db.dropIndex(ns(), BSON("x" << 1));
ASSERT_EQUALS(1u, db.getIndexSpecs(ns()).size());
- ASSERT_OK(dbtests::createIndex(&txn, ns(), BSON("x" << 1)));
+ ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("x" << 1)));
ASSERT_EQUALS(2u, db.getIndexSpecs(ns()).size());
db.dropIndexes(ns());
@@ -104,11 +104,11 @@ class BuildIndex : public Base {
public:
BuildIndex() : Base("buildIndex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
- OldClientWriteContext ctx(&txn, ns());
- DBDirectClient db(&txn);
+ OldClientWriteContext ctx(&opCtx, ns());
+ DBDirectClient db(&opCtx);
db.insert(ns(), BSON("x" << 1 << "y" << 2));
db.insert(ns(), BSON("x" << 2 << "y" << 2));
@@ -117,19 +117,19 @@ public:
ASSERT(collection);
IndexCatalog* indexCatalog = collection->getIndexCatalog();
- ASSERT_EQUALS(1, indexCatalog->numIndexesReady(&txn));
+ ASSERT_EQUALS(1, indexCatalog->numIndexesReady(&opCtx));
// _id index
ASSERT_EQUALS(1U, db.getIndexSpecs(ns()).size());
ASSERT_EQUALS(ErrorCodes::DuplicateKey,
- dbtests::createIndex(&txn, ns(), BSON("y" << 1), true));
+ dbtests::createIndex(&opCtx, ns(), BSON("y" << 1), true));
- ASSERT_EQUALS(1, indexCatalog->numIndexesReady(&txn));
+ ASSERT_EQUALS(1, indexCatalog->numIndexesReady(&opCtx));
ASSERT_EQUALS(1U, db.getIndexSpecs(ns()).size());
- ASSERT_OK(dbtests::createIndex(&txn, ns(), BSON("x" << 1), true));
+ ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("x" << 1), true));
- ASSERT_EQUALS(2, indexCatalog->numIndexesReady(&txn));
+ ASSERT_EQUALS(2, indexCatalog->numIndexesReady(&opCtx));
ASSERT_EQUALS(2U, db.getIndexSpecs(ns()).size());
}
};
@@ -138,16 +138,16 @@ class CS_10 : public Base {
public:
CS_10() : Base("CS_10") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
const string longs(770, 'c');
for (int i = 0; i < 1111; ++i) {
db.insert(ns(), BSON("a" << i << "b" << longs));
}
- ASSERT_OK(dbtests::createIndex(&txn, ns(), BSON("a" << 1 << "b" << 1)));
+ ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("a" << 1 << "b" << 1)));
unique_ptr<DBClientCursor> c = db.query(ns(), Query().sort(BSON("a" << 1 << "b" << 1)));
ASSERT_EQUALS(1111, c->itcount());
@@ -158,9 +158,9 @@ class PushBack : public Base {
public:
PushBack() : Base("PushBack") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
for (int i = 0; i < 10; ++i) {
db.insert(ns(), BSON("i" << i));
@@ -204,9 +204,9 @@ class Create : public Base {
public:
Create() : Base("Create") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createCollection("unittests.clienttests.create", 4096, true);
BSONObj info;
@@ -237,9 +237,9 @@ class CreateSimpleV1Index : public Base {
public:
CreateSimpleV1Index() : Base("CreateSimpleV1Index") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(), IndexSpec().addKey("aField").version(1));
}
@@ -249,9 +249,9 @@ class CreateSimpleNamedV1Index : public Base {
public:
CreateSimpleNamedV1Index() : Base("CreateSimpleNamedV1Index") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(), IndexSpec().addKey("aField").version(1).name("aFieldV1Index"));
}
@@ -261,9 +261,9 @@ class CreateCompoundNamedV1Index : public Base {
public:
CreateCompoundNamedV1Index() : Base("CreateCompoundNamedV1Index") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(),
IndexSpec()
@@ -279,9 +279,9 @@ public:
CreateUniqueSparseDropDupsIndexInBackground()
: Base("CreateUniqueSparseDropDupsIndexInBackground") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(
ns(), IndexSpec().addKey("aField").background().unique().sparse().dropDuplicates());
@@ -292,9 +292,9 @@ class CreateComplexTextIndex : public Base {
public:
CreateComplexTextIndex() : Base("CreateComplexTextIndex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(),
IndexSpec()
@@ -311,9 +311,9 @@ class Create2DIndex : public Base {
public:
Create2DIndex() : Base("Create2DIndex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(),
IndexSpec()
@@ -328,9 +328,9 @@ class CreateHaystackIndex : public Base {
public:
CreateHaystackIndex() : Base("CreateHaystackIndex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(),
IndexSpec()
@@ -344,9 +344,9 @@ class Create2DSphereIndex : public Base {
public:
Create2DSphereIndex() : Base("Create2DSphereIndex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(),
IndexSpec()
@@ -359,9 +359,9 @@ class CreateHashedIndex : public Base {
public:
CreateHashedIndex() : Base("CreateHashedIndex") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(), IndexSpec().addKey("aField", IndexSpec::kIndexTypeHashed));
}
@@ -371,9 +371,9 @@ class CreateIndexFailure : public Base {
public:
CreateIndexFailure() : Base("CreateIndexFailure") {}
void run() {
- const ServiceContext::UniqueOperationContext txnPtr = cc().makeOperationContext();
- OperationContext& txn = *txnPtr;
- DBDirectClient db(&txn);
+ const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
+ OperationContext& opCtx = *opCtxPtr;
+ DBDirectClient db(&opCtx);
db.createIndex(ns(), IndexSpec().addKey("aField"));
ASSERT_THROWS(db.createIndex(ns(), IndexSpec().addKey("aField").unique()), UserException);
View Lorry Controller Status