Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark command line option -i, --tablespace-index as deprecated #2136

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Mark command line option -i, --tablespace-index as deprecated #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions man/osm2pgsql.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ Example: \f[B]--bbox\f[R] \f[B]-0.5,51.25,0.5,51.75\f[R]
-i, --tablespace-index=TABLESPC
Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
This option also affects the tables created by the pgsql output.
This option is deprecated.
Use the --tablespace-slim-index and/or --tablespace-main-index options
instead.
.TP
--tablespace-slim-data=TABLESPC
Store the slim mode tables in the given tablespace.
Expand Down Expand Up @@ -245,6 +248,9 @@ no default.)
-i, --tablespace-index=TABLESPC
Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
This option also affects the middle tables.
This option is deprecated.
Use the --tablespace-slim-index and/or --tablespace-main-index options
instead.
.TP
--tablespace-main-data=TABLESPC
Store the data tables in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
Expand Down
7 changes: 5 additions & 2 deletions man/osm2pgsql.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ mandatory for short options too.

-i, \--tablespace-index=TABLESPC
: Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
also affects the tables created by the pgsql output.
also affects the tables created by the pgsql output. This option is
deprecated. Use the \--tablespace-slim-index and/or \--tablespace-main-index
options instead.

\--tablespace-slim-data=TABLESPC
: Store the slim mode tables in the given tablespace.
Expand Down Expand Up @@ -211,7 +213,8 @@ mandatory for short options too.

-i, \--tablespace-index=TABLESPC
: Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
also affects the middle tables.
also affects the middle tables. This option is deprecated. Use the
\--tablespace-slim-index and/or \--tablespace-main-index options instead.

\--tablespace-main-data=TABLESPC
: Store the data tables in the PostgreSQL tablespace `TABLESPC`.
Expand Down
3 changes: 3 additions & 0 deletions src/command-line-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,9 @@ options_t parse_command_line(int argc, char *argv[])
}

if (!tablespace_index.empty()) {
log_warn(
"The option -i, --tablespace-index is deprecated. Use "
"--tablespace-slim-index and/or --tablespace-main-index instead.");
if (options.tblsmain_index.empty()) {
options.tblsmain_index = tablespace_index;
}
Expand Down