Remove CookieIface::validate

It doesn't belong in the CookieIface interface as the one
in the old MockCookie class tried to validate that the
cookie was in fact a MockCookie, and the one in Cookie
validated the input packet (and was used next to execute
which would execute the packet etc).

Now that we no longer use "const void*" to represent our
cookies and dynamic_cast to down-cast from CookieIface
the method in MockCookie is no longer needed (as dynamic_cast
does this check)

Change-Id: If7154e47d9cda2259bafeb70a1b6e38a00c48f6a
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/156622
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: trondn

daemon/cookie.h

@@ -70,7 +70,14 @@ class Cookie : public CookieIface {
         return !packet;
     }
 
-    cb::mcbp::Status validate() override;
+    /**
+     * Validates the packet content, and (possibly) set the error
+     * state and reason.
+     *
+     * @return Success if the packet was correctly encoded
+     * @throw std::runtime_error if an unsupported packet is encountered
+     */
+    cb::mcbp::Status validate();
 
     /**
      * Reset the Cookie object to allow it to be reused in the same

include/memcached/cookie_iface.h

@@ -25,15 +25,6 @@ enum class Status : uint16_t;
  */
 class CookieIface : public cb::tracing::Traceable {
 public:
-    /**
-     * Validates the packet content, and (possibly) set the error
-     * state and reason.
-     *
-     * @return Success if the packet was correctly encoded
-     * @throw std::runtime_error if an unsupported packet is encountered
-     */
-    virtual cb::mcbp::Status validate() = 0;
-
     /// Is the current cookie blocked?
     virtual bool isEwouldblock() const = 0;
 

programs/engine_testapp/mock_cookie.cc

@@ -21,13 +21,6 @@ MockCookie::~MockCookie() {
     }
 }
 
-cb::mcbp::Status MockCookie::validate() {
-    if (magic != MAGIC) {
-        throw std::runtime_error("MockCookie::validate(): Invalid magic");
-    }
-    return cb::mcbp::Status::Success;
-}
-
 MockCookie* create_mock_cookie(EngineIface* engine) {
     return new MockCookie(engine);
 }
@@ -43,7 +36,6 @@ void destroy_mock_cookie(CookieIface* cookie) {
                 "destroy_mock_cookie: Provided cookie is not a MockCookie");
     }
 
-    c->validate();
     c->disconnect();
     if (c->getRefcount() == 0) {
         delete c;
@@ -152,7 +144,10 @@ void MockCookie::handleIoComplete(cb::engine_errc completeStatus) {
 MockCookie* cookie_to_mock_cookie(const CookieIface* cookie) {
     auto* ret =
             const_cast<MockCookie*>(dynamic_cast<const MockCookie*>(cookie));
-    ret->validate();
+    if (ret == nullptr) {
+        throw std::runtime_error(
+                "cookie_to_mock_cookie(): provided cookie is not a MockCookie");
+    }
     return ret;
 }
 

programs/engine_testapp/mock_cookie.h

@@ -42,8 +42,6 @@ class MockCookie : public CookieIface {
 
     ~MockCookie() override;
 
-    cb::mcbp::Status validate() override;
-
     bool isEwouldblock() const override {
         return handle_ewouldblock;
     }
@@ -123,7 +121,6 @@ class MockCookie : public CookieIface {
     void waitForNotifications(std::unique_lock<std::mutex>& lock);
 
 private:
-    const uint64_t magic{MAGIC};
     void* engine_data{nullptr};
     int sfd{};
     cb::engine_errc status{cb::engine_errc::success};

programs/engine_testapp/mock_server.cc

@@ -237,11 +237,13 @@ struct MockServerCookieApi : public ServerCookieIface {
     }
 
     void set_priority(const CookieIface& cookie, ConnectionPriority) override {
-        const_cast<CookieIface&>(cookie).validate();
+        // Just verify the cookie type
+        cookie_to_mock_cookie(cookie);
     }
 
     ConnectionPriority get_priority(const CookieIface& cookie) override {
-        const_cast<CookieIface&>(cookie).validate();
+        // Just verify the cookie type
+        cookie_to_mock_cookie(cookie);
         return ConnectionPriority::Medium;
     }