From e12f09ae57d825162daf14a308114dd12c6a38d5 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Mon, 18 May 2020 14:26:51 -0400 Subject: [PATCH] Generate multiple parallelizable SQL files (#839) Generate multiple SQL files to be imported in parallel. The files will respect the cross-layer dependencies, so they can be all ingested at the same time. --- Makefile | 4 ++-- docker-compose.yml | 2 +- quickstart.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7251e91..02dba68 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ help: .PHONY: init-dirs init-dirs: - @mkdir -p build + @mkdir -p build/sql @mkdir -p data @mkdir -p cache @@ -101,7 +101,7 @@ build/mapping.yaml: init-dirs .PHONY: build-sql build-sql: init-dirs - $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-sql openmaptiles.yaml > build/tileset.sql + $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-sql openmaptiles.yaml --dir ./build/sql .PHONY: clean clean: diff --git a/docker-compose.yml b/docker-compose.yml index 1e92f1f..0781496 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: volumes: - .:/tileset - ./data:/import - - ./build:/sql + - ./build/sql:/sql - ./build:/mapping - ./cache:/cache diff --git a/quickstart.sh b/quickstart.sh index 86871c1..a18102e 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -201,7 +201,7 @@ make clean echo " " echo "-------------------------------------------------------------------------------------" -echo "====> : Code generating from the layer definitions ( ./build/mapping.yaml; ./build/tileset.sql )" +echo "====> : Code generating from the layer definitions ( ./build/mapping.yaml; ./build/sql/* )" echo " : The tool source code: https://github.com/openmaptiles/openmaptiles-tools " echo " : But we generate the tm2source, Imposm mappings and SQL functions from the layer definitions! " make all