30 Commits

Author SHA1 Message Date
c092dd360c Cleaned up more code from landmark that wasn't used. Experimenting with power generator:source stuff 2020-08-08 22:08:02 +02:00
bd1325109a Cleaned up more code from landmark that wasn't used. Experimenting with power generator:source stuff 2020-08-08 21:24:00 +02:00
Yuri Astrakhan
2b95d1cffa
Fix & optimize incorrect function declarations (#918)
* All functions that access database must be declared as `STABLE`, not `IMMUTABLE` -- because database can change at any moment, e.g. during an update
* there are a few functions that could be made `STRICT` -- passing `NULL` as a parameter will always result in a `NULL`, but for some reason that causes a significant decrease in perf.
* tagged one function as parallel safe

NOTE: somehow `ST_AsMVT()` method of tile generation is showing 70-90% slowdown with this patch. I am not sure of why this is happening. If the reason is the `IMMUTABLE` -> `STABLE` change, we may have to dig deeper into PG optimization
2020-06-17 12:15:26 -04:00
Yuri Astrakhan
6457419e0d
NOOP: Format all layer's SQL code (#917)
I would like to reformat all of our SQL to have a concise coding style.
This makes it far easier to understand the code for a casual contributor,
and lets us spot errors more easily.

Most importantly, it makes it much easier to grep (search) the code because it is more likely to be in the same syntax

Some key changes:
* SQL keywords are always UPPERCASE, e.g. `SELECT WHEN AS END ...`
* types, variables, aliases, and field names (identifiers) are always lower case
* `LANGUAGE 'plpgsql'` is now `LANGUAGE plpgsql` (no quotes)
* a few minor spacing/semicolon cleanups

P.S. Per @TomPohys request, `TABLE` is spelled using upper case despite being a type for consistency with PG Docs. Same for `LANGUAGE SQL` vs `LANGUAGE plpgsql`.
2020-06-08 12:19:55 -04:00
Jorge Sanz
ace759590e
Parallel capability to layer functions (#728)
This PR allows queries to be parallelized on recent versions of Postgres. The `PARALLEL SAFE` modifier has been added to the layer functions and a PLPGSQL function to convert strings into number has been replaced.

`PARALLEL SAFE` is a modifier for `CREATE FUNCTION` available since Postgres 9.6, so this change does not break current OpenMapTiles supported database version. More details about this topic [here](https://www.postgresql.org/docs/current/parallel-safety.html) and at the reference documentation for [`CREATE FUNCTION`](https://www.postgresql.org/docs/current/sql-createfunction.html).

### Testing procedure

The procedure to test this was:

* Imported `spain.pbf` in a clean environment
* Dumped the OpenMapTiles database from the Postgres Docker image
* Created a clean Postgres 12 database using the default Docker image
* Installed `postgis` 3 from the default Debian package and `osml10n` 2.5.8 from the repository (`make`, etc.)
* Restored the dump
* Lowered the postgres planner parameters for triggering parallel plans:
```sql
set parallel_setup_cost = 5;
set parallel_tuple_cost = 0.005;
```
* Manually added the `PARALLEL SAFE` modifier to each function involved in layer queries (not on updates or inserting functions).
* For each layer, run a testing query to confirm parallel workers were created, something like this:
```sql
explain analyze 
select * from layer_aerodrome_label(tilebbox(8,128,95),10,null)
union all
select * from layer_aerodrome_label(tilebbox(8,128,97),10,null);
```
* After all the layers were processed and confirmed to start parallel executions, a more complete example was run. This example just retrieves the geometries for all the layers from the same tile but without using any MVT related function.

<details><summary>Testing query</summary>

```sql
-- Using the function layer_landuse
explain analyze 
select geometry from layer_water(tilebbox(14,8020,6178),14)
union all
select geometry from layer_waterway(tilebbox(14,8020,6178),14)
union all
select geometry from layer_landcover(tilebbox(14,8020,6178),14)
union all
select geometry from layer_landuse(tilebbox(14,8020,6178),14)
union all
select geometry from layer_mountain_peak(tilebbox(14,8020,6178),14)
union all
select geometry from layer_park(tilebbox(14,8020,6178),14)
union all
select geometry from layer_boundary(tilebbox(14,8020,6178),14)
union all
select geometry from layer_aeroway(tilebbox(14,8020,6178),14)
union all
select geometry from layer_transportation(tilebbox(14,8020,6178),14)
union all
select geometry from layer_building(tilebbox(14,8020,6178),14)
union all
select geometry from layer_water_name(tilebbox(14,8020,6178),14)
union all
select geometry from layer_transportation_name(tilebbox(14,8020,6178),14)
union all
select geometry from layer_place(tilebbox(14,8020,6178),14)
union all
select geometry from layer_housenumber(tilebbox(14,8020,6178),14)
union all
select geometry from layer_poi(tilebbox(14,8020,6178),14)
union all
select geometry from layer_aerodrome_label(tilebbox(14,8020,6178),14);
```
</details>

You can inspect the execution plan and results on [this page](https://explain.dalibo.com/plan/3z). Also [attaching](https://github.com/openmaptiles/openmaptiles/files/3951822/explain-tile-simple.tar.gz) the query and JSON output for future reference. The website gives a ton of details, but you may want to search for nodes mentioning `workers` or `parallel` like in this area referring to `osm_border` or `osm_aeroway_linestring` entities

![image](https://user-images.githubusercontent.com/188264/70647153-9cac9300-1c48-11ea-96ea-ac7a1e2f4a79.png)

### Next steps

Since the execution plan is not showing a parallel append at the top level, meaning it's not running each layer individually, I want to continue experimenting with parameters and queries to see if it's possible to even parallelize more the request.

I will post my finding here, even no change in the code should happen.


cc. @nyurik

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2020-01-31 19:36:02 -05:00
Yuri Astrakhan
c9e7ad90c6
Remove unneeded "else null" in conditions (#732)
Minor code cleanup:
SQL already returns NULL in the "WHEN" condition
if it is not matched by any of the cases.

Co-authored-by: Eva Jelinkova <evka.jelinkova@gmail.com>
2020-01-22 17:24:28 -05:00
Jiri Kozel
bb00b4e53f
Add type of sport as subclass of pitch (#532) 2018-11-12 14:37:00 +01:00
nlehuby
7e50695631 Add layer, level, and indoor tags for poi 2018-11-05 10:08:31 +01:00
nlehuby
225a0f6fd9 add religion as subclass for place_of_worship 2018-01-12 15:47:31 +01:00
jirik
afa85ea37e Add osm_id as key of POI 2017-12-04 10:53:26 +01:00
jirik
543b0315b2 Add agg_stop indicator to transit stations (POI) 2017-11-09 11:46:32 +01:00
jirik
1c2ce970fd Distinguish type of information point (POI) 2017-11-09 11:46:32 +01:00
jirik
21f5f1717b Show ferry terminals sooner 2017-11-09 11:46:32 +01:00
jirik
a0a6e2d438 Show railway halts sooner 2017-11-09 11:46:32 +01:00
jirik
9cec6e1a10 Show railway stations sooner 2017-11-09 11:46:32 +01:00
Jiri Kozel
51bc8fad35 Multilinguality (#279)
Improve multilinguality: names in 57 languages, name:latin, name:nonlatin, name_int. Fixes #211 #252 #80.

See #279 for more info.
2017-06-12 17:53:47 +02:00
Jiri Kozel
9584f69035 Rail stations 2 (#255)
* rail stations

* Create 'railway' POI class with 'station' and 'halt' subclasses

* Introduce subway stops as POI

* Revert unwanted changes in .env and openmaptiles.yaml

* Remove halt key from documentation

* Distinguish aeroway and railway station, add tram_stop
2017-05-23 17:06:23 +02:00
jirik
4c6d30066d Add German names (name_de), unify English names (name_en) 2017-03-17 12:56:54 +01:00
ImreSamu
f5ac3def5e etldoc fixes 2016-12-04 02:52:52 +01:00
Lukas Martinelli
e50979b45c Nameless POI should have least important rank 2016-11-30 15:12:21 +00:00
Lukas Martinelli
eb847606bb Ensure nameless POI have biggest rank 2016-11-30 13:43:54 +00:00
Lukas Martinelli
b86a27a11f Remove trailing space and commented out code 2016-11-28 14:24:50 +00:00
Lukas Martinelli
09d3f0c2c1 Nameless POIs are ranked last 2016-11-28 14:24:08 +00:00
ImreSamu
e163c64c2a add nameless POI to the POI layer 2016-11-27 17:36:03 +01:00
ImreSamu
b173b2acd2 add simple poi_polygon table ; fix #46 2016-11-27 14:04:50 +01:00
ImreSamu
dd2fc0e2dd add etldoc to layer_poi 2016-11-10 13:11:20 +01:00
lukasmartinelli
ae60f637c0 Rename POI gridrank to rank 2016-10-29 11:15:46 +02:00
lukasmartinelli
ab4413e209 Gridrank should be int 2016-10-29 10:57:06 +02:00
lukasmartinelli
f3e2d7f163 Add gridrank attribute 2016-10-28 18:01:31 +02:00
lukasmartinelli
dbec752ed1 Basic poi layer 2016-10-28 17:46:10 +02:00