SERVER-13640 Capped structural unit tests

chandu121 · May 16, 2014 · 9cfae91 · 9cfae91
1 parent 2917ad0
commit 9cfae91
Show file tree

Hide file tree

Showing 8 changed files with 539 additions and 31 deletions.
diff --git a/src/mongo/db/structure/catalog/namespace_details.h b/src/mongo/db/structure/catalog/namespace_details.h
@@ -158,8 +158,6 @@ namespace mongo {
         const DiskLoc& capFirstNewRecord() const { return _capFirstNewRecord; }
         void setCapFirstNewRecord( OperationContext* txn, const DiskLoc& loc );
 
-        bool capLooped() const { return _capFirstNewRecord.isValid(); }
-
     public:
 
         const DiskLoc& firstExtent() const { return _firstExtent; }

diff --git a/src/mongo/db/structure/record_store_v1_base.h b/src/mongo/db/structure/record_store_v1_base.h
@@ -52,7 +52,7 @@ namespace mongo {
         virtual const DiskLoc& capFirstNewRecord() const = 0;
         virtual void setCapFirstNewRecord( OperationContext* txn, const DiskLoc& loc ) = 0;
 
-        virtual bool capLooped() const = 0;
+        bool capLooped() const { return capFirstNewRecord().isValid(); }
 
         virtual long long dataSize() const = 0;
         virtual long long numRecords() const = 0;

diff --git a/src/mongo/db/structure/record_store_v1_capped.cpp b/src/mongo/db/structure/record_store_v1_capped.cpp
@@ -485,7 +485,7 @@ namespace mongo {
             // documents to make room for other documents, and we are allocating
             // documents from free space in fresh extents instead of reusing
             // space from familiar extents.
-            if ( !capLooped() ) {
+            if ( !_details->capLooped() ) {
 
                 // We just removed the last record from the 'capExtent', and
                 // the 'capExtent' can't be empty, so we set 'capExtent' to
@@ -559,10 +559,6 @@ namespace mongo {
         return _details->setDeletedListEntry(txn, 1, loc);
     }
 
-    bool CappedRecordStoreV1::capLooped() const {
-        return _details->capFirstNewRecord().isValid();
-    }
-
     Extent* CappedRecordStoreV1::theCapExtent() const {
         return _extentManager->getExtent(_details->capExtent());
     }
@@ -598,7 +594,7 @@ namespace mongo {
     vector<RecordIterator*> CappedRecordStoreV1::getManyIterators() const {
         OwnedPointerVector<RecordIterator> iterators;
 
-        if (!capLooped()) {
+        if (!_details->capLooped()) {
             // if we haven't looped yet, just spit out all extents (same as non-capped impl)
             const Extent* ext;
             for (DiskLoc extLoc = details()->firstExtent(); !extLoc.isNull(); extLoc = ext->xnext) {

diff --git a/src/mongo/db/structure/record_store_v1_capped.h b/src/mongo/db/structure/record_store_v1_capped.h
@@ -101,7 +101,6 @@ namespace mongo {
         const DiskLoc& cappedLastDelRecLastExtent() const;
         void setListOfAllDeletedRecords( OperationContext* txn, const DiskLoc& loc );
         void setLastDelRecLastExtent( OperationContext* txn, const DiskLoc& loc );
-        bool capLooped() const;
         Extent *theCapExtent() const;
         bool nextIsInCapExtent( const DiskLoc &dl ) const;
         void advanceCapExtent( OperationContext* txn, const StringData& ns );