From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: location@lists.ipfire.org Subject: [PATCH 3/3] importer: Purge any redundant entries Date: Sun, 06 Sep 2020 09:49:10 +0000 Message-ID: <42f16516-2006-5d9e-be61-9134a6fb443a@ipfire.org> In-Reply-To: <9e67c95c-cbbd-bda6-0d26-befe24dfa70a@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3140922594903774483==" List-Id: --===============3140922594903774483== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit When importing inetnums, we might import various small networks which are not relevant for us as long as they do not have a different country code than their parent network. Therefore we delete all these entries to keep the database smaller without losing any information. Signed-off-by: Peter Müller --- src/python/location-importer.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/python/location-importer.in b/src/python/location-importer.in index fbc402f..ea72790 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -375,6 +375,13 @@ class CLI(object): SELECT _autnums.number, _organizations.name FROM _autnums JOIN _organizations ON _autnums.organization = _organizations.handle ON CONFLICT (number) DO UPDATE SET name = excluded.name; + + --- Purge any redundant entries + DELETE FROM networks candidates WHERE EXISTS ( + SELECT FROM networks + WHERE networks.network >> candidates.network + AND networks.country = candidates.country + ); """) # Download all extended sources -- 2.20.1 --===============3140922594903774483==--