Minimise includes of executorpool.h

Remove the include of executorpool.h from kvbucket.h; then add it back
into the specific .cc files which require it.

Change-Id: I7256be2ccef778ebbf6f526a3f82fb637e7f0603
Reviewed-on: http://review.couchbase.org/113435
Tested-by: Build Bot <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>

Author: daverigby

engines/ep/src/bgfetcher.cc

@@ -18,6 +18,7 @@
 #include "bgfetcher.h"
 #include "bucket_logger.h"
 #include "ep_engine.h"
+#include "executorpool.h"
 #include "executorthread.h"
 #include "kv_bucket.h"
 #include "kvshard.h"

engines/ep/src/dcp/backfill-manager.cc

@@ -15,15 +15,16 @@
  *   limitations under the License.
  */
 
+#include "dcp/backfill-manager.h"
 #include "bucket_logger.h"
 #include "connmap.h"
 #include "dcp/active_stream.h"
-#include "dcp/backfill-manager.h"
 #include "dcp/backfill_disk.h"
 #include "dcp/dcpconnmap.h"
 #include "dcp/producer.h"
 #include "ep_engine.h"
 #include "ep_time.h"
+#include "executorpool.h"
 #include "kv_bucket.h"
 
 #include <phosphor/phosphor.h>

engines/ep/src/dcp/backfill-manager.h

@@ -44,9 +44,12 @@
 #pragma once
 
 #include "dcp/backfill.h"
-
+#include <memcached/engine_common.h>
+#include <memcached/types.h>
 #include <list>
+#include <mutex>
 
+class DcpProducer;
 class EventuallyPersistentEngine;
 class GlobalTask;
 class VBucket;

engines/ep/src/dcp/backfill.h

@@ -17,6 +17,10 @@
 
 #pragma once
 
+#include <memcached/vbucket.h>
+
+#include <memory>
+
 class ActiveStream;
 class ScanContext;
 

engines/ep/src/ep_bucket.cc

@@ -26,6 +26,7 @@
 #include "ep_engine.h"
 #include "ep_time.h"
 #include "ep_vb.h"
+#include "executorpool.h"
 #include "failover-table.h"
 #include "flusher.h"
 #include "item.h"

engines/ep/src/ep_engine.cc

@@ -33,6 +33,7 @@
 #include "ep_bucket.h"
 #include "ep_vb.h"
 #include "ephemeral_bucket.h"
+#include "executorpool.h"
 #include "ext_meta_parser.h"
 #include "failover-table.h"
 #include "flusher.h"

engines/ep/src/ephemeral_bucket.cc

@@ -23,6 +23,7 @@
 #include "ephemeral_tombstone_purger.h"
 #include "ephemeral_vb.h"
 #include "ephemeral_vb_count_visitor.h"
+#include "executorpool.h"
 #include "failover-table.h"
 #include "replicationthrottle.h"
 #include "rollback_result.h"

engines/ep/src/ephemeral_tombstone_purger.cc

@@ -23,6 +23,7 @@
 #include "ep_time.h"
 #include "ephemeral_bucket.h"
 #include "ephemeral_vb.h"
+#include "executorpool.h"
 #include "seqlist.h"
 
 #include <climits>

engines/ep/src/flusher.cc

@@ -20,6 +20,7 @@
 #include "bucket_logger.h"
 #include "common.h"
 #include "ep_bucket.h"
+#include "executorpool.h"
 #include "tasks.h"
 
 #include <platform/timeutils.h>

engines/ep/src/item_freq_decayer.cc

@@ -18,6 +18,7 @@
 #include "item_freq_decayer.h"
 #include "bucket_logger.h"
 #include "ep_engine.h"
+#include "executorpool.h"
 #include "item_freq_decayer_visitor.h"
 #include "kv_bucket.h"
 #include "stored-value.h"