<p>Also removes support for superseding ways from polygons. The lua bindings still expect that the supersede table is present but will simply drop it.</p>
<p>Still todo:</p>
<ul class="contains-task-list">
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> recheck that really all old-style MP code is gone</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> adapt example Lua style</li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> fix regression tests</li>
</ul>
<p>I've done some performance tests as this PR moves all way processing to the mono-threaded first computation stage. Test were done on a Hetzner EX41-SSD (i7-7700, 32GB RAM, SSD in Raid0) with command:</p>
<pre><code>./osm2pgsql -d gis --drop -C 10 -s -S ../default.style --flat-nodes gis.flatnodes planet-180625.osm.pbf
</code></pre>
<p>The minimal cache is a bit of a worst case scenario as all node lookups go to the slightly slower flatnode file.</p>
<p>master:</p>
<pre><code>Node stats: total(4581403065), max(5716309124) in 425s
Way stats: total(504094523), max(601431841) in 49995s
Relation stats: total(5899892), max(8406934) in 26409s
Going over pending ways...
357968593 ways are pending
Using 8 helper-processes
Finished processing 357968593 ways in 28948 s
Osm2pgsql took 125689s overall
</code></pre>
<p>This PR:</p>
<pre><code>Node stats: total(4581403065), max(5716309124) in 471s
Way stats: total(504094523), max(601431841) in 71760s
Relation stats: total(5899892), max(8406934) in 25839s
Going over pending ways...
0 ways are pending
Using 8 helper-processes
Finished processing 0 ways in 0 s
Osm2pgsql took 116951s overall
</code></pre>
<p>So this looks fairly promising and it would be ok to go ahead with dropping old-style MPs without improving the first-stage processing first.</p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/openstreetmap/osm2pgsql/pull/862'>https://github.com/openstreetmap/osm2pgsql/pull/862</a></p>
<h4>Commit Summary</h4>
<ul>
<li>remove support for old-style MPs</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-0">geometry-processor.cpp</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-1">geometry-processor.hpp</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-2">output-multi.cpp</a>
(25)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-3">output-pgsql.cpp</a>
(31)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-4">tagtransform-c.cpp</a>
(35)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-5">tagtransform-c.hpp</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-6">tagtransform-lua.cpp</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-7">tagtransform-lua.hpp</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-8">tagtransform.hpp</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-9">tests/test-output-pgsql-tablespace.cpp</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-10">tests/test-output-pgsql-validgeom.cpp</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-11">tests/test-output-pgsql.cpp</a>
(6)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/osm2pgsql/pull/862.patch'>https://github.com/openstreetmap/osm2pgsql/pull/862.patch</a></li>
<li><a href='https://github.com/openstreetmap/osm2pgsql/pull/862.diff'>https://github.com/openstreetmap/osm2pgsql/pull/862.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/osm2pgsql/pull/862">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AD2-7kaEQ04H-dqdDqj4nrGBMo3Z0FA_ks5uPfYxgaJpZM4V40Sw">mute the thread</a>.<img src="https://github.com/notifications/beacon/AD2-7mQ8bN9LaMNaqcVKxX0B_MAI9WAdks5uPfYxgaJpZM4V40Sw.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/osm2pgsql","title":"openstreetmap/osm2pgsql","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/osm2pgsql"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"WIP: remove support for old-style MPs (#862)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/osm2pgsql/pull/862"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/osm2pgsql/pull/862",
"url": "https://github.com/openstreetmap/osm2pgsql/pull/862",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "WIP: remove support for old-style MPs (#862)",
"sections": [
{
"text": "",
"activityTitle": "**Sarah Hoffmann**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@lonvia",
"facts": [
]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "76b7d2c",
"value": "remove support for old-style MPs"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Modified",
"value": "[geometry-processor.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-0) (3 changes)"
},
{
"name": "Modified",
"value": "[geometry-processor.hpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-1) (1 changes)"
},
{
"name": "Modified",
"value": "[output-multi.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-2) (25 changes)"
},
{
"name": "Modified",
"value": "[output-pgsql.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-3) (31 changes)"
},
{
"name": "Modified",
"value": "[tagtransform-c.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-4) (35 changes)"
},
{
"name": "Modified",
"value": "[tagtransform-c.hpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-5) (6 changes)"
},
{
"name": "Modified",
"value": "[tagtransform-lua.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-6) (17 changes)"
},
{
"name": "Modified",
"value": "[tagtransform-lua.hpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-7) (6 changes)"
},
{
"name": "Modified",
"value": "[tagtransform.hpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-8) (1 changes)"
},
{
"name": "Modified",
"value": "[tests/test-output-pgsql-tablespace.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-9) (2 changes)"
},
{
"name": "Modified",
"value": "[tests/test-output-pgsql-validgeom.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-10) (2 changes)"
},
{
"name": "Modified",
"value": "[tests/test-output-pgsql.cpp](https://github.com/openstreetmap/osm2pgsql/pull/862/files#diff-11) (6 changes)"
}
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"openstreetmap/osm2pgsql\",\n\"issueId\": 862,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"openstreetmap/osm2pgsql\",\n\"pullRequestId\": 862\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/osm2pgsql/pull/862"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/osm2pgsql/pull/862.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/osm2pgsql/pull/862.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 367215792\n}"
}
],
"themeColor": "26292E"
}
]</script>