SERVER-1752 Remove unused Cursor::matcherPtr() function.

hww3 · Oct 10, 2012 · 25985c2 · 25985c2
1 parent 0235bac
commit 25985c2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 25 deletions.
diff --git a/src/mongo/db/btree.h b/src/mongo/db/btree.h
@@ -1096,7 +1096,6 @@ namespace mongo {
         virtual BSONObj prettyIndexBounds() const;
 
         virtual CoveredIndexMatcher *matcher() const { return _matcher.get(); }
-        virtual shared_ptr< CoveredIndexMatcher > matcherPtr() const { return _matcher; }
 
         virtual void setMatcher( shared_ptr< CoveredIndexMatcher > matcher ) { _matcher = matcher;  }
 

diff --git a/src/mongo/db/cursor.h b/src/mongo/db/cursor.h
@@ -186,8 +186,6 @@ namespace mongo {
 
         // Used when we want fast matcher lookup
         virtual CoveredIndexMatcher *matcher() const { return 0; }
-        // Used when we need to share this matcher with someone else
-        virtual shared_ptr< CoveredIndexMatcher > matcherPtr() const { return shared_ptr< CoveredIndexMatcher >(); }
 
         virtual bool currentMatches( MatchDetails *details = 0 ) {
             return !matcher() || matcher()->matchesCurrent( this, details );
@@ -264,7 +262,6 @@ namespace mongo {
         virtual bool supportGetMore() { return true; }
         virtual bool supportYields() { return true; }
         virtual CoveredIndexMatcher *matcher() const { return _matcher.get(); }
-        virtual shared_ptr< CoveredIndexMatcher > matcherPtr() const { return _matcher; }
         virtual void setMatcher( shared_ptr< CoveredIndexMatcher > matcher ) { _matcher = matcher; }
         virtual const Projection::KeyOnly *keyFieldsOnly() const { return _keyFieldsOnly.get(); }
         virtual void setKeyFieldsOnly( const shared_ptr<Projection::KeyOnly> &keyFieldsOnly ) {

diff --git a/src/mongo/db/geo/2d.cpp b/src/mongo/db/geo/2d.cpp
@@ -1557,11 +1557,6 @@ namespace mongo {
             else return GeoCursorBase::emptyMatcher.get();
         }
 
-        virtual shared_ptr< CoveredIndexMatcher > matcherPtr() const {
-            if( _matcher.get() ) return _matcher;
-            else return GeoCursorBase::emptyMatcher;
-        }
-
         // Are we finished getting points?
         virtual bool moreToDo() {
             return _state != DONE;
@@ -2517,11 +2512,6 @@ namespace mongo {
             else return emptyMatcher.get();
         }
 
-        virtual shared_ptr< CoveredIndexMatcher > matcherPtr() const {
-            if( _s->_matcher.get() ) return _s->_matcher;
-            else return emptyMatcher;
-        }
-
         shared_ptr<GeoSearch> _s;
         GeoHopper::Holder::iterator _cur;
         GeoHopper::Holder::iterator _end;

diff --git a/src/mongo/db/queryoptimizer.h b/src/mongo/db/queryoptimizer.h
@@ -676,7 +676,6 @@ namespace mongo {
 
         virtual bool isMultiKey() const { return _mps->hasMultiKey(); }
 
-        virtual shared_ptr< CoveredIndexMatcher > matcherPtr() const { return _matcher; }
         virtual CoveredIndexMatcher* matcher() const { return _matcher.get(); }
 
         virtual bool capped() const { return _c->capped(); }

diff --git a/src/mongo/db/queryoptimizercursorimpl.cpp b/src/mongo/db/queryoptimizercursorimpl.cpp
@@ -508,14 +508,6 @@ namespace mongo {
 
         virtual long long nscanned() { return _takeover ? _takeover->nscanned() : _nscanned; }
 
-        virtual shared_ptr<CoveredIndexMatcher> matcherPtr() const {
-            if ( _takeover ) {
-                return _takeover->matcherPtr();
-            }
-            assertOk();
-            return _currOp->queryPlan().matcher();
-        }
-
         virtual CoveredIndexMatcher *matcher() const {
             if ( _takeover ) {
                 return _takeover->matcher();

diff --git a/src/mongo/dbtests/queryoptimizercursortests.cpp b/src/mongo/dbtests/queryoptimizercursortests.cpp
@@ -637,7 +637,6 @@ namespace QueryOptimizerCursorTests {
             // _id 10 {_id:1}
             ASSERT_EQUALS( 10, c->current().getIntField( "_id" ) );
             ASSERT( !c->matcher()->matchesCurrent( c.get() ) );
-            ASSERT( !c->matcherPtr()->matchesCurrent( c.get() ) );
             ASSERT( c->advance() );
 
             // _id 0 {a:1}
@@ -653,7 +652,6 @@ namespace QueryOptimizerCursorTests {
             // _id 11 {_id:1}
             ASSERT_EQUALS( BSON( "_id" << 11 << "a" << 12 ), c->current() );
             ASSERT( c->matcher()->matchesCurrent( c.get() ) );
-            ASSERT( c->matcherPtr()->matchesCurrent( c.get() ) );
             ASSERT( !c->getsetdup( c->currLoc() ) );
             ASSERT( c->advance() );