jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "Add regex cache in string matcher"

Browse source 
This reverts commit 6c6e36a89e.
This commit is contained in:
Paul Carroll 2025-08-20 08:51:28 -04:00
parent 6c6e36a89e
commit c6e717c957
1 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cockatrice/src/game/filters/filter_string.cpp
View file

@ -4,16 +4,10 @@
#include <QByteArray> #include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QHash>
#include <QMutex>
#include <QRegularExpression> #include <QRegularExpression>
#include <QString> #include <QString>
#include <functional> #include <functional>
// Static cache for compiled regexes to avoid recompilation
static QHash<QString, QRegularExpression> regexCache;
static QMutex regexCacheMutex;
static peg::parser search(R"( static peg::parser search(R"(
Start <- QueryPartList Start <- QueryPartList
~ws <- [ ]+ ~ws <- [ ]+
@ -195,24 +189,10 @@ static void setupParserRules()
}; };
search["StringValue"] = [](const peg::SemanticValues &sv) -> StringMatcher { search["StringValue"] = [](const peg::SemanticValues &sv) -> StringMatcher {
// Helper function for word boundary matching with caching // Helper function for word boundary matching
auto createWordBoundaryMatcher = [](const QString &target) -> std::function<bool(const QString &)> { auto createWordBoundaryMatcher = [](const QString &target) {
QString pattern = QString("\\b%1\\b").arg(QRegularExpression::escape(target)); QString pattern = QString("\\b%1\\b").arg(QRegularExpression::escape(target));
// Check cache first with thread safety
QMutexLocker locker(&regexCacheMutex);
auto it = regexCache.find(pattern);
if (it != regexCache.end()) {
QRegularExpression cachedRegex = it.value();
locker.unlock();
return [cachedRegex](const QString &s) { return cachedRegex.match(s).hasMatch(); };
}
// Compile new regex and add to cache
QRegularExpression regex(pattern, QRegularExpression::CaseInsensitiveOption); QRegularExpression regex(pattern, QRegularExpression::CaseInsensitiveOption);
regexCache.insert(pattern, regex);
locker.unlock();
return [regex](const QString &s) { return regex.match(s).hasMatch(); }; return [regex](const QString &s) { return regex.match(s).hasMatch(); };
}; };