Include counts in data conversion

tenzir · Sep 19, 2020 · d82d1bd · d82d1bd
1 parent 59f4827
commit d82d1bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libvast/src/data.cpp b/libvast/src/data.cpp
@@ -376,7 +376,8 @@ caf::error convert(const data& d, caf::config_value& cv) {
   auto f = detail::overload(
     [&](const auto& x) -> caf::error {
       using value_type = std::decay_t<decltype(x)>;
-      if constexpr (detail::is_any_v<value_type, bool, integer, real, duration>)
+      if constexpr (detail::is_any_v<value_type, bool, integer, count, real,
+                                     duration>)
         cv = x;
       else
         cv = to_string(x);
@@ -393,6 +394,7 @@ caf::error convert(const data& d, caf::config_value& cv) {
                                              "config_value");
     },
     [&](const std::string& x) -> caf::error {
+      // Go deeper into the string an infer more CAF-specific typing.
       if (auto uri = caf::make_uri(x))
         cv = std::move(*uri);
       else

diff --git a/libvast/test/data.cpp b/libvast/test/data.cpp
@@ -334,6 +334,7 @@ TEST(convert - caf::config_value) {
     {"x", "foo"},
     {"r", record{
       {"i", -42},
+      {"u", 42u},
       {"r", record{
         {"u", 3.14}
       }},
@@ -351,6 +352,7 @@ TEST(convert - caf::config_value) {
   y.emplace("x", "foo");
   auto r = config_value::dictionary{};
   r.emplace("i", -42);
+  r.emplace("u", 42u);
   auto rr = config_value::dictionary{};
   rr.emplace("u", 3.14);
   r.emplace("r", std::move(rr));