mirror
/
openmaptiles
kopia lustrzana https://github.com/openmaptiles/openmaptiles
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
1 310 Commity
8 Gałęzie
21 Tagi
85 MiB
Wykres commitów

25 Commity (master)

Autor SHA1 Wiadomość Data
Frédéric Rodrigo 9bb17792a6
Remove alignment of AS in SQL and few others (#932) 
* Remove alignment of AS in SQL

* Remove alignment of CREATE TABLE in SQL
 2020-07-22 13:48:25 +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
jirik 8d591a59aa Wrap place UNIONs into one SELECT to sppeed up rendering 2018-11-30 15:32:26 +01:00
stirringhalo d166baf2d2 Increase city density 2017-06-16 21:55:08 -04: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
jirik 4c6d30066d Add German names (name_de), unify English names (name_en) 2017-03-17 12:56:54 +01:00
ImreSamu e406537025 `place` etldoc enhancement 2016-12-04 12:09:10 +01:00
Lukas Martinelli 3fd28778cc Merge branch 'master' into feature/changed-place-layer 
Conflicts:
	layers/place/mapping.yaml
 2016-12-01 09:57:58 +00:00
Lukas Martinelli ac51c742e7 Show all cities earlier before z7 2016-11-30 17:03:55 +00:00
Lukas Martinelli 3f5b1371e9 Clarify etldoc for place layer 2016-11-30 16:19:58 +00:00
Lukas Martinelli 6fb20ab650 Include country and state select direcdtly in layer func 2016-11-28 16:03:42 +00:00
Lukas Martinelli 2f35ab3ee1 Use classes from ClearTables and add continents 2016-11-28 15:43:03 +00:00
ImreSamu b0c762cd2b simplified etldoc for layer_place 2016-11-10 03:23:52 +01:00
ImreSamu 7d7ca7f47a add etldoc to layer_place 2016-11-10 03:09:43 +01:00
lukasmartinelli 99c225d9a4 Show much more places earlier 2016-10-30 15:41:46 +01:00
lukasmartinelli 67be896e0a Fallback to name for name_en 2016-10-30 10:44:21 +01:00
lukasmartinelli 28a87c9e81 Incorporate grid rank into city rank 2016-10-29 14:49:53 +02:00
lukasmartinelli 52e133e126 Tweak place ranks 2016-10-29 14:29:41 +02:00
lukasmartinelli d9d3b96dc7 Refactor layer code to use OSM 2016-10-29 10:56:58 +02:00
lukasmartinelli dccdbdfbcc Try to use OSM source data for countries and states 2016-10-28 15:05:49 +02:00
lukasmartinelli ab80b2212e Use custom enum type 2016-10-28 13:21:08 +02:00
lukasmartinelli 0df15c613e Merge scalerank into osm for high zoom levels 2016-10-28 13:07:42 +02:00
lukasmartinelli 38dcc030b0 Refactor place layer 2016-10-28 12:05:18 +02:00