From d4104b007bc24bdfcee70a6ccf0ad7b44b488c98 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Wed, 13 Dec 2023 16:08:30 +0100 Subject: [PATCH 1/2] fix: edit items in place when stripping prefixes, do not use regex --- app/Console/Commands/RebuildQueryserviceData.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/RebuildQueryserviceData.php b/app/Console/Commands/RebuildQueryserviceData.php index 96ad9b000..1334767d0 100644 --- a/app/Console/Commands/RebuildQueryserviceData.php +++ b/app/Console/Commands/RebuildQueryserviceData.php @@ -92,7 +92,8 @@ private function getEntitiesForWiki (Wiki $wiki): array : []; $merged = array_merge($items, $properties, $lexemes); - return $this->stripPrefixes($merged); + $this->stripPrefixes($merged); + return $merged; } private function getSparqlUrl (Wiki $wiki): string @@ -154,10 +155,11 @@ private function fetchPagesInNamespace(string $wikiDomain, int $namespace): arra return $titles; } - private static function stripPrefixes (array $items): array + private static function stripPrefixes (array &$items): void { - return array_map(function (string $item) { - return preg_replace('/^[a-zA-Z]+:/', '', $item); - }, $items); + foreach ($items as &$item) { + $e = explode(':', $item); + $item = end($e); + } } } From 221fd33fcc5ecb87a2832bf890211160987cbc0f Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Wed, 13 Dec 2023 16:18:02 +0100 Subject: [PATCH 2/2] docs: add changelog --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 725b5de0b..521cfaeb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ # api -## 8x.28.11 - 12 December 2023 -- Batches that are done shall never be marked failed +## 8x.29.1 - 13 December 2023 +- Try to fix memory exhaustion issue when running wbs-qs:rebuild command ## 8x.29.0 - 13 December 2023 - Add command for rebuilding Queryservice data +## 8x.28.11 - 12 December 2023 +- Batches that are done shall never be marked failed + ## 8x.28.10 - 29 November 2023 - Requeueing should not select failed batches