Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bzip2 to lbzip2 migration to use all CPU cores #173

Merged
merged 6 commits into from
Mar 7, 2020
Merged

bzip2 to lbzip2 migration to use all CPU cores #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
584eb67
bzip2 to lbzip2 migration to use all CPU cores
loadit1 Feb 25, 2020
6d949eb
fix(CI): use Geocode Earth CDN
missinglink Feb 25, 2020
e8f48b0
bzip2 to lbzip2 migration to use all CPU cores
loadit1 Feb 25, 2020
585d260
Merge branch 'lbzip2' of https://github.com/loadit1/placeholder into …
loadit1 Feb 25, 2020
776c5c0
Update download_extract.sh
loadit1 Feb 25, 2020
fa22288
Update Dockerfile
loadit1 Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ matrix:
fast_finish: true
script: npm run travis
env:
- BUCKET=https://storage.googleapis.com/pelias-data.geocode.earth/placeholder
- BUCKET=https://data.geocode.earth/placeholder/2019-01-28
before_install:
- npm i -g npm
before_script:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM pelias/baseimage

# downloader apt dependencies
# note: this is done in one command in order to keep down the size of intermediate containers
RUN apt-get update && apt-get install -y build-essential python jq && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y build-essential python jq lbzip2 parallel && rm -rf /var/lib/apt/lists/*

# change working dir
ENV WORKDIR /code/pelias/placeholder
Expand Down
6 changes: 5 additions & 1 deletion cmd/download_extract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ PLACETYPES=( 'neighbourhood' 'macrohood' 'borough' 'locality' 'localadmin' 'coun
# download and extract fields from contents of tar
function extract {
curl -so "/tmp/wof-${1}-latest-bundle.tar.bz2" "https://whosonfirst.mapzen.com/bundles/wof-${1}-latest-bundle.tar.bz2"
tar --wildcards '*.geojson' -jx --to-command 'jq -cMf "${DIR}/jq.filter"' -f "/tmp/wof-${1}-latest-bundle.tar.bz2"
if hash lbzip2 2>/dev/null; then
tar --wildcards '*.geojson' -x --use-compress-program=lbzip2 --to-command 'jq -cMf "${DIR}/jq.filter"' -f "/tmp/wof-${1}-latest-bundle.tar.bz2"
else
tar --wildcards '*.geojson' -jx --to-command 'jq -cMf "${DIR}/jq.filter"' -f "/tmp/wof-${1}-latest-bundle.tar.bz2"
fi
rc=$?; if [[ $rc != 0 ]]; then
>&2 echo "/tmp/wof-${1}-latest-bundle.tar.bz2"
>&2 echo "command exited with status: $rc"
Expand Down