Merge pull request zerebubuth#385 from mmd-osm/patch/sv2

Reuse available string length

Author: mmd-osm

include/cgimap/json_writer.hpp

@@ -39,7 +39,6 @@ class json_writer : public output_writer {
   ~json_writer() noexcept override;
 
   void start_object();
-  void object_key(const char* s);
   void object_key(std::string_view sv);
   void end_object();
 
@@ -73,8 +72,14 @@ class json_writer : public output_writer {
     yajl_gen_number(gen, str, len);
   }
 
-  void entry(const char* s);
-  void entry(std::string_view sv);
+  template <typename T,
+            std::enable_if_t<std::is_convertible_v<T&&, std::string_view>,
+                             bool> = true>
+  void entry(T&& s)
+  {
+    auto sv = std::string_view(s);
+    yajl_gen_string(gen, (const unsigned char *)sv.data(), sv.size());
+  }
 
   template <typename TKey, typename TValue>
   void property(TKey&& key, TValue&& val) {

include/cgimap/output_formatter.hpp

@@ -40,7 +40,8 @@ enum class action_type {
 
 namespace {
 
-const char* element_type_name(element_type elt) {
+template <typename T = const char *>
+T element_type_name(element_type elt) noexcept {
 
   switch (elt) {
   case element_type::node:

src/backend/apidb/common_pgsql_selection.cpp

@@ -131,7 +131,7 @@ struct comments_columns
 
   elem.id        = row[col.id_col].as<osm_nwr_id_t>();
   elem.version   = row[col.version_col].as<int>();
-  elem.timestamp = row[col.timestamp_col].c_str();
+  elem.timestamp = row[col.timestamp_col].as<std::string>();
   elem.changeset = row[col.changeset_id_col].as<osm_changeset_id_t>();
   elem.visible   = row[col.visible_col].as<bool>();
 
@@ -163,8 +163,8 @@ std::optional<T> extract_optional(const pqxx_field &f) {
   changeset_info elem;
 
   elem.id = row[col.id_col].as<osm_changeset_id_t>();
-  elem.created_at = row[col.created_at_col].c_str();
-  elem.closed_at = row[col.closed_at_col].c_str();
+  elem.created_at = row[col.created_at_col].as<std::string>();
+  elem.closed_at = row[col.closed_at_col].as<std::string>();
 
   const auto & cs = changeset_cache[elem.id];
 

src/json_formatter.cpp

@@ -157,7 +157,7 @@ void json_formatter::write_relation(const element_info &elem,
       writer->start_array();
       for (const auto & member : members) {
 	  writer->start_object();
-	  writer->property("type", element_type_name(member.type));
+	  writer->property("type", element_type_name<std::string_view>(member.type));
 	  writer->property("ref",  member.ref);
 	  writer->property("role", member.role);
 	  writer->end_object();

src/json_writer.cpp

@@ -63,10 +63,6 @@ void json_writer::start_object() {
   yajl_gen_map_open(gen);
 }
 
-void json_writer::object_key(const char* s) {
-  entry(s);
-}
-
 void json_writer::object_key(std::string_view sv) {
   entry(sv);
 }
@@ -102,14 +98,6 @@ void json_writer::entry(double d) {
   yajl_gen_number(gen, str, len);
 }
 
-void json_writer::entry(const char* s) {
-  entry(std::string_view(s));
-}
-
-void json_writer::entry(std::string_view sv) {
-  yajl_gen_string(gen, (const unsigned char *)sv.data(), sv.size());
-}
-
 void json_writer::start_array() {
   yajl_gen_array_open(gen);
 }