You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/05/23 20:58:22 UTC
[incubator-baremaps] 01/01: Fix tile cache bug
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch 664-cache-bug
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit e943bfd56d811ec1879ee8de9917ed446a3ac71c
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Tue May 23 22:58:08 2023 +0200
Fix tile cache bug
---
.run/openstreetmap-dev.run.xml | 5 +++++
.run/openstreetmap-serve.run.xml | 5 +++++
...{openstreetmap-dev.run.xml => openstreetmap-workflow.run.xml} | 9 +++++++--
.../src/main/java/org/apache/baremaps/tilestore/TileCache.java | 4 ++--
.../apache/baremaps/tilestore/postgres/PostgresTileStore.java | 4 +++-
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.run/openstreetmap-dev.run.xml b/.run/openstreetmap-dev.run.xml
index cb0bf71c..9d3997d0 100644
--- a/.run/openstreetmap-dev.run.xml
+++ b/.run/openstreetmap-dev.run.xml
@@ -10,6 +10,11 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+ <option name="credential" />
+ <option name="region" />
+ <option name="useCurrentConnection" value="false" />
+ </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
diff --git a/.run/openstreetmap-serve.run.xml b/.run/openstreetmap-serve.run.xml
index 9e79c50e..1f7340c9 100644
--- a/.run/openstreetmap-serve.run.xml
+++ b/.run/openstreetmap-serve.run.xml
@@ -10,6 +10,11 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+ <option name="credential" />
+ <option name="region" />
+ <option name="useCurrentConnection" value="false" />
+ </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
diff --git a/.run/openstreetmap-dev.run.xml b/.run/openstreetmap-workflow.run.xml
similarity index 55%
copy from .run/openstreetmap-dev.run.xml
copy to .run/openstreetmap-workflow.run.xml
index cb0bf71c..3ba0380f 100644
--- a/.run/openstreetmap-dev.run.xml
+++ b/.run/openstreetmap-workflow.run.xml
@@ -1,8 +1,8 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="openstreetmap-dev" type="Application" factoryName="Application">
+ <configuration default="false" name="openstreetmap-workflow" 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 dev --tileset tileset.json --style style.json" />
+ <option name="PROGRAM_PARAMETERS" value="workflow execute --file workflow.json" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/openstreetmap" />
<extension name="coverage">
<pattern>
@@ -10,6 +10,11 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+ <option name="credential" />
+ <option name="region" />
+ <option name="useCurrentConnection" value="false" />
+ </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
index 59d36027..03610767 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
@@ -57,13 +57,13 @@ public class TileCache implements TileStore {
if (buffer == null) {
return null;
} else {
- return buffer.duplicate();
+ return buffer;
}
} catch (TileStoreException e) {
logger.error("Unable to read the tile.", e);
return null;
}
- });
+ }).duplicate();
}
/** {@inheritDoc} */
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java
index 3a351a85..1e1eb6c3 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java
@@ -228,7 +228,9 @@ public class PostgresTileStore implements TileStore {
}
protected PostgresGroup commonTableExpression(PostgresQuery query) {
- return new PostgresGroup(query.getAst().getSelectItems(), query.getAst().getFromItem(),
+ return new PostgresGroup(
+ query.getAst().getSelectItems(),
+ query.getAst().getFromItem(),
query.getAst().getJoins());
}