Fix remained tests

Author: Ivan Baidakou

.clang-format

@@ -0,0 +1,67 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: true
+AlignConsecutiveAssignments: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+

CMakeLists.txt

@@ -8,7 +8,7 @@ include (CTest)
 enable_testing()
 
 add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
-add_definitions(-DBREDIS_DEBUG)
+#add_definitions(-DBREDIS_DEBUG)
 
 find_package(
     Boost
@@ -33,38 +33,38 @@ add_executable(t-10-ping t/10-ping.cpp)
 target_link_libraries(t-10-ping ${LINK_DEPENDENCIES})
 add_test("t-10-ping" t-10-ping)
 
-#add_executable(t-11-multi-ping t/11-multi-ping.cpp)
-#target_link_libraries(t-11-multi-ping ${LINK_DEPENDENCIES})
-#add_test("t-11-multi-ping" t-11-multi-ping)
-#
-#add_executable(t-12-basic-types t/12-basic-types.cpp)
-#target_link_libraries(t-12-basic-types ${LINK_DEPENDENCIES})
-#add_test("t-12-basic-types" t-12-basic-types)
-#
-#add_executable(t-13-protol-error t/13-protol-error.cpp)
-#target_link_libraries(t-13-protol-error ${LINK_DEPENDENCIES})
-#add_test("t-13-protol-error" t-13-protol-error)
-#
-#add_executable(t-14-uds t/14-uds.cpp)
-#target_link_libraries(t-14-uds ${LINK_DEPENDENCIES})
-#add_test("t-14-uds" t-14-uds)
-#
-#add_executable(t-15-cancellation t/15-cancellation.cpp)
-#target_link_libraries(t-15-cancellation ${LINK_DEPENDENCIES})
-#add_test("t-15-cancellation" t-15-cancellation)
-#
-#add_executable(t-16-close-connection t/16-close-connection.cpp)
-#target_link_libraries(t-16-close-connection ${LINK_DEPENDENCIES})
-#add_test("t-16-close-connection" t-16-close-connection)
-#
-#add_executable(t-17-sync t/17-sync.cpp)
-#target_link_libraries(t-17-sync ${LINK_DEPENDENCIES})
-#add_test("t-17-sync" t-17-sync)
-#
-#add_executable(t-18-subscription t/18-subscription.cpp)
-#target_link_libraries(t-18-subscription ${LINK_DEPENDENCIES})
-#add_test("t-18-subscription" t-18-subscription)
-#
-#add_executable(t-19-transaction t/19-transaction.cpp)
-#target_link_libraries(t-19-transaction ${LINK_DEPENDENCIES})
-#add_test("t-19-transaction" t-19-transaction)
+add_executable(t-11-multi-ping t/11-multi-ping.cpp)
+target_link_libraries(t-11-multi-ping ${LINK_DEPENDENCIES})
+add_test("t-11-multi-ping" t-11-multi-ping)
+
+add_executable(t-12-basic-types t/12-basic-types.cpp)
+target_link_libraries(t-12-basic-types ${LINK_DEPENDENCIES})
+add_test("t-12-basic-types" t-12-basic-types)
+
+add_executable(t-13-protol-error t/13-protol-error.cpp)
+target_link_libraries(t-13-protol-error ${LINK_DEPENDENCIES})
+add_test("t-13-protol-error" t-13-protol-error)
+
+add_executable(t-14-uds t/14-uds.cpp)
+target_link_libraries(t-14-uds ${LINK_DEPENDENCIES})
+add_test("t-14-uds" t-14-uds)
+
+add_executable(t-15-cancellation t/15-cancellation.cpp)
+target_link_libraries(t-15-cancellation ${LINK_DEPENDENCIES})
+add_test("t-15-cancellation" t-15-cancellation)
+
+add_executable(t-16-close-connection t/16-close-connection.cpp)
+target_link_libraries(t-16-close-connection ${LINK_DEPENDENCIES})
+add_test("t-16-close-connection" t-16-close-connection)
+
+add_executable(t-17-sync t/17-sync.cpp)
+target_link_libraries(t-17-sync ${LINK_DEPENDENCIES})
+add_test("t-17-sync" t-17-sync)
+
+add_executable(t-18-subscription t/18-subscription.cpp)
+target_link_libraries(t-18-subscription ${LINK_DEPENDENCIES})
+add_test("t-18-subscription" t-18-subscription)
+
+add_executable(t-19-transaction t/19-transaction.cpp)
+target_link_libraries(t-19-transaction ${LINK_DEPENDENCIES})
+add_test("t-19-transaction" t-19-transaction)

include/bredis/Connection.hpp

@@ -50,18 +50,18 @@ template <typename NextLayer> class Connection {
     template <typename ReadCallback, typename DynamicBuffer>
     void async_read(DynamicBuffer &rx_buff, ReadCallback read_callback,
                     std::size_t replies_count = 1);
-#if 0
 
     /* synchronous interface */
     void write(const command_wrapper_t &command);
     void write(const command_wrapper_t &command, boost::system::error_code &ec);
 
     template <typename DynamicBuffer>
-    positive_parse_result_t read(DynamicBuffer &rx_buff);
+    positive_parse_result_t<typename to_iterator<DynamicBuffer>::iterator_t>
+    read(DynamicBuffer &rx_buff);
+
     template <typename DynamicBuffer>
-    positive_parse_result_t read(DynamicBuffer &rx_buff,
-                                 boost::system::error_code &ec);
-#endif
+    positive_parse_result_t<typename to_iterator<DynamicBuffer>::iterator_t>
+    read(DynamicBuffer &rx_buff, boost::system::error_code &ec);
 };
 
 } // namespace bredis

include/bredis/MarkerHelpers.hpp

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <algorithm>
+#include <iterator>
 #include <string>
 
 #include "Markers.hpp"
@@ -16,21 +17,67 @@ namespace bredis {
 namespace marker_helpers {
 
 template <typename Iterator>
+struct stringizer : public boost::static_visitor<std::string> {
 
+    std::string operator()(const markers::string_t<Iterator> &value) const {
+        auto size = std::distance(value.from, value.to);
+        std::string r;
+        r.reserve(size);
+        r.append(value.from, value.to);
+        return "[str] " + r;
+    }
+
+    std::string operator()(const markers::error_t<Iterator> &value) const {
+        auto size = std::distance(value.string.from, value.string.to);
+        std::string r;
+        r.reserve(size);
+        r.append(value.string.from, value.string.to);
+        return "[err] " + r;
+    }
+
+    std::string operator()(const markers::int_t<Iterator> &value) const {
+        auto size = std::distance(value.string.from, value.string.to);
+        std::string r;
+        r.reserve(size);
+        r.append(value.string.from, value.string.to);
+        return "[int] " + r;
+    }
+
+    std::string operator()(const markers::nil_t<Iterator> &value) const {
+        return "[nil] ";
+    }
+
+    std::string
+    operator()(const markers::array_holder_t<Iterator> &value) const {
+        std::string r = "[array] {";
+        for (const auto &v : value.elements) {
+            r += boost::apply_visitor(*this, v) + ", ";
+        }
+        r += "}";
+        return r;
+    }
+};
+
+template <typename Iterator>
 class equality : public boost::static_visitor<bool> {
+    using StringIterator = std::string::const_iterator;
+
   private:
-    const char *begin_;
-    const char *end_;
+    std::string copy_;
+    StringIterator begin_;
+    StringIterator end_;
 
   public:
     equality(std::string str)
-        : begin_(str.c_str()), end_(str.c_str() + str.size()) {}
+        : copy_(str), begin_(std::begin(copy_)), end_(std::end(copy_)) {}
 
     template <typename T> bool operator()(const T &value) const {
         return false;
     }
 
     bool operator()(const markers::string_t<Iterator> &value) const {
+        auto helper = stringizer<Iterator>();
+        auto str = helper(value);
         return std::equal(begin_, end_, value.from, value.to);
     }
 

include/bredis/Result.hpp

@@ -20,6 +20,11 @@
 
 namespace bredis {
 
+template <typename DynamicBuffer> struct to_iterator {
+    using iterator_t = boost::asio::buffers_iterator<
+        typename DynamicBuffer::const_buffers_type, char>;
+};
+
 struct protocol_error_t {
     std::string what;
     bool operator==(const char *rhs) { return what == rhs; }

include/bredis/impl/connection.ipp

@@ -43,8 +43,7 @@ void Connection<NextLayer>::async_read(DynamicBuffer &rx_buff,
     namespace asio = boost::asio;
     namespace sys = boost::system;
     using boost::asio::async_read_until;
-    using Iterator = boost::asio::buffers_iterator<
-        typename DynamicBuffer::const_buffers_type, char>;
+    using Iterator = typename to_iterator<DynamicBuffer>::iterator_t;
 
     async_read_until(
         stream_, rx_buff, MatchResult<Iterator>(replies_count),
@@ -74,7 +73,6 @@ void Connection<NextLayer>::async_read(DynamicBuffer &rx_buff,
                     read_callback(parse_error_code, std::move(result), 0);
                     return;
                 }
-                auto *nod = boost::get<no_enogh_data_t>(&parse_result);
                 auto &positive_result =
                     boost::get<positive_parse_result_t<Iterator>>(parse_result);
                 results.elements.emplace_back(positive_result.result);
@@ -90,7 +88,6 @@ void Connection<NextLayer>::async_read(DynamicBuffer &rx_buff,
         });
 }
 
-#if 0
 template <typename NextLayer>
 void Connection<NextLayer>::write(const command_wrapper_t &command,
                                   boost::system::error_code &ec) {
@@ -111,35 +108,38 @@ void Connection<NextLayer>::write(const command_wrapper_t &command) {
 
 template <typename NextLayer>
 template <typename DynamicBuffer>
-positive_parse_result_t
+positive_parse_result_t<typename to_iterator<DynamicBuffer>::iterator_t>
 Connection<NextLayer>::read(DynamicBuffer &rx_buff,
                             boost::system::error_code &ec) {
     namespace asio = boost::asio;
     using boost::asio::read_until;
+    using Iterator = typename to_iterator<DynamicBuffer>::iterator_t;
+    using result_t = positive_parse_result_t<
+        typename to_iterator<DynamicBuffer>::iterator_t>;
 
-    auto rx_bytes = read_until(stream_, rx_buff, MatchResult(1), ec);
+    auto rx_bytes = read_until(stream_, rx_buff, MatchResult<Iterator>(1), ec);
     if (ec) {
-        return positive_parse_result_t{{}, 0};
+        return result_t{{}, 0};
     }
 
-    const auto char_ptr =
-        boost::asio::buffer_cast<const char *>(rx_buff.data());
-    auto size = rx_buff.size();
-    string_t data(char_ptr, size);
+    auto const_buff = rx_buff.data();
+    auto begin = Iterator::begin(const_buff);
+    auto end = Iterator::end(const_buff);
+
+    auto parse_result = Protocol::parse(begin, end);
 
-    auto parse_result = Protocol::parse(data);
     auto *parse_error = boost::get<protocol_error_t>(&parse_result);
     if (parse_error) {
-        // BREDIS_LOG_DEBUG("protocol error: " << parse_error->what);
         ec = Error::make_error_code(bredis_errors::protocol_error);
-        return positive_parse_result_t{{}, 0};
+        return result_t{};
     }
-    return boost::get<positive_parse_result_t>(parse_result);
+    return boost::get<positive_parse_result_t<Iterator>>(parse_result);
 }
 
 template <typename NextLayer>
 template <typename DynamicBuffer>
-positive_parse_result_t Connection<NextLayer>::read(DynamicBuffer &rx_buff) {
+positive_parse_result_t<typename to_iterator<DynamicBuffer>::iterator_t>
+Connection<NextLayer>::read(DynamicBuffer &rx_buff) {
     namespace asio = boost::asio;
 
     boost::system::error_code ec;
@@ -149,6 +149,5 @@ positive_parse_result_t Connection<NextLayer>::read(DynamicBuffer &rx_buff) {
     }
     return result;
 }
-#endif
 
 } // namespace bredis