diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-27 19:14:27 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-27 20:24:51 +0200 |
commit | bcc89cb949d256360ce0e75e579500e3d4c0b204 (patch) | |
tree | 3cf94df598c3505263d711c21c196b0f4fda9cbe /documentapi/src | |
parent | aa6024d0b32d064cae219bfe1615ac379725b824 (diff) |
Remove dead code. Remove duplicate code.
Diffstat (limited to 'documentapi/src')
4 files changed, 0 insertions, 223 deletions
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp index 120ee1facd0..bb0d8a2e26c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp @@ -852,52 +852,4 @@ RoutableFactories50::WrongDistributionReplyFactory::doEncode(const DocumentReply return true; } -void -RoutableFactories50::FeedMessageFactory::myDecode(FeedMessage &msg, document::ByteBuffer &buf) const -{ - msg.setName(decodeString(buf)); - msg.setGeneration(decodeInt(buf)); - msg.setIncrement(decodeInt(buf)); -} - -void -RoutableFactories50::FeedMessageFactory::myEncode(const FeedMessage &msg, vespalib::GrowableByteBuffer &buf) const -{ - buf.putString(msg.getName()); - buf.putInt(msg.getGeneration()); - buf.putInt(msg.getIncrement()); -} - -DocumentReply::UP -RoutableFactories50::FeedReplyFactory::doDecode(document::ByteBuffer &buf) const -{ - auto reply = std::make_unique<FeedReply>(getType()); - - std::vector<FeedAnswer> &answers = reply->getFeedAnswers(); - int32_t len = decodeInt(buf); - answers.reserve(len); - for (int32_t i = 0; i < len; ++i) { - int32_t typeCode = decodeInt(buf); - int32_t wantedIncrement = decodeInt(buf); - string recipient = decodeString(buf); - string moreInfo = decodeString(buf); - answers.emplace_back(typeCode, wantedIncrement, recipient, moreInfo); - } - return reply; -} - -bool -RoutableFactories50::FeedReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const -{ - const FeedReply &reply = static_cast<const FeedReply&>(obj); - buf.putInt(reply.getFeedAnswers().size()); - for (const auto & answer : reply.getFeedAnswers()) { - buf.putInt(answer.getAnswerCode()); - buf.putInt(answer.getWantedIncrement()); - buf.putString(answer.getRecipient()); - buf.putString(answer.getMoreInfo()); - } - return true; -} - } diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h index f96b9641800..d947cb73cde 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h @@ -84,11 +84,6 @@ public: virtual DocumentMessage::UP doDecode(document::ByteBuffer &buf) const = 0; public: - /** - * Convenience typedefs. - */ - typedef std::unique_ptr<IRoutableFactory> UP; - typedef std::shared_ptr<IRoutableFactory> SP; bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; @@ -123,35 +118,10 @@ public: virtual DocumentReply::UP doDecode(document::ByteBuffer &buf) const = 0; public: - /** - * Convenience typedefs. - */ - typedef std::unique_ptr<IRoutableFactory> UP; - typedef std::shared_ptr<IRoutableFactory> SP; - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; - /** - * Implements a helper class to do feed message factories. - */ - class FeedMessageFactory : public DocumentMessageFactory { - protected: - void myDecode(FeedMessage &msg, document::ByteBuffer &buf) const; - void myEncode(const FeedMessage &msg, vespalib::GrowableByteBuffer &buf) const; - }; - - /** - * Implements a helper class to do feed reply factories. - */ - class FeedReplyFactory : public DocumentReplyFactory { - protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; - virtual uint32_t getType() const = 0; - }; - //////////////////////////////////////////////////////////////////////////////// // // Factories diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp index ee51bd306a6..01d0c5b6c0e 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp @@ -12,52 +12,6 @@ using vespalib::nbostream; namespace documentapi { -bool -RoutableFactories51::DocumentMessageFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const -{ - const DocumentMessage &msg = static_cast<const DocumentMessage&>(obj); - out.putByte(msg.getPriority()); - out.putInt(msg.getLoadType().getId()); - return doEncode(msg, out); -} - -mbus::Routable::UP -RoutableFactories51::DocumentMessageFactory::decode(document::ByteBuffer &in, - const LoadTypeSet& loadTypes) const -{ - uint8_t pri; - in.getByte(pri); - uint32_t loadClass = decodeInt(in); - - DocumentMessage::UP msg = doDecode(in); - if (msg.get() != NULL) { - msg->setPriority((Priority::Value)pri); - msg->setLoadType(loadTypes[loadClass]); - } - - return mbus::Routable::UP(msg.release()); -} - -bool -RoutableFactories51::DocumentReplyFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const -{ - const DocumentReply &msg = static_cast<const DocumentReply&>(obj); - out.putByte(msg.getPriority()); - return doEncode(msg, out); -} - -mbus::Routable::UP -RoutableFactories51::DocumentReplyFactory::decode(document::ByteBuffer &in, const LoadTypeSet&) const -{ - uint8_t pri; - in.getByte(pri); - DocumentReply::UP reply = doDecode(in); - if (reply.get() != NULL) { - reply->setPriority((Priority::Value)pri); - } - return mbus::Routable::UP(reply.release()); -} - DocumentMessage::UP RoutableFactories51::CreateVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const { diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h index b71c478c540..913b05f109b 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h @@ -14,111 +14,12 @@ class RoutableFactories51 : public RoutableFactories50 { public: RoutableFactories51() = delete; - /** - * Implements the shared factory logic required for {@link DocumentMessage} objects, and it offers a more - * convenient interface for implementing {@link RoutableFactory}. - */ - class DocumentMessageFactory : public IRoutableFactory { - protected: - /** - * This method encodes the given message into the given byte buffer. You are guaranteed to only receive messages of - * the type that this factory was registered for. - * - * This method is NOT exception safe. Return false to signal failure. - * - * @param msg The message to encode. - * @param buf The byte buffer to write to. - * @return True if the message was encoded. - */ - virtual bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const = 0; - - /** - * This method decodes a message from the given byte buffer. You are guaranteed to only receive byte buffers - * generated by a previous call to {@link #doEncode(DocumentMessage, GrowableByteBuffer)}. - * - * This method is NOT exception safe. Return null to signal failure. - * - * @param buf The byte buffer to read from. - * @return The decoded message. - */ - virtual DocumentMessage::UP doDecode(document::ByteBuffer &buf) const = 0; - - public: - /** - * Convenience typedefs. - */ - typedef std::unique_ptr<IRoutableFactory> UP; - typedef std::shared_ptr<IRoutableFactory> SP; - - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; - mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; - }; - - /** - * Implements the shared factory logic required for {@link DocumentReply} objects, and it offers a more - * convenient interface for implementing {@link RoutableFactory}. - */ - class DocumentReplyFactory : public IRoutableFactory { - protected: - /** - * This method encodes the given reply into the given byte buffer. You are guaranteed to only receive - * replies of the type that this factory was registered for. - * - * This method is NOT exception safe. Return false to signal failure. - * - * @param reply The reply to encode. - * @param buf The byte buffer to write to. - * @return True if the message was encoded. - */ - virtual bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const = 0; - - /** - * This method decodes a reply from the given byte buffer. You are guaranteed to only receive byte buffers - * generated by a previous call to {@link #doEncode(DocumentReply, GrowableByteBuffer)}. - * - * This method is NOT exception safe. Return null to signal failure. - * - * @param buf The byte buffer to read from. - * @return The decoded reply. - */ - virtual DocumentReply::UP doDecode(document::ByteBuffer &buf) const = 0; - - public: - /** - * Convenience typedefs. - */ - typedef std::unique_ptr<IRoutableFactory> UP; - typedef std::shared_ptr<IRoutableFactory> SP; - - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; - mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; - }; - class DocumentIgnoredReplyFactory : public DocumentReplyFactory { protected: DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; - /** - * Implements a helper class to do feed message factories. - */ - class FeedMessageFactory : public DocumentMessageFactory { - protected: - void myDecode(FeedMessage &msg, document::ByteBuffer &buf) const; - void myEncode(const FeedMessage &msg, vespalib::GrowableByteBuffer &buf) const; - }; - - /** - * Implements a helper class to do feed reply factories. - */ - class FeedReplyFactory : public DocumentReplyFactory { - protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; - virtual uint32_t getType() const = 0; - }; - //////////////////////////////////////////////////////////////////////////////// // // Factories |