Move HashTableDepthStatVisitor to it's own file

Move HashTableDepthStatVisitor from hash_table.h to its own file
(hash_table_stat_visitor.h). This removes the need for hash_table.h to
include utilities/hdrhistogram.h

Change-Id: I7ab3f4fb0c27c360cdcb8d965ecc8fe8ccfffa53
Reviewed-on: http://review.couchbase.org/110226
Reviewed-by: Richard de Mellow <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: daverigby

engines/ep/management/mc_bin_client.py

@@ -713,6 +713,9 @@ def enable_xerror(self):
     def enable_collections(self):
         self.req_features.add(memcacheConstants.FEATURE_COLLECTIONS)
 
+    def enable_mutation_seqno(self):
+        self.req_features.add(memcacheConstants.FEATURE_MUTATION_SEQNO)
+
     def is_xerror_supported(self):
         return memcacheConstants.FEATURE_XERROR in self.features
 

engines/ep/management/sync_repl.py

@@ -15,6 +15,7 @@
 
 client = mc_bin_client.MemcachedClient(host=host, port=port)
 client.enable_xerror()
+client.enable_mutation_seqno()
 client.hello("set_durable")
 client.sasl_auth_plain(user=sys.argv[2], password=sys.argv[3])
 client.bucket_select(sys.argv[4])

engines/ep/src/ep_engine.cc

@@ -35,6 +35,7 @@
 #include "ext_meta_parser.h"
 #include "failover-table.h"
 #include "flusher.h"
+#include "hash_table_stat_visitor.h"
 #include "htresizer.h"
 #include "memory_tracker.h"
 #include "replicationthrottle.h"

engines/ep/src/hash_table.h

@@ -22,7 +22,6 @@
 #include "storeddockey.h"
 
 #include <platform/non_negative_counter.h>
-#include <utilities/hdrhistogram.h>
 
 #include <array>
 #include <functional>
@@ -1486,32 +1485,6 @@ class HashTableDepthVisitor {
     virtual void visit(int bucket, int depth, size_t mem) = 0;
 };
 
-/**
- * Hash table visitor that finds the min and max bucket depths.
- */
-class HashTableDepthStatVisitor : public HashTableDepthVisitor {
-public:
-    HashTableDepthStatVisitor() : size(0), memUsed(0), min(-1), max(0) {
-    }
-
-    void visit(int bucket, int depth, size_t mem) {
-        (void)bucket;
-        // -1 is a special case for min.  If there's a value other than
-        // -1, we prefer that.
-        min = std::min(min == -1 ? depth : min, depth);
-        max = std::max(max, depth);
-        depthHisto.add(depth);
-        size += depth;
-        memUsed += mem;
-    }
-
-    Hdr1sfInt32Histogram depthHisto;
-    size_t                  size;
-    size_t                  memUsed;
-    int                     min;
-    int                     max;
-};
-
 /**
  * Track the current number of hashtable visitors.
  *

engines/ep/src/hash_table_stat_visitor.h

@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2019 Couchbase, Inc
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include "hash_table.h"
+#include <utilities/hdrhistogram.h>
+
+/**
+ * Hash table visitor that finds the min and max bucket depths.
+ */
+class HashTableDepthStatVisitor : public HashTableDepthVisitor {
+public:
+    HashTableDepthStatVisitor() : size(0), memUsed(0), min(-1), max(0) {
+    }
+
+    void visit(int bucket, int depth, size_t mem) {
+        (void)bucket;
+        // -1 is a special case for min.  If there's a value other than
+        // -1, we prefer that.
+        min = std::min(min == -1 ? depth : min, depth);
+        max = std::max(max, depth);
+        depthHisto.add(depth);
+        size += depth;
+        memUsed += mem;
+    }
+
+    Hdr1sfInt32Histogram depthHisto;
+    size_t size;
+    size_t memUsed;
+    int min;
+    int max;
+};

engines/ep/src/sizes.cc

@@ -25,6 +25,7 @@
 #include "couch-kvstore/couch-kvstore.h"
 #include "dcp/response.h"
 #include "dcp/stream.h"
+#include "hash_table_stat_visitor.h"
 #include "item.h"
 #include "kvstore_priv.h"
 #include "persistence_callback.h"

engines/ep/src/vbucket.cc

@@ -32,6 +32,7 @@
 #include "failover-table.h"
 #include "flusher.h"
 #include "hash_table.h"
+#include "hash_table_stat_visitor.h"
 #include "kvstore.h"
 #include "pre_link_document_context.h"
 #include "statwriter.h"
@@ -376,6 +377,12 @@ std::vector<const void*> VBucket::getCookiesForInFlightSyncWrites() {
     return getActiveDM().getCookiesForInFlightSyncWrites();
 }
 
+size_t VBucket::size() {
+    HashTableDepthStatVisitor v;
+    ht.visitDepth(v);
+    return v.size;
+}
+
 VBucket::ItemsToFlush VBucket::getItemsToPersist(size_t approxLimit) {
     // Fetch up to approxLimit items from rejectQueue, backfill items and
     // checkpointManager (in that order); then check if we obtained everything

engines/ep/src/vbucket.h

@@ -528,11 +528,7 @@ class VBucket : public std::enable_shared_from_this<VBucket> {
      */
     std::vector<const void*> getCookiesForInFlightSyncWrites();
 
-    size_t size(void) {
-        HashTableDepthStatVisitor v;
-        ht.visitDepth(v);
-        return v.size;
-    }
+    size_t size();
 
     size_t getBackfillSize() {
         return backfill.rlock()->items.size();

engines/ep/tests/module_tests/hash_table_test.cc

@@ -15,6 +15,7 @@
  *   limitations under the License.
  */
 #include "hash_table_test.h"
+#include "hash_table_stat_visitor.h"
 #include "item.h"
 #include "item_freq_decayer_visitor.h"
 #include "kv_bucket.h"