Skip to content

Commit 3a460cd

Browse files
jotojoto
committed
Switch middle database default format to "new"
1 parent e6a3096 commit 3a460cd

File tree

7 files changed

+69
-60
lines changed

7 files changed

+69
-60
lines changed

‎man/osm2pgsql.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,11 @@ mandatory for short options too.
179179

180180
\--middle-database-format=FORMAT
181181
: Set the database format for the middle tables to FORMAT. Allowed formats
182-
are **legacy** and **new**. The **legacy** format is the old format that
183-
will eventually be deprecated and removed but is currently still the
184-
default. The **new** format was introduced in version 1.9.0.
185-
See the manual for details on these formats. (Only works
186-
with **\--slim**. In append mode osm2pgsql will automatically detect the
187-
database format, so don't use this with **-a, \--append**.)
182+
are **new** (default) and **legacy** . The **legacy** format is deprecated
183+
and will be removed in version 2.0.0. See the manual for details on these
184+
formats. (Only works with **\--slim**. In append mode osm2pgsql will
185+
automatically detect the database format, so don't use this with
186+
**-a, \--append**.)
188187

189188
\--middle-with-nodes
190189
: Used together with the **new** middle database format when a flat nodes

‎src/command-line-parser.cpp‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,6 @@ static void check_options(options_t *options)
221221
throw std::runtime_error{"--drop only makes sense with --slim."};
222222
}
223223

224-
if (options->append && options->middle_database_format != 1) {
225-
throw std::runtime_error{
226-
"Do not use --middle-database-format with --append."};
227-
}
228-
229224
if (options->cache < 0) {
230225
options->cache = 0;
231226
log_warn("RAM cache cannot be negative. Using 0 instead.");
@@ -536,21 +531,10 @@ options_t parse_command_line(int argc, char *argv[])
536531
->type_name("SCHEMA")
537532
->group("Middle options");
538533

534+
std::string middle_database_format_raw;
539535
// --middle-database-format
540-
app.add_option_function<std::string>(
541-
"--middle-database-format",
542-
[&](std::string const &arg) {
543-
if (arg == "legacy") {
544-
options.middle_database_format = 1;
545-
} else if (arg == "new") {
546-
options.middle_database_format = 2;
547-
} else {
548-
throw std::runtime_error{
549-
"Unknown value for --middle-database-format"
550-
" (Use 'legacy' or 'new')."};
551-
}
552-
})
553-
->description("Set middle db format ('legacy' (default), 'new').")
536+
app.add_option("--middle-database-format", middle_database_format_raw)
537+
->description("Set middle db format ('legacy', 'new' (default)).")
554538
->type_name("FORMAT")
555539
->group("Middle options");
556540

@@ -703,7 +687,32 @@ options_t parse_command_line(int argc, char *argv[])
703687
return options;
704688
}
705689

706-
if (!options.slim) {
690+
check_options(&options);
691+
692+
if (options.slim) { // slim mode, use database middle
693+
if (middle_database_format_raw.empty()) {
694+
// Database format not set on the command line, use defaults. For
695+
// append mode we keep old default for backwards compatibility, for
696+
// create mode the new format is the default. (These will possibly
697+
// be overwritten later by properties setting if it exists.)
698+
options.middle_database_format = options.append ? 1 : 2;
699+
} else if (options.append) {
700+
// Database format set on command line in append mode.
701+
throw std::runtime_error{
702+
"Do not use --middle-database-format with --append."};
703+
} else {
704+
// Database format set on the command line in create mode.
705+
if (middle_database_format_raw == "legacy") {
706+
options.middle_database_format = 1;
707+
} else if (middle_database_format_raw == "new") {
708+
options.middle_database_format = 2;
709+
} else {
710+
throw std::runtime_error{
711+
"Unknown value for --middle-database-format"
712+
" (Use 'legacy' or 'new')."};
713+
}
714+
}
715+
} else { // non-slim mode, use ram middle
707716
check_options_non_slim(app);
708717
}
709718

@@ -761,13 +770,7 @@ options_t parse_command_line(int argc, char *argv[])
761770

762771
check_options_expire(&options);
763772

764-
check_options(&options);
765-
766773
options.connection_params = app.connection_params();
767774

768-
if (!options.slim) {
769-
options.middle_database_format = 0;
770-
}
771-
772775
return options;
773776
}

‎src/options.hpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,13 @@ struct options_t
115115
*/
116116
uint8_t way_node_index_id_shift = 5;
117117

118-
/// Database format (0=unknown/no database middle, 1=legacy, 2=new)
119-
uint8_t middle_database_format = 1;
118+
/**
119+
* Middle database format:
120+
* 0 = non-slim mode, no database middle (ram middle)
121+
* 1 = slim mode, legacy database format
122+
* 2 = slim mode, new database format
123+
*/
124+
uint8_t middle_database_format = 0;
120125

121126
/**
122127
* Should nodes (with tags) be stored in the middle? If no flat node file

‎tests/bdd/command-line/invalid.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Feature: Errors for invalid command line parameter combinations
2424

2525
Scenario: append and middle-database-format cannot be used together
2626
Then running osm2pgsql pgsql with parameters fails
27-
| -a | --slim | --middle-database-format=new |
27+
| -a | --slim | --middle-database-format=legacy |
2828
And the error output contains
2929
"""
3030
Do not use --middle-database-format with --append.

‎tests/bdd/regression/timestamps.feature‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
5555
And table osm2pgsql_properties contains
5656
| property | value |
5757
| attributes | false |
58-
| db_format | 1 |
58+
| db_format | 2 |
5959
| flat_node_file | |
6060
| prefix | planet_osm |
6161
| updatable | true |
@@ -76,7 +76,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
7676
And table osm2pgsql_properties contains
7777
| property | value |
7878
| attributes | false |
79-
| db_format | 1 |
79+
| db_format | 2 |
8080
| flat_node_file | |
8181
| prefix | planet_osm |
8282
| updatable | true |
@@ -99,7 +99,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
9999
And table osm2pgsql_properties contains
100100
| property | value |
101101
| attributes | false |
102-
| db_format | 1 |
102+
| db_format | 2 |
103103
| flat_node_file | |
104104
| prefix | planet_osm |
105105
| updatable | true |
@@ -120,7 +120,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
120120
And table osm2pgsql_properties contains
121121
| property | value |
122122
| attributes | false |
123-
| db_format | 1 |
123+
| db_format | 2 |
124124
| flat_node_file | |
125125
| prefix | planet_osm |
126126
| updatable | true |
@@ -143,7 +143,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
143143
And table osm2pgsql_properties contains
144144
| property | value |
145145
| attributes | false |
146-
| db_format | 1 |
146+
| db_format | 2 |
147147
| flat_node_file | |
148148
| prefix | planet_osm |
149149
| updatable | true |
@@ -162,7 +162,7 @@ Feature: Timestamps in properties table should reflect timestamps in input file
162162
And table osm2pgsql_properties contains
163163
| property | value |
164164
| attributes | false |
165-
| db_format | 1 |
165+
| db_format | 2 |
166166
| flat_node_file | |
167167
| prefix | planet_osm |
168168
| updatable | true |

‎tests/common-options.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ class opt_t
3838
opt_t &slim()
3939
{
4040
m_opt.slim = true;
41+
m_opt.middle_database_format = 2;
4142
return *this;
4243
}
4344

4445
opt_t &slim(testing::pg::tempdb_t const &db)
4546
{
4647
m_opt.slim = true;
48+
m_opt.middle_database_format = 2;
4749
m_opt.connection_params = db.connection_params();
4850
return *this;
4951
}

‎tests/test-middle.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@ struct options_flat_node_cache
8383
}
8484
};
8585

86-
struct options_slim_new_format
86+
struct options_slim_legacy_format
8787
{
8888
static options_t options(testing::pg::tempdb_t const &tmpdb)
8989
{
9090
options_t o = testing::opt_t().slim(tmpdb);
91-
o.middle_database_format = 2;
91+
o.middle_database_format = 1;
9292
return o;
9393
}
9494
};
9595

96-
struct options_slim_new_format_with_flatnodes
96+
struct options_slim_legacy_format_with_flatnodes
9797
{
9898
static options_t options(testing::pg::tempdb_t const &tmpdb)
9999
{
100100
options_t o = testing::opt_t().slim(tmpdb).flatnodes();
101-
o.middle_database_format = 2;
101+
o.middle_database_format = 1;
102102
return o;
103103
}
104104
};
@@ -112,7 +112,7 @@ struct options_ram_optimized
112112
};
113113

114114
TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
115-
options_slim_new_format, options_slim_with_lc_prefix,
115+
options_slim_legacy_format, options_slim_with_lc_prefix,
116116
options_slim_with_uc_prefix, options_slim_with_schema,
117117
options_ram_optimized)
118118
{
@@ -367,9 +367,9 @@ static bool no_node(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
367367
}
368368

369369
TEMPLATE_TEST_CASE("middle: add, delete and update node", "",
370-
options_slim_default, options_slim_new_format,
370+
options_slim_default, options_slim_legacy_format,
371371
options_flat_node_cache,
372-
options_slim_new_format_with_flatnodes)
372+
options_slim_legacy_format_with_flatnodes)
373373
{
374374
auto thread_pool = std::make_shared<thread_pool_t>(1U);
375375

@@ -586,9 +586,9 @@ static bool no_way(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
586586
}
587587

588588
TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
589-
options_slim_default, options_slim_new_format,
589+
options_slim_default, options_slim_legacy_format,
590590
options_flat_node_cache,
591-
options_slim_new_format_with_flatnodes)
591+
options_slim_legacy_format_with_flatnodes)
592592
{
593593
auto thread_pool = std::make_shared<thread_pool_t>(1U);
594594

@@ -739,8 +739,8 @@ TEMPLATE_TEST_CASE("middle: add, delete and update way", "",
739739
}
740740

741741
TEMPLATE_TEST_CASE("middle: add way with attributes", "", options_slim_default,
742-
options_slim_new_format, options_flat_node_cache,
743-
options_slim_new_format_with_flatnodes)
742+
options_slim_legacy_format, options_flat_node_cache,
743+
options_slim_legacy_format_with_flatnodes)
744744
{
745745
auto thread_pool = std::make_shared<thread_pool_t>(1U);
746746

@@ -840,9 +840,9 @@ static bool no_relation(std::shared_ptr<middle_pgsql_t> const &mid, osmid_t id)
840840
}
841841

842842
TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
843-
options_slim_default, options_slim_new_format,
843+
options_slim_default, options_slim_legacy_format,
844844
options_flat_node_cache,
845-
options_slim_new_format_with_flatnodes)
845+
options_slim_legacy_format_with_flatnodes)
846846
{
847847
auto thread_pool = std::make_shared<thread_pool_t>(1U);
848848

@@ -993,9 +993,9 @@ TEMPLATE_TEST_CASE("middle: add, delete and update relation", "",
993993
}
994994

995995
TEMPLATE_TEST_CASE("middle: add relation with attributes", "",
996-
options_slim_default, options_slim_new_format,
996+
options_slim_default, options_slim_legacy_format,
997997
options_flat_node_cache,
998-
options_slim_new_format_with_flatnodes)
998+
options_slim_legacy_format_with_flatnodes)
999999
{
10001000
auto thread_pool = std::make_shared<thread_pool_t>(1U);
10011001

@@ -1042,8 +1042,8 @@ TEMPLATE_TEST_CASE("middle: add relation with attributes", "",
10421042
}
10431043

10441044
TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
1045-
options_slim_new_format, options_flat_node_cache,
1046-
options_slim_new_format_with_flatnodes)
1045+
options_slim_legacy_format, options_flat_node_cache,
1046+
options_slim_legacy_format_with_flatnodes)
10471047
{
10481048
auto thread_pool = std::make_shared<thread_pool_t>(1U);
10491049

@@ -1198,8 +1198,8 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
11981198
}
11991199

12001200
TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
1201-
options_slim_new_format, options_flat_node_cache,
1202-
options_slim_new_format_with_flatnodes)
1201+
options_slim_legacy_format, options_flat_node_cache,
1202+
options_slim_legacy_format_with_flatnodes)
12031203
{
12041204
auto thread_pool = std::make_shared<thread_pool_t>(1U);
12051205

0 commit comments

Comments
 (0)