[Tile-serving] [openstreetmap/osm2pgsql] Hand outputs a shared pointer to the middle query object (#898)

[Sarah Hoffmann]

The great refactoring continues. This PR binds the lifetime of the middle objects to the outputs. As a result it is no longer necessary to keep an explicit reference in osmdata when creating clones for threaded processing.

Once more required some more elaborate refactoring of the tests. There is now a new function `run_osm2pgsql()` that creates middle, output and parses a file.
You can view, comment on, or merge this pull request online at:

  https://github.com/openstreetmap/osm2pgsql/pull/898

-- Commit Summary --

  * Hand outputs a shared pointer to the middle query object
  * osmdata: remove explicit reference to middle

-- File Changes --

    M osm2pgsql.cpp (6)
    M osmdata.cpp (45)
    M output-gazetteer.hpp (36)
    M output-multi.cpp (36)
    M output-multi.hpp (17)
    M output-null.cpp (21)
    M output-null.hpp (10)
    M output-pgsql.cpp (27)
    M output-pgsql.hpp (10)
    M output.cpp (52)
    M output.hpp (17)
    M tests/common.hpp (17)
    M tests/middle-tests.hpp (41)
    M tests/test-hstore-match-only.cpp (9)
    M tests/test-options-parse.cpp (10)
    M tests/test-options-projection.cpp (7)
    M tests/test-output-multi-line-storage.cpp (13)
    M tests/test-output-multi-line.cpp (18)
    M tests/test-output-multi-point-multi-table.cpp (16)
    M tests/test-output-multi-point.cpp (20)
    M tests/test-output-multi-poly-trivial.cpp (17)
    M tests/test-output-multi-polygon.cpp (20)
    M tests/test-output-multi-tags.cpp (13)
    M tests/test-output-pgsql-area.cpp (8)
    M tests/test-output-pgsql-schema.cpp (9)
    M tests/test-output-pgsql-tablespace.cpp (9)
    M tests/test-output-pgsql-validgeom.cpp (9)
    M tests/test-output-pgsql-z_order.cpp (9)
    M tests/test-output-pgsql.cpp (46)
    M tests/test-parse-diff.cpp (6)
    M tests/test-parse-extra-args.cpp (4)
    M tests/test-parse-xml2.cpp (6)

-- Patch Links --

https://github.com/openstreetmap/osm2pgsql/pull/898.patch
https://github.com/openstreetmap/osm2pgsql/pull/898.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/osm2pgsql/pull/898
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/tile-serving/attachments/20190113/a4881b0c/attachment-0001.html>