diff options
| author | Qingyang Chen <qingyang.chen@10gen.com> | 2015-06-16 16:16:12 -0400 |
|---|---|---|
| committer | Qingyang Chen <qingyang.chen@10gen.com> | 2015-06-22 13:17:31 -0400 |
| commit | 3f6f66daac840fe2b2dc26eeeacbf015479567df (patch) | |
| tree | 3b8f907c22f9ec41f1a72d1ea71f1dff8376a77d /src/mongo/dbtests/oplogstarttests.cpp | |
| parent | 1e786585ae83e55e13016a6761a121b502c887f8 (diff) | |
| download | mongo-3f6f66daac840fe2b2dc26eeeacbf015479567df.tar.gz | |
SERVER-16889 query subsystem CanonicalQuery::canonicalize use StatusWith<unique_ptr> for ownership transfer
Diffstat (limited to 'src/mongo/dbtests/oplogstarttests.cpp')
| -rw-r--r-- | src/mongo/dbtests/oplogstarttests.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/dbtests/oplogstarttests.cpp b/src/mongo/dbtests/oplogstarttests.cpp index 1c73c533e6b..2d685959a24 100644 --- a/src/mongo/dbtests/oplogstarttests.cpp +++ b/src/mongo/dbtests/oplogstarttests.cpp @@ -83,10 +83,9 @@ protected: } void setupFromQuery(const BSONObj& query) { - CanonicalQuery* cq; - Status s = CanonicalQuery::canonicalize(ns(), query, &cq); - ASSERT(s.isOK()); - _cq.reset(cq); + auto statusWithCQ = CanonicalQuery::canonicalize(ns(), query); + ASSERT_OK(statusWithCQ.getStatus()); + _cq = std::move(statusWithCQ.getValue()); _oplogws.reset(new WorkingSet()); _stage.reset(new OplogStart(&_txn, collection(), _cq->root(), _oplogws.get())); } |