Skip to content

Commit 28791b1

Browse files
authored
Merge pull request #475 from lonvia/reenable-auto-commit-in-updater
reenable autocommit in Updater
2 parents 45b35d3 + cbe97e1 commit 28791b1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/de/komoot/photon/nominatim/NominatimConnector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -235,20 +235,20 @@ public void processRow(ResultSet rs) throws SQLException {
235235
* @param password db username's password
236236
*/
237237
public NominatimConnector(String host, int port, String database, String username, String password) {
238-
BasicDataSource dataSource = buildDataSource(host, port, database, username, password);
238+
BasicDataSource dataSource = buildDataSource(host, port, database, username, password, false);
239239

240240
template = new JdbcTemplate(dataSource);
241241
template.setFetchSize(100000);
242242
}
243243

244-
static BasicDataSource buildDataSource(String host, int port, String database, String username, String password) {
244+
static BasicDataSource buildDataSource(String host, int port, String database, String username, String password, boolean autocommit) {
245245
BasicDataSource dataSource = new BasicDataSource();
246246

247247
dataSource.setUrl(String.format("jdbc:postgres_jts://%s:%d/%s", host, port, database));
248248
dataSource.setUsername(username);
249249
dataSource.setPassword(password);
250250
dataSource.setDriverClassName(JtsWrapper.class.getCanonicalName());
251-
dataSource.setDefaultAutoCommit(false);
251+
dataSource.setDefaultAutoCommit(autocommit);
252252
return dataSource;
253253
}
254254

src/main/java/de/komoot/photon/nominatim/NominatimUpdater.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public UpdateRow mapRow(ResultSet rs, int rowNum) throws SQLException {
184184
* @param password Nominatim database password
185185
*/
186186
public NominatimUpdater(String host, int port, String database, String username, String password) {
187-
BasicDataSource dataSource = NominatimConnector.buildDataSource(host, port, database, username, password);
187+
BasicDataSource dataSource = NominatimConnector.buildDataSource(host, port, database, username, password, true);
188188

189189
exporter = new NominatimConnector(host, port, database, username, password);
190190
template = new JdbcTemplate(dataSource);

0 commit comments

Comments
 (0)