Skip to content

Commit 6592188

Browse files
committed
Mark command line option -i, --tablespace-index as deprecated
Fixes #2133
1 parent e6a3096 commit 6592188

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

man/osm2pgsql.1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ Example: \f[B]--bbox\f[R] \f[B]-0.5,51.25,0.5,51.75\f[R]
115115
-i, --tablespace-index=TABLESPC
116116
Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
117117
This option also affects the tables created by the pgsql output.
118+
This option is deprecated.
119+
Use the --tablespace-slim-index and/or --tablespace-main-index options
120+
instead.
118121
.TP
119122
--tablespace-slim-data=TABLESPC
120123
Store the slim mode tables in the given tablespace.
@@ -245,6 +248,9 @@ no default.)
245248
-i, --tablespace-index=TABLESPC
246249
Store all indexes in the PostgreSQL tablespace \f[V]TABLESPC\f[R].
247250
This option also affects the middle tables.
251+
This option is deprecated.
252+
Use the --tablespace-slim-index and/or --tablespace-main-index options
253+
instead.
248254
.TP
249255
--tablespace-main-data=TABLESPC
250256
Store the data tables in the PostgreSQL tablespace \f[V]TABLESPC\f[R].

man/osm2pgsql.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ mandatory for short options too.
111111

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

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

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

216219
\--tablespace-main-data=TABLESPC
217220
: Store the data tables in the PostgreSQL tablespace `TABLESPC`.

src/command-line-parser.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,9 @@ options_t parse_command_line(int argc, char *argv[])
724724
}
725725

726726
if (!tablespace_index.empty()) {
727+
log_warn(
728+
"The option -i, --tablespace-index is deprecated. Use "
729+
"--tablespace-slim-index and/or --tablespace-main-index instead.");
727730
if (options.tblsmain_index.empty()) {
728731
options.tblsmain_index = tablespace_index;
729732
}

0 commit comments

Comments
 (0)