diff options
author | Mathias Stearn <mathias@10gen.com> | 2014-11-26 15:04:26 -0500 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2014-11-26 15:15:59 -0500 |
commit | 16a8ef7ad60d498b69bdc0ad5cbca44757d16fd8 (patch) | |
tree | 2d9f056acf8f1b9b2e943f82e315bdf019475a38 /src/mongo/db/exec/count_scan.cpp | |
parent | cb5cab88761d9aca75e064665cce89f579c69e36 (diff) | |
download | mongo-16a8ef7ad60d498b69bdc0ad5cbca44757d16fd8.tar.gz |
SERVER-13679 Replace DiskLoc with RecordId outside of MMAPv1
Operations:
sed -i -e 's/\<DiskLoc\>/RecordId/g'
sed -i -e 's/\<DiskLocs\>/RecordIds/g'
sed -i -e 's/\<minDiskLoc\>/RecordId::min()/g'
sed -i -e 's/\<maxDiskLoc\>/RecordId::max()/g'
sed -i -e 's/\<getDiskLoc\>/getRecordId/g''
Changes under mmap_v1 were reverted and redone by hand as needed.
Diffstat (limited to 'src/mongo/db/exec/count_scan.cpp')
-rw-r--r-- | src/mongo/db/exec/count_scan.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/exec/count_scan.cpp b/src/mongo/db/exec/count_scan.cpp index 09d4b098d1d..b860032f33f 100644 --- a/src/mongo/db/exec/count_scan.cpp +++ b/src/mongo/db/exec/count_scan.cpp @@ -117,7 +117,7 @@ namespace mongo { if (isEOF()) { return PlanStage::IS_EOF; } - DiskLoc loc = _btreeCursor->getValue(); + RecordId loc = _btreeCursor->getValue(); _btreeCursor->next(); checkEnd(); @@ -203,18 +203,18 @@ namespace mongo { checkEnd(); } - void CountScan::invalidate(OperationContext* txn, const DiskLoc& dl, InvalidationType type) { + void CountScan::invalidate(OperationContext* txn, const RecordId& dl, InvalidationType type) { ++_commonStats.invalidates; - // The only state we're responsible for holding is what DiskLocs to drop. If a document + // The only state we're responsible for holding is what RecordIds to drop. If a document // mutates the underlying index cursor will deal with it. if (INVALIDATION_MUTATION == type) { return; } - // If we see this DiskLoc again, it may not be the same document it was before, so we want + // If we see this RecordId again, it may not be the same document it was before, so we want // to return it if we see it again. - unordered_set<DiskLoc, DiskLoc::Hasher>::iterator it = _returned.find(dl); + unordered_set<RecordId, RecordId::Hasher>::iterator it = _returned.find(dl); if (it != _returned.end()) { _returned.erase(it); } |