diff options
author | Eliot Horowitz <eliot@10gen.com> | 2015-02-02 15:39:22 -0500 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2015-02-02 15:40:16 -0500 |
commit | d46a5c78c0d046f1975aca2eaa7f055a713c720f (patch) | |
tree | e694224fd2802cdbeecde7d87b5983d19bc49f31 /src/mongo/db/exec/working_set.cpp | |
parent | 87f1334585928a2b86407f68ecb6b35c62855b24 (diff) | |
download | mongo-d46a5c78c0d046f1975aca2eaa7f055a713c720f.tar.gz |
SERVER-17132: Added SnapshotId and Snapshotted and use them in query to make sure we use correct versions of docs
Diffstat (limited to 'src/mongo/db/exec/working_set.cpp')
-rw-r--r-- | src/mongo/db/exec/working_set.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/exec/working_set.cpp b/src/mongo/db/exec/working_set.cpp index c35b39d7c94..cbe7217b1b6 100644 --- a/src/mongo/db/exec/working_set.cpp +++ b/src/mongo/db/exec/working_set.cpp @@ -183,7 +183,7 @@ namespace mongo { } keyData.clear(); - obj = BSONObj(); + obj.reset(); state = WorkingSetMember::INVALID; } @@ -232,7 +232,7 @@ namespace mongo { bool WorkingSetMember::getFieldDotted(const string& field, BSONElement* out) const { // If our state is such that we have an object, use it. if (hasObj()) { - *out = obj.getFieldDotted(field); + *out = obj.value().getFieldDotted(field); return true; } @@ -266,7 +266,7 @@ namespace mongo { // XXX: Unowned objects count towards current size. // See SERVER-12579 if (hasObj()) { - memUsage += obj.objsize(); + memUsage += obj.value().objsize(); } for (size_t i = 0; i < keyData.size(); ++i) { |