Issue #169 Fix src/library/cgiparam tests (#251)

tsayukov · web-flow · commit e39422666dbc · 2024-07-03T20:58:59.000+03:00
diff --git a/include/ydb-cpp-sdk/library/cgiparam/cgiparam.h b/include/ydb-cpp-sdk/library/cgiparam/cgiparam.h
@@ -2,14 +2,16 @@
 
 #include <ydb-cpp-sdk/library/iterator/iterate_values.h>
 
+#include <ydb-cpp-sdk/util/str_stl.h>
 #include <ydb-cpp-sdk/util/generic/iterator_range.h>
-#include <string_view>
-#include <string>
+#include <ydb-cpp-sdk/util/memory/tempbuf.h>
 
-#include <map>
 #include <initializer_list>
+#include <map>
+#include <string>
+#include <string_view>
 
-class TCgiParameters: public std::multimap<std::string, std::string> {
+class TCgiParameters: public std::multimap<std::string, std::string, TLess<std::string>> {
 public:
     TCgiParameters() = default;
 
@@ -26,7 +28,7 @@ class TCgiParameters: public std::multimap<std::string, std::string> {
     size_t EraseAll(const std::string_view name);
 
     size_t NumOfValues(const std::string_view name) const noexcept {
-        return count(static_cast<std::string>(name));
+        return count(name);
     }
 
     std::string operator()() const {
@@ -57,7 +59,7 @@ class TCgiParameters: public std::multimap<std::string, std::string> {
 
     Y_PURE_FUNCTION
     auto Range(const std::string_view name) const noexcept {
-        return IterateValues(MakeIteratorRange(equal_range(static_cast<std::string>(name))));
+        return IterateValues(MakeIteratorRange(equal_range(name)));
     }
 
     Y_PURE_FUNCTION
@@ -68,11 +70,12 @@ class TCgiParameters: public std::multimap<std::string, std::string> {
 
     Y_PURE_FUNCTION
     bool Has(const std::string_view name) const noexcept {
-        const auto pair = equal_range(static_cast<std::string>(name));
+        const auto pair = equal_range(name);
         return pair.first != pair.second;
     }
-    /// Returns value by name
     /**
+     * Returns value by name.
+     *
      * @note The returned value is CGI-unescaped.
      */
     Y_PURE_FUNCTION
@@ -139,7 +142,7 @@ class TCgiParameters: public std::multimap<std::string, std::string> {
 
 template <typename TIter>
 void TCgiParameters::ReplaceUnescaped(const std::string_view key, TIter valuesBegin, const TIter valuesEnd) {
-    const auto oldRange = equal_range(static_cast<std::string>(key));
+    const auto oldRange = equal_range(key);
     auto current = oldRange.first;
 
     // reuse as many existing nodes as possible (probably none)
@@ -176,13 +179,13 @@ class TQuickCgiParam: public std::multimap<std::string_view, std::string_view> {
 
     Y_PURE_FUNCTION
     bool Has(const std::string_view name) const noexcept {
-        const auto pair = equal_range(static_cast<std::string>(name));
+        const auto pair = equal_range(name);
         return pair.first != pair.second;
     }
 
     Y_PURE_FUNCTION
     const std::string_view& Get(const std::string_view name, size_t numOfValue = 0) const noexcept;
 
 private:
-    std::string UnescapeBuf;
+    TTempBuf UnescapeBuf;
 };
diff --git a/include/ydb-cpp-sdk/util/str_stl.h b/include/ydb-cpp-sdk/util/str_stl.h
@@ -233,6 +233,11 @@ template <class T>
 struct TLess: public std::less<T> {
 };
 
+template <>
+struct TLess<std::string>: public TLess<std::string_view> {
+    using is_transparent = void;
+};
+
 template <>
 struct TLess<std::u16string>: public TLess<std::u16string_view> {
     using is_transparent = void;
diff --git a/src/library/cgiparam/cgiparam.cpp b/src/library/cgiparam/cgiparam.cpp
@@ -20,7 +20,7 @@ const std::string& TCgiParameters::Get(const std::string_view name, size_t numOf
 }
 
 bool TCgiParameters::Erase(const std::string_view name, size_t pos) {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it, --pos) {
         if (0 == pos) {
@@ -33,7 +33,7 @@ bool TCgiParameters::Erase(const std::string_view name, size_t pos) {
 }
 
 bool TCgiParameters::Erase(const std::string_view name, const std::string_view val) {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     bool found = false;
     for (auto it = pair.first; it != pair.second;) {
@@ -49,7 +49,7 @@ bool TCgiParameters::Erase(const std::string_view name, const std::string_view v
 }
 
 bool TCgiParameters::ErasePattern(const std::string_view name, const std::string_view pat) {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     bool found = false;
     for (auto it = pair.first; it != pair.second;) {
@@ -68,7 +68,7 @@ bool TCgiParameters::ErasePattern(const std::string_view name, const std::string
 size_t TCgiParameters::EraseAll(const std::string_view name) {
     size_t num = 0;
 
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; erase(it++), ++num)
         ;
@@ -77,7 +77,7 @@ size_t TCgiParameters::EraseAll(const std::string_view name) {
 }
 
 void TCgiParameters::JoinUnescaped(const std::string_view key, char sep, std::string_view val) {
-    const auto pair = equal_range(static_cast<std::string>(key));
+    const auto pair = equal_range(key);
     auto it = pair.first;
 
     if (it == pair.second) { // not found
@@ -224,7 +224,7 @@ std::string TCgiParameters::QuotedPrint(const char* safe) const {
 }
 
 TCgiParameters::const_iterator TCgiParameters::Find(const std::string_view name, size_t pos) const noexcept {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it, --pos) {
         if (0 == pos) {
@@ -236,7 +236,7 @@ TCgiParameters::const_iterator TCgiParameters::Find(const std::string_view name,
 }
 
 bool TCgiParameters::Has(const std::string_view name, const std::string_view value) const noexcept {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it) {
         if (value == it->second) {
@@ -248,27 +248,24 @@ bool TCgiParameters::Has(const std::string_view name, const std::string_view val
 }
 
 TQuickCgiParam::TQuickCgiParam(const std::string_view cgiParamStr) {
-    UnescapeBuf.reserve(CgiUnescapeBufLen(cgiParamStr.size()));
-    char* buf = UnescapeBuf.data();
+    const size_t bufLength = CgiUnescapeBufLen(cgiParamStr.size());
+    UnescapeBuf = TTempBuf(bufLength);
+    char* buf = UnescapeBuf.Data();
 
-    auto f = [this, &buf](const std::string_view key, const std::string_view val) {
+    auto f = [this, &buf, bufLength](const std::string_view key, const std::string_view val) {
         std::string_view name = CgiUnescapeBuf(buf, key);
         buf += name.size() + 1;
         std::string_view value = CgiUnescapeBuf(buf, val);
         buf += value.size() + 1;
-        Y_ASSERT(buf <= UnescapeBuf.data() + UnescapeBuf.capacity() + 1 /*trailing zero*/);
+        Y_ASSERT(buf <= UnescapeBuf.Data() + bufLength);
         emplace(name, value);
     };
 
     DoScan<false>(cgiParamStr, f);
-
-    if (buf != UnescapeBuf.data()) {
-        UnescapeBuf.resize(buf - UnescapeBuf.data() - 1 /*trailing zero*/);
-    }
 }
 
 const std::string_view& TQuickCgiParam::Get(const std::string_view name, size_t pos) const noexcept {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it, --pos) {
         if (0 == pos) {
@@ -280,7 +277,7 @@ const std::string_view& TQuickCgiParam::Get(const std::string_view name, size_t
 }
 
 bool TQuickCgiParam::Has(const std::string_view name, const std::string_view value) const noexcept {
-    const auto pair = equal_range(static_cast<std::string>(name));
+    const auto pair = equal_range(name);
 
     for (auto it = pair.first; it != pair.second; ++it) {
         if (value == it->second) {
diff --git a/src/library/cgiparam/ut/ya.make b/src/library/cgiparam/ut/ya.make
diff --git a/tests/library/CMakeLists.txt b/tests/library/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(cache)
 add_subdirectory(case_insensitive_string)
+add_subdirectory(cgiparam)
 add_subdirectory(coroutine)
 add_subdirectory(json)
 add_subdirectory(login)
diff --git a/tests/library/cgiparam/CMakeLists.txt b/tests/library/cgiparam/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_ydb_test(NAME library-cgiparam-ut
+  SOURCES
+    ut.cpp
+  LINK_LIBRARIES
+    library-cpp-cgiparam
+    cpp-testing-unittest_main
+)
diff --git a/tests/library/cgiparam/ut.cpp b/tests/library/cgiparam/ut.cpp
@@ -18,6 +18,17 @@ Y_UNIT_TEST_SUITE(TCgiParametersTest) {
     }
 
     Y_UNIT_TEST(TestQuick) {
+        TQuickCgiParam A("a=b");
+        UNIT_ASSERT_EQUAL(A.Get("a") == "b", true);
+        UNIT_ASSERT(A.Has("a", "b"));
+
+        TQuickCgiParam B("aaa=bbb&ccc=ddd&ag0=");
+        UNIT_ASSERT_EQUAL(B.Get("aaa") == "bbb", true);
+        UNIT_ASSERT(B.Has("ccc", "ddd"));
+        UNIT_ASSERT(B.Has("ag0", ""));
+        UNIT_ASSERT(!B.Has("a", "bbb"));
+        UNIT_ASSERT(!B.Has("aaa", "bb"));
+
         TQuickCgiParam C("aaa=b%62b&ccc=ddd&ag0=");
         UNIT_ASSERT_EQUAL(C.Get("aaa") == "bbb", true);
         UNIT_ASSERT(C.Has("ccc", "ddd"));
