From 5e08ba763db8c5d54b22319717e9d5054bf5ba55 Mon Sep 17 00:00:00 2001
From: Bertil Chapuis <bchapuis@gmail.com>
Date: Sun, 26 Nov 2023 11:50:54 +0100
Subject: [PATCH] Replace CTE with subquery in PostgresTileStore and do some
 cleaning

---
 .run/basemap-dev.run.xml                              |  7 ++++++-
 .run/basemap-export-mbtiles.run.xml                   | 11 -----------
 .run/basemap-export-pmtiles.run.xml                   | 11 -----------
 .run/basemap-workflow.run.xml                         |  5 -----
 .../apache/baremaps/tilestore/pmtiles/PMTiles.java    |  4 ++--
 .../baremaps/tilestore/pmtiles/PMTilesReader.java     |  5 ++---
 .../tilestore/postgres/PostgresTileStore.java         |  9 ++++-----
 .../baremaps/tilestore/pmtiles/PMTilesTest.java       |  2 --
 8 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/.run/basemap-dev.run.xml b/.run/basemap-dev.run.xml
index 4b61bfcdb..af9438a44 100644
--- a/.run/basemap-dev.run.xml
+++ b/.run/basemap-dev.run.xml
@@ -2,8 +2,13 @@
   <configuration default="false" name="basemap-dev" 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.js --style style.js" />
+    <option name="PROGRAM_PARAMETERS" value="map dev --tileset tileset.js --style style.js --log-level DEBUG" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
+    <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/basemap-export-mbtiles.run.xml b/.run/basemap-export-mbtiles.run.xml
index e71796a84..d04d8a2ad 100644
--- a/.run/basemap-export-mbtiles.run.xml
+++ b/.run/basemap-export-mbtiles.run.xml
@@ -4,17 +4,6 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="map export --tileset tileset.js --repository tiles.mbtiles --format mbtiles" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
-        <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/basemap-export-pmtiles.run.xml b/.run/basemap-export-pmtiles.run.xml
index 5b6122402..840a47747 100644
--- a/.run/basemap-export-pmtiles.run.xml
+++ b/.run/basemap-export-pmtiles.run.xml
@@ -4,17 +4,6 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="map export --tileset tileset.js --repository tiles.mbtiles --format pmtiles" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
-        <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/basemap-workflow.run.xml b/.run/basemap-workflow.run.xml
index c10d068a7..663c874a9 100644
--- a/.run/basemap-workflow.run.xml
+++ b/.run/basemap-workflow.run.xml
@@ -4,11 +4,6 @@
     <module name="baremaps-cli" />
     <option name="PROGRAM_PARAMETERS" value="workflow execute --file import.js" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
-    <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/pmtiles/PMTiles.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTiles.java
index 0e83c018a..e8bf2f304 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTiles.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTiles.java
@@ -332,8 +332,8 @@ public static Entry findTile(List<Entry> entries, long tileId) {
   public static Directories buildRootLeaves(List<Entry> entries, int leafSize) throws IOException {
     var rootEntries = new ArrayList<Entry>();
     var numLeaves = 0;
-    byte[] leavesBytes = null;
-    byte[] rootBytes = null;
+    byte[] leavesBytes;
+    byte[] rootBytes;
 
     try (var leavesOutput = new ByteArrayOutputStream();
         var leavesDataOutput = new LittleEndianDataOutputStream(leavesOutput)) {
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTilesReader.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTilesReader.java
index 24992e38f..42a43af4e 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTilesReader.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTilesReader.java
@@ -52,13 +52,12 @@ public Header getHeader() {
   public List<Entry> getRootDirectory() {
     if (rootEntries == null) {
       var header = getHeader();
-      rootEntries =
-          getDirectory(header.getRootDirectoryOffset(), (int) header.getRootDirectoryLength());
+      rootEntries = getDirectory(header.getRootDirectoryOffset());
     }
     return rootEntries;
   }
 
-  public List<Entry> getDirectory(long offset, int length) {
+  public List<Entry> getDirectory(long offset) {
     var header = getHeader();
     try (var input = Files.newInputStream(path)) {
       input.skip(offset);
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 dd640a74a..382adb980 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
@@ -128,7 +128,7 @@ public ByteBuffer read(TileCoord tileCoord) throws TileStoreException {
   protected static Query prepareQuery(Tileset tileset, int zoom) {
     // Initialize a builder for the tile sql
     var tileSql = new StringBuilder();
-    tileSql.append("SELECT (");
+    tileSql.append("SELECT ");
 
     // Iterate over the layers and keep track of the number of layers and parameters included in the
     // final sql
@@ -139,7 +139,7 @@ protected static Query prepareQuery(Tileset tileset, int zoom) {
 
       // Initialize a builder for the layer sql
       var layerSql = new StringBuilder();
-      var layerHead = "(WITH mvtGeom AS (";
+      var layerHead = String.format("(SELECT ST_AsMVT(mvtGeom.*, '%s') FROM (", layer.getId());
       layerSql.append(layerHead);
 
       // Iterate over the queries and keep track of the number of queries included in the final
@@ -175,8 +175,7 @@ protected static Query prepareQuery(Tileset tileset, int zoom) {
       }
 
       // Add the tail of the layer sql
-      var layerQueryTail =
-          String.format(") SELECT ST_AsMVT(mvtGeom.*, '%s') FROM mvtGeom)", layer.getId());
+      var layerQueryTail = ") AS mvtGeom)";
       layerSql.append(layerQueryTail);
 
       // Only include the layer sql if queries were included for this layer
@@ -196,7 +195,7 @@ protected static Query prepareQuery(Tileset tileset, int zoom) {
     }
 
     // Add the tail of the tile sql
-    var tileQueryTail = ") mvtTile";
+    var tileQueryTail = " mvtTile";
     tileSql.append(tileQueryTail);
 
     // Format the sql query
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/pmtiles/PMTilesTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/pmtiles/PMTilesTest.java
index fd60b1979..e078d1d53 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/pmtiles/PMTilesTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/pmtiles/PMTilesTest.java
@@ -194,8 +194,6 @@ void encodeHeader() throws IOException {
     var output = new LittleEndianDataOutputStream(array);
     PMTiles.serializeHeader(output, header);
 
-    var array2 = array.toByteArray();
-
     var input = new LittleEndianDataInputStream(new ByteArrayInputStream(array.toByteArray()));
     var header2 = PMTiles.deserializeHeader(input);