Minimise includes of kv_bucket.h

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

Author: daverigby

engines/ep/benchmarks/access_scanner_bench.cc

@@ -28,6 +28,7 @@
 
 #include "engine_fixture.h"
 #include "item.h"
+#include "kv_bucket.h"
 
 class AccessLogBenchEngine : public EngineFixture {
 protected:

engines/ep/benchmarks/vbucket_bench.cc

@@ -22,8 +22,10 @@
 #include "benchmark_memory_tracker.h"
 #include "checkpoint_manager.h"
 #include "engine_fixture.h"
+#include "ep_bucket.h"
 #include "fakes/fake_executorpool.h"
 #include "item.h"
+#include "kv_bucket.h"
 #include "stored_value_factories.h"
 
 #include "../tests/module_tests/thread_gate.h"

engines/ep/src/monotonic.h

@@ -21,6 +21,7 @@
 #include <limits>
 #include <stdexcept>
 #include <string>
+#include <typeinfo>
 
 /// Policy class for handling non-monotonic updates by simply ignoring them.
 template <class T>

engines/ep/src/vbucket_queue_item_ctx.h

@@ -20,6 +20,8 @@
 #include <boost/variant.hpp>
 #include <memcached/durability_spec.h>
 
+class PreLinkDocumentContext;
+
 /**
  * Structure which holds the information needed when enqueueing an item which
  * has Durability requirements.

engines/ep/tests/mock/mock_synchronous_ep_engine.cc

@@ -21,10 +21,11 @@
 #include "checkpoint_remover.h"
 #include "dcp/dcpconnmap.h"
 #include "dcp/flow-control-manager.h"
+#include "mock_ep_bucket.h"
+#include "mock_ephemeral_bucket.h"
 #include "replicationthrottle.h"
-#include <programs/engine_testapp/mock_server.h>
-
 #include <platform/cbassert.h>
+#include <programs/engine_testapp/mock_server.h>
 #include <string>
 
 SynchronousEPEngine::SynchronousEPEngine(std::string extra_config)
@@ -113,3 +114,8 @@ std::unique_ptr<KVBucket> SynchronousEPEngine::public_makeMockBucket(
                                 " is not a recognized bucket "
                                 "type");
 }
+
+std::unique_ptr<KVBucket> SynchronousEPEngine::public_makeBucket(
+        Configuration& config) {
+    return makeBucket(config);
+}

engines/ep/tests/mock/mock_synchronous_ep_engine.h

@@ -17,11 +17,7 @@
 
 #pragma once
 
-#include "mock_ep_bucket.h"
-#include "mock_ephemeral_bucket.h"
-
 #include <dcp/dcpconnmap.h>
-#include <ep_bucket.h>
 #include <ep_engine.h>
 
 class SynchronousEPEngine;
@@ -73,9 +69,7 @@ class SynchronousEPEngine : public EventuallyPersistentEngine {
      */
     void initializeConnmap();
 
-    std::unique_ptr<KVBucket> public_makeBucket(Configuration& config) {
-        return makeBucket(config);
-    }
+    std::unique_ptr<KVBucket> public_makeBucket(Configuration& config);
 
     std::unique_ptr<KVBucket> public_makeMockBucket(Configuration& config);
 

engines/ep/tests/module_tests/checkpoint_remover_test.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include "checkpoint.h"
+#include "ep_bucket.h"
 #include "evp_store_single_threaded_test.h"
 #include "evp_store_test.h"
 

engines/ep/tests/module_tests/checkpoint_test.cc

@@ -26,6 +26,7 @@
 #include "ep_types.h"
 #include "ep_vb.h"
 #include "failover-table.h"
+#include "kv_bucket.h"
 #include "tests/module_tests/test_helpers.h"
 #include "thread_gate.h"
 

engines/ep/tests/module_tests/collections/collections_dcp_test.cc

@@ -18,6 +18,7 @@
 #include "tests/module_tests/collections/collections_dcp_test.h"
 #include "checkpoint_manager.h"
 #include "dcp/response.h"
+#include "kv_bucket.h"
 #include "programs/engine_testapp/mock_server.h"
 #include "tests/mock/mock_dcp.h"
 #include "tests/mock/mock_dcp_consumer.h"

engines/ep/tests/module_tests/collections/collections_dcp_test.h

@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include "collections/kvstore.h"
 #include "tests/mock/mock_dcp.h"
 #include "tests/module_tests/collections/test_manifest.h"
 #include "tests/module_tests/evp_store_single_threaded_test.h"