summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2014-04-29 16:12:35 -0400
committerEliot Horowitz <eliot@10gen.com>2014-04-29 16:32:22 -0400
commitda81ef36996268f13b4b62153a766c7f1a1cf93a (patch)
treee5e64d663a87252d60bc4bce605f6d9e2e53130a /src/mongo/db/catalog
parentb36527b1863ed40e527bc80264075c8a09ad4a67 (diff)
downloadmongo-da81ef36996268f13b4b62153a766c7f1a1cf93a.tar.gz
SERVER-13641: add methods to transaction to check if an op is killed
Diffstat (limited to 'src/mongo/db/catalog')
-rw-r--r--src/mongo/db/catalog/collection.cpp5
-rw-r--r--src/mongo/db/catalog/collection.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/db/catalog/collection.cpp b/src/mongo/db/catalog/collection.cpp
index 64a9917b852..bc03f568704 100644
--- a/src/mongo/db/catalog/collection.cpp
+++ b/src/mongo/db/catalog/collection.cpp
@@ -575,11 +575,12 @@ namespace mongo {
};
}
- Status Collection::validate( bool full, bool scanData,
+ Status Collection::validate( TransactionExperiment* txn,
+ bool full, bool scanData,
ValidateResults* results, BSONObjBuilder* output ){
MyValidateAdaptor adaptor;
- Status status = _recordStore->validate( full, scanData, &adaptor, results, output );
+ Status status = _recordStore->validate( txn, full, scanData, &adaptor, results, output );
if ( !status.isOK() )
return status;
diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h
index be9d1f0e386..9c4ed27a540 100644
--- a/src/mongo/db/catalog/collection.h
+++ b/src/mongo/db/catalog/collection.h
@@ -224,7 +224,8 @@ namespace mongo {
* OK will be returned even if corruption is found
* deatils will be in result
*/
- Status validate( bool full, bool scanData,
+ Status validate( TransactionExperiment* txn,
+ bool full, bool scanData,
ValidateResults* results, BSONObjBuilder* output );
/**