diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2013-06-18 09:58:59 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2013-06-18 09:58:59 -0400 |
| commit | 7471abc180fbd5f7b2ac31c51a71563052ea03ce (patch) | |
| tree | 01b571c7e107bbdf50480ee648986d1d54386a16 /src/mongo/db/clientcursor.cpp | |
| parent | f2e40f7814d0f664d1baa202d623a0e3d678245b (diff) | |
| download | mongo-7471abc180fbd5f7b2ac31c51a71563052ea03ce.tar.gz | |
SERVER-6405: trivial prep cleanup of Database class
Diffstat (limited to 'src/mongo/db/clientcursor.cpp')
| -rw-r--r-- | src/mongo/db/clientcursor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp index df854bf46ef..af4cf615887 100644 --- a/src/mongo/db/clientcursor.cpp +++ b/src/mongo/db/clientcursor.cpp @@ -79,7 +79,7 @@ namespace mongo { if ( L == _lastLoc ) return; - CCByLoc& bl = byLoc(); + CCByLoc& bl = _db->ccByLoc(); if ( !_lastLoc.isNull() ) { bl.erase( ByLocKey( _lastLoc, _cursorid ) ); @@ -109,7 +109,7 @@ namespace mongo { //cout << "\nTEMP invalidate " << ns << endl; Database *db = cc().database(); verify(db); - verify( str::startsWith(ns, db->name) ); + verify( str::startsWith(ns, db->name()) ); for( LockedIterator i; i.ok(); ) { ClientCursor *cc = i.current(); @@ -213,7 +213,7 @@ namespace mongo { void ClientCursor::informAboutToDeleteBucket(const DiskLoc& b) { recursive_scoped_lock lock(ccmutex); Database *db = cc().database(); - CCByLoc& bl = db->ccByLoc; + CCByLoc& bl = db->ccByLoc(); RARELY if ( bl.size() > 70 ) { log() << "perf warning: byLoc.size=" << bl.size() << " in aboutToDeleteBucket" << endl; } @@ -238,7 +238,7 @@ namespace mongo { aboutToDeleteForSharding( ns, db, nsd, dl ); - CCByLoc& bl = db->ccByLoc; + CCByLoc& bl = db->ccByLoc(); CCByLoc::iterator j = bl.lower_bound(ByLocKey::min(dl)); CCByLoc::iterator stop = bl.upper_bound(ByLocKey::max(dl)); if ( j == stop ) @@ -328,7 +328,7 @@ namespace mongo { Lock::assertAtLeastReadLocked(ns); verify( _db ); - verify( str::startsWith(_ns, _db->name) ); + verify( _db->ownsNS( _ns ) ); if( queryOptions & QueryOption_NoCursorTimeout ) noTimeout(); recursive_scoped_lock lock(ccmutex); |