v6d-io · sighingnow · Aug 11, 2022 · Aug 11, 2022
diff --git a/python/core.cc b/python/core.cc
@@ -35,6 +35,18 @@ using namespace py::literals;  // NOLINT(build/namespaces_literals)
 
 namespace vineyard {
 
+namespace detail {
+/// Extends pybind11::detail::iterator_state to holds reference to a
+/// stable (unchanged) globally available "argument".
+template <typename Arg>
+struct metadata_iterator_state {
+  ObjectMeta::const_iterator it;
+  ObjectMeta::const_iterator end;
+  bool first_or_done;
+  Arg arg;
+};
+}  // namespace detail
+
 void bind_core(py::module& mod) {
   // ObjectIDWrapper
   py::class_<ObjectIDWrapper>(mod, "ObjectID")
@@ -285,8 +297,9 @@ void bind_core(py::module& mod) {
                 fn = [](std::true_type, ObjectMeta::const_iterator& iter) {
                   return py::cast(iter.key());
                 };
-            return py::make_iterator_fmap(meta.begin(), meta.end(), fn,
-                                          std::true_type{});
+            using state_t = detail::metadata_iterator_state<std::true_type>;
+            return py::detail::make_iterator_fmap(
+                state_t{meta.begin(), meta.end(), true, std::true_type{}}, fn);
           },
           py::keep_alive<0, 1>())
       .def(
@@ -304,8 +317,9 @@ void bind_core(py::module& mod) {
                     iter.key(), detail::from_json(iter.value())));
               }
             };
-            return py::make_iterator_fmap(meta.begin(), meta.end(), fn,
-                                          std::cref(meta));
+            using state_t = detail::metadata_iterator_state<const ObjectMeta&>;
+            return py::detail::make_iterator_fmap(
+                state_t{meta.begin(), meta.end(), true, std::cref(meta)}, fn);
           },
           py::keep_alive<0, 1>())
       .def("__repr__",

diff --git a/python/pybind11_utils.h b/python/pybind11_utils.h
@@ -68,50 +68,34 @@ namespace pybind11 {
 
 namespace detail {
 
-/// Extends pybind11::detail::iterator_state to holds reference to a
-/// stable (unchanged) globally available "argument".
-template <typename Iterator, typename Sentinel, typename Arg, bool KeyIterator,
-          return_value_policy Policy>
-struct iterator_state_ext {
-  Iterator it;
-  Sentinel end;
-  bool first_or_done;
-  Arg arg;
-};
-
-}  // namespace detail
-
 /// Makes a python iterator from a first and past-the-end C++ InputIterator.
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Iterator, typename Sentinel, typename F, typename Arg,
-          typename... Args, typename... Extra>
-iterator make_iterator_fmap(Iterator first, Sentinel last, F functor, Arg arg,
-                            Extra&&... extra) {
-  using state =
-      detail::iterator_state_ext<Iterator, Sentinel, Arg, false, Policy>;
-
-  if (!detail::get_type_info(typeid(state), false)) {
-    class_<state>(handle(), "iterator", pybind11::module_local())
-        .def("__iter__", [](state& s) -> state& { return s; })
+template <py::return_value_policy Policy =
+              py::return_value_policy::reference_internal,
+          typename IteratorState, typename F, typename... Extra>
+py::iterator make_iterator_fmap(IteratorState const& state, F functor,
+                                Extra&&... extra) {
+  if (!py::detail::get_type_info(typeid(IteratorState), false)) {
+    py::class_<IteratorState>(py::handle(), "iterator",
+                              pybind11::module_local())
+        .def("__iter__", [](IteratorState& s) -> IteratorState& { return s; })
         .def(
             "__next__",
-            [functor](state& s) -> object {
+            [functor](IteratorState& s) -> py::object {
               if (!s.first_or_done)
                 ++s.it;
               else
                 s.first_or_done = false;
               if (s.it == s.end) {
                 s.first_or_done = true;
-                throw stop_iteration();
+                throw py::stop_iteration();
               }
               return functor(s.arg, s.it);
             },
             std::forward<Extra>(extra)..., Policy);
   }
-
-  return cast(state{first, last, true, std::forward<Arg>(arg)});
+  return py::cast(state);
 }
-
+}  // namespace detail
 }  // namespace pybind11
 
 namespace vineyard {

diff --git a/src/common/util/protocols.cc b/src/common/util/protocols.cc
@@ -169,15 +169,15 @@ Status ReadRegisterRequest(const json& root, std::string& version,
 
   // When the "version" field is missing from the client, we treat it
   // as default unknown version number: 0.0.0.
-  version = root.value<std::string>("version", "0.0.0");
+  version = root.value<std::string>("version", std::string("0.0.0"));
 
   // Keep backwards compatibility.
   if (root.contains("store_type")) {
     if (root["store_type"].is_number()) {
       store_type = root.value("store_type", /* default */ StoreType::kDefault);
     } else {
       std::string store_type_name =
-          root.value("store_type", /* default */ "Normal");
+          root.value("store_type", /* default */ std::string("Normal"));
       if (store_type_name == "Plasma") {
         store_type = StoreType::kPlasma;
       } else {
@@ -216,7 +216,7 @@ Status ReadRegisterReply(const json& root, std::string& ipc_socket,
 
   // When the "version" field is missing from the server, we treat it
   // as default unknown version number: 0.0.0.
-  version = root.value<std::string>("version", "0.0.0");
+  version = root.value<std::string>("version", std::string("0.0.0"));
   store_match = root["store_match"].get<bool>();
   return Status::OK();
 }

diff --git a/thirdparty/nlohmann-json b/thirdparty/nlohmann-json