no one uses setNoJournal anymore so get rid of SERVER-5183

Author: erh

src/mongo/db/dur.cpp

@@ -177,44 +177,11 @@ namespace mongo {
             return x; 
         }
 
-        void NonDurableImpl::setNoJournal(void *dst, void *src, unsigned len) {
-            memcpy(dst, src, len);
-        }
-
         void NonDurableImpl::declareWriteIntent(void *, unsigned) { 
             cc().writeHappened(); 
         }
 
         void assertLockedForCommitting();
-        void DurableImpl::setNoJournal(void *dst, void *src, unsigned len) {
-            // we are at least read locked, so we need not worry about REMAPPRIVATEVIEW herein.
-            assertLockedForCommitting();
-
-            MemoryMappedFile::makeWritable(dst, len);
-
-            // we enter the RecoveryJob mutex here, so that if WRITETODATAFILES is happening we do not 
-            // conflict with it
-            scoped_lock lk1( RecoveryJob::get()._mx );
-
-            // we stay in this mutex for everything to work with DurParanoid/validateSingleMapMatches
-            //
-            // either of these mutexes also makes setNoJournal threadsafe, which is good as we call it from a read 
-            // (not a write) lock in class SlaveTracking
-            //
-            scoped_lock lk( privateViews._mutex() );
-
-            size_t ofs;
-            MongoMMF *f = privateViews.find_inlock(dst, ofs);
-            assert(f);
-            void *w = (((char *)f->view_write())+ofs);
-            // first write it to the writable (file) view
-            memcpy(w, src, len);
-            if( memcmp(w, dst, len) ) {
-                // if we get here, a copy-on-write had previously occurred. so write it to the private view too
-                // to keep them in sync.  we do this as we do not want to cause a copy on write unnecessarily.
-                memcpy(dst, src, len);
-            }
-        }
 
         static DurableImpl* durableImpl = new DurableImpl();
         static NonDurableImpl* nonDurableImpl = new NonDurableImpl();
@@ -403,7 +370,6 @@ namespace mongo {
 
                     assert( mmf->length() == (unsigned) mmf->length() );
 
-                    scoped_lock lk( privateViews._mutex() ); // see setNoJournal
                     if (memcmp(p, w, (unsigned) mmf->length()) == 0)
                         return; // next file
 

src/mongo/db/dur.h

@@ -134,14 +134,6 @@ namespace mongo {
                 return (T*) writingPtr(x, sizeof(T));
             }
 
-            /** write something that doesn't have to be journaled, as this write is "unimportant".
-                a good example is paddingFactor.
-                can be thought of as memcpy(dst,src,len)
-                the dur implementation acquires a mutex in this method, so do not assume it is faster
-                without measuring!
-            */
-            virtual void setNoJournal(void *dst, void *src, unsigned len) = 0;
-
             /** Commits pending changes, flushes all changes to main data
                 files, then removes the journal.
                 
@@ -183,7 +175,6 @@ namespace mongo {
             bool commitNow() { return false; }
             bool commitIfNeeded() { return false; }
             bool aCommitIsNeeded() const { return false; }
-            void setNoJournal(void *dst, void *src, unsigned len);
             void syncDataAndTruncateJournal() {}
         };
 
@@ -197,7 +188,6 @@ namespace mongo {
             bool commitNow();
             bool aCommitIsNeeded() const;
             bool commitIfNeeded();
-            void setNoJournal(void *dst, void *src, unsigned len);
             void syncDataAndTruncateJournal();
         };
 

src/mongo/db/dur_recover.h

@@ -40,7 +40,7 @@ namespace mongo {
             unsigned long long _lastDataSyncedFromLastRun;
             unsigned long long _lastSeqMentionedInConsoleLog;
         public:
-            mongo::mutex _mx; // protects _mmfs; see setNoJournal() too
+            mongo::mutex _mx; // protects _mmfs
         private:
             bool _recovering; // are we in recovery or WRITETODATAFILES
 

src/mongo/db/namespace.h

@@ -299,7 +299,6 @@ namespace mongo {
                 double x = paddingFactor - 0.001;
                 if ( x >= 1.0 ) {
                     *getDur().writing(&paddingFactor) = x;
-                    //getDur().setNoJournal(&paddingFactor, &x, sizeof(x));
                 }
             }
         }
@@ -316,7 +315,6 @@ namespace mongo {
                 double x = paddingFactor + (0.001 * N);
                 if ( x <= 2.0 ) {
                     *getDur().writing(&paddingFactor) = x;
-                    //getDur().setNoJournal(&paddingFactor, &x, sizeof(x));
                 }
             }
         }