Merge pull request #2172 from joto/remove-old-db-middle

Remove support for legacy middle database format

Author: lonvia

man/osm2pgsql.1

@@ -203,16 +203,6 @@ Set ID shift for way node bucket index in middle.
 Experts only.
 See documentation for details.
 .TP
---middle-database-format=FORMAT
-Set the database format for the middle tables to FORMAT.
-Allowed formats are \f[B]new\f[R] (default) and \f[B]legacy\f[R] .
-The \f[B]legacy\f[R] format is deprecated and will be removed in version
-2.0.0.
-See the manual for details on these formats.
-(Only works with \f[B]--slim\f[R].
-In append mode osm2pgsql will automatically detect the database format,
-so don\[cq]t use this with \f[B]-a, --append\f[R].)
-.TP
 --middle-with-nodes
 Used together with the \f[B]new\f[R] middle database format when a flat
 nodes file is used to force storing nodes with tags in the database,

man/osm2pgsql.md

@@ -176,14 +176,6 @@ mandatory for short options too.
 :   Set ID shift for way node bucket index in middle. Experts only. See
     documentation for details.
 
-\--middle-database-format=FORMAT
-:   Set the database format for the middle tables to FORMAT. Allowed formats
-    are **new** (default) and **legacy** . The **legacy** format is deprecated
-    and will be removed in version 2.0.0. See the manual for details on these
-    formats. (Only works with **\--slim**. In append mode osm2pgsql will
-    automatically detect the database format, so don't use this with
-    **-a, \--append**.)
-
 \--middle-with-nodes
 :   Used together with the **new** middle database format when a flat nodes
     file is used to force storing nodes with tags in the database, too.

src/command-line-parser.cpp

@@ -131,9 +131,8 @@ void print_version()
 
 static void check_options_non_slim(CLI::App const &app)
 {
-    std::array<std::string, 7> const slim_options = {
+    std::array<std::string, 6> const slim_options = {
         "--flat-nodes",
-        "--middle-database-format",
         "--middle-schema",
         "--middle-with-nodes",
         "--middle-way-node-index-id-shift",
@@ -525,13 +524,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->type_name("SCHEMA")
         ->group("Middle options");
 
-    std::string middle_database_format_raw;
-    // --middle-database-format
-    app.add_option("--middle-database-format", middle_database_format_raw)
-        ->description("Set middle db format ('legacy', 'new' (default)).")
-        ->type_name("FORMAT")
-        ->group("Middle options");
-
     // --middle-with-nodes
     app.add_flag("--middle-with-nodes", options.middle_with_nodes)
         ->description("Store tagged nodes in db (new middle db format only).")
@@ -651,28 +643,7 @@ options_t parse_command_line(int argc, char *argv[])
     check_options(&options);
 
     if (options.slim) { // slim mode, use database middle
-        if (middle_database_format_raw.empty()) {
-            // Database format not set on the command line, use defaults. For
-            // append mode we keep old default for backwards compatibility, for
-            // create mode the new format is the default. (These will possibly
-            // be overwritten later by properties setting if it exists.)
-            options.middle_database_format = options.append ? 1 : 2;
-        } else if (options.append) {
-            // Database format set on command line in append mode.
-            throw std::runtime_error{
-                "Do not use --middle-database-format with --append."};
-        } else {
-            // Database format set on the command line in create mode.
-            if (middle_database_format_raw == "legacy") {
-                options.middle_database_format = 1;
-            } else if (middle_database_format_raw == "new") {
-                options.middle_database_format = 2;
-            } else {
-                throw std::runtime_error{
-                    "Unknown value for --middle-database-format"
-                    " (Use 'legacy' or 'new')."};
-            }
-        }
+        options.middle_database_format = 2;
     } else { // non-slim mode, use ram middle
         check_options_non_slim(app);
     }

src/db-copy-mgr.hpp

@@ -121,23 +121,12 @@ class db_copy_mgr_t
      * Adds the value in the format appropriate for an array and a value
      * separator.
      */
-    template <typename T>
-    void add_array_elem(T value)
+    void add_array_elem(osmid_t value)
     {
         add_value(value);
         m_current->buffer += ',';
     }
 
-    void add_array_elem(std::string const &s) { add_array_elem(s.c_str()); }
-
-    void add_array_elem(char const *s)
-    {
-        assert(m_current);
-        m_current->buffer += '"';
-        add_escaped_string(s);
-        m_current->buffer += "\",";
-    }
-
     /**
      * Finish an array column previously started with new_array().
      *