Revert "Fix data race in CouchKVStore stats access"

 
(as this breaks windows:
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\vector(1708) : error C2558: class 'Couchbase::RelaxedAtomic<uint64_t>' : no copy constructor available or copy constructor is declared 'explicit')

This reverts commit a847eb3.

Change-Id: I05c57a1be697c50f4ae091e277c684bc2f8afdd5
Reviewed-on: http://review.couchbase.org/55887
Reviewed-by: abhinav dangeti <[email protected]>
Tested-by: abhinav dangeti <[email protected]>

Author: abhinavdangeti

src/couch-kvstore/couch-kvstore.cc

@@ -281,9 +281,9 @@ CouchKVStore::CouchKVStore(KVStoreConfig &config, bool read_only) :
 
     // pre-allocate lookup maps (vectors) given we have a relatively
     // small, fixed number of vBuckets.
-    dbFileRevMap.assign(numDbFiles, Couchbase::RelaxedAtomic<uint64_t>(1));
-    cachedDocCount.assign(numDbFiles, Couchbase::RelaxedAtomic<size_t>(-1));
-    cachedDeleteCount.assign(numDbFiles, Couchbase::RelaxedAtomic<size_t>(-1));
+    dbFileRevMap.assign(numDbFiles, 1);
+    cachedDocCount.assign(numDbFiles, -1);
+    cachedDeleteCount.assign(numDbFiles, -1);
     cachedVBStates.assign(numDbFiles, nullptr);
 
     initialize();

src/couch-kvstore/couch-kvstore.h

@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "libcouchstore/couch_db.h"
-#include <relaxed_atomic.h>
 
 #include <map>
 #include <string>
@@ -528,26 +527,19 @@ class CouchKVStore : public KVStore
     void removeCompactFile(const std::string &filename);
 
     const std::string dbname;
-
-    // Map of the fileRev for each vBucket. Using RelaxedAtomic so
-    // stats gathering (doDcpVbTakeoverStats) can get a snapshot
-    // without having to lock.
-    std::vector<Couchbase::RelaxedAtomic<uint64_t>> dbFileRevMap;
-
+    std::vector<uint64_t>dbFileRevMap;
     uint16_t numDbFiles;
     std::vector<CouchRequest *> pendingReqsQ;
     bool intransaction;
 
     /* all stats */
     CouchKVStoreStats   st;
     couch_file_ops statCollectingFileOps;
-    /* deleted docs in each file, indexed by vBucket. RelaxedAtomic
-       to allow stats access witout lock */
-    std::vector<Couchbase::RelaxedAtomic<size_t>> cachedDeleteCount;
+    /* deleted docs in each file, indexed by vBucket */
+    std::vector<size_t> cachedDeleteCount;
 
-    /* non-deleted docs in each file, indexed by vBucket.
-       RelaxedAtomic to allow stats access witout lock. */
-    std::vector<Couchbase::RelaxedAtomic<size_t>> cachedDocCount;
+    /* non-deleted docs in each file, indexed by vBucket */
+    std::vector<size_t> cachedDocCount;
 
     /* pending file deletions */
     AtomicQueue<std::string> pendingFileDeletions;