Move callbacks impl to callbacks.cc

Move implementation details of classes in Callbacks to a new file
callbacks.cc. Similar to previous changes, this reduces the number of
files which need to include the implementation details of callbacks.h;
specifically item.h which indirectly pulls in a number of header
files.

Fix up missing / incorrect #includes as a result of this.

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

Author: daverigby

engines/ep/CMakeLists.txt

@@ -166,6 +166,7 @@ ADD_LIBRARY(ep_objs OBJECT
             src/bgfetcher.cc
             src/blob.cc
             src/bloomfilter.cc
+            src/callbacks.cc
             src/checkpoint.cc
             src/checkpoint_remover.cc
             src/conflict_resolution.cc

engines/ep/src/callbacks.cc

@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2017 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.
+ */
+
+#include "callbacks.h"
+
+#include "item.h"
+
+GetValue::GetValue()
+    : id(-1), status(ENGINE_KEY_ENOENT), partial(false), nru(0xff) {
+}
+GetValue::GetValue(GetValue&& other) = default;
+GetValue& GetValue::operator=(GetValue&& other) = default;
+
+GetValue::GetValue(std::unique_ptr<Item> v,
+                   ENGINE_ERROR_CODE s,
+                   uint64_t i,
+                   bool incomplete,
+                   uint8_t _nru)
+    : item(std::move(v)), id(i), status(s), partial(incomplete), nru(_nru) {
+}
+
+GetValue::~GetValue() = default;

engines/ep/src/callbacks.h

@@ -15,16 +15,14 @@
  *   limitations under the License.
  */
 
-#ifndef SRC_CALLBACKS_H_
-#define SRC_CALLBACKS_H_ 1
+#pragma once
 
 #include "config.h"
 
-#include "item.h"
-#include "locks.h"
-#include "storeddockey.h"
-#include "syncobject.h"
-#include "utility.h"
+#include <memcached/dockey.h>
+#include <memcached/engine_error.h>
+
+#include <memory>
 
 class Item;
 
@@ -51,16 +49,23 @@ class CacheLookup {
  */
 class GetValue {
 public:
-    GetValue() : id(-1), status(ENGINE_KEY_ENOENT), partial(false), nru(0xff) {
-    }
+    GetValue();
 
     explicit GetValue(std::unique_ptr<Item> v,
                       ENGINE_ERROR_CODE s = ENGINE_SUCCESS,
                       uint64_t i = -1,
                       bool incomplete = false,
-                      uint8_t _nru = 0xff)
-        : item(std::move(v)), id(i), status(s), partial(incomplete), nru(_nru) {
-    }
+                      uint8_t _nru = 0xff);
+
+    /// Cannot copy GetValues (cannot copy underlying Item).
+    GetValue(const GetValue&) = delete;
+    GetValue& operator=(const GetValue&&) = delete;
+
+    /// Can move GetValues
+    GetValue(GetValue&& other);
+    GetValue& operator=(GetValue&& other);
+
+    ~GetValue();
 
     /**
      * Engine code describing what happened.
@@ -125,5 +130,3 @@ class Callback {
 
     int myStatus;
 };
-
-#endif  // SRC_CALLBACKS_H_

engines/ep/src/kvstore.h

@@ -20,7 +20,10 @@
 #include "config.h"
 
 #include "callbacks.h"
+#include "storeddockey.h"
 
+#include <memcached/engine_common.h>
+#include <memcached/protocol_binary.h>
 #include <platform/histogram.h>
 #include <platform/processclock.h>
 

engines/ep/src/warmup.h

@@ -23,6 +23,7 @@
 #include "utility.h"
 
 #include <atomic>
+#include <deque>
 #include <map>
 #include <ostream>
 #include <string>