This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch mbtiles-perf in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 4b859f97e6fe200e39a75f8b1cdf6d0f446a74f3 Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Aug 22 17:13:09 2023 +0200 Fix run config --- .run/basemap-mbtiles.run.xml | 2 +- .../src/main/java/org/apache/baremaps/utils/SqliteUtils.java | 6 +++--- .../java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.run/basemap-mbtiles.run.xml b/.run/basemap-mbtiles.run.xml index f5446441..fd32451f 100644 --- a/.run/basemap-mbtiles.run.xml +++ b/.run/basemap-mbtiles.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="basemap-mbtiles" type="Application" factoryName="Application"> <option name="MAIN_CLASS_NAME" value="org.apache.baremaps.cli.Baremaps" /> <module name="baremaps-cli" /> - <option name="PROGRAM_PARAMETERS" value="map mbtiles --mbtiles $USER_HOME$/Datasets/Baremaps/tiles.mbtiles --tilejson tileset.js --style style.js" /> + <option name="PROGRAM_PARAMETERS" value="map mbtiles --mbtiles tiles.mbtiles --tilejson tileset.js --style style.js" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" /> <extension name="coverage"> <pattern> diff --git a/baremaps-core/src/main/java/org/apache/baremaps/utils/SqliteUtils.java b/baremaps-core/src/main/java/org/apache/baremaps/utils/SqliteUtils.java index 35e980ae..468cb95a 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/utils/SqliteUtils.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/utils/SqliteUtils.java @@ -32,6 +32,8 @@ import org.sqlite.SQLiteConfig.SynchronousMode; import org.sqlite.SQLiteConfig.TempStore; import org.sqlite.SQLiteDataSource; +import javax.sql.DataSource; + /** A helper class for creating executing sql scripts onto a SQLite database */ public final class SqliteUtils { @@ -43,7 +45,7 @@ public final class SqliteUtils { * @param path the path to the SQLite database * @return the SQLite data source */ - public static HikariDataSource createDataSource(Path path, boolean readOnly) { + public static DataSource createDataSource(Path path, boolean readOnly) { var sqliteConfig = new SQLiteConfig(); sqliteConfig.setReadOnly(readOnly); sqliteConfig.setCacheSize(1000000); @@ -57,8 +59,6 @@ public final class SqliteUtils { sqliteDataSource.setConfig(sqliteConfig); sqliteDataSource.setUrl("jdbc:sqlite:" + path.toAbsolutePath()); - System.out.println(path.toAbsolutePath()); - var hikariConfig = new HikariConfig(); hikariConfig.setDataSource(sqliteDataSource); hikariConfig.setMaximumPoolSize(readOnly ? Runtime.getRuntime().availableProcessors() : 1); diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java index 07c2a9ae..ab2c3684 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java @@ -74,7 +74,8 @@ public record ExportVectorTiles( StreamUtils.stream(TileCoord.iterator(envelope, tileset.getMinzoom(), tileset.getMaxzoom())) .peek(new ProgressLogger<>(count, 5000)); - StreamUtils.batch(stream, 10).forEach(new TileChannel(sourceTileStore, targetTileStore)); + StreamUtils.batch(stream, Runtime.getRuntime().availableProcessors() * 2) + .forEach(new TileChannel(sourceTileStore, targetTileStore)); } private TileStore sourceTileStore(Tileset tileset, DataSource datasource) {
