Skip to content

Remove regex from BinaryCacheStore #14933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zaczero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove regex from BinaryCacheStore #14933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions src/libstore/binary-cache-store.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,36 @@
#include "nix/util/signals.hh"
#include "nix/util/archive.hh"

#include <algorithm>
#include <chrono>
#include <future>
#include <regex>
#include <fstream>
#include <sstream>

#include <nlohmann/json.hpp>

namespace nix {

static constexpr bool isLowerHex(char c)
{
return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f');
}

static bool isBuildIdDirName(std::string_view s)
{
// ^[0-9a-f]{2}$
return s.size() == 2 && std::ranges::all_of(s, isLowerHex);
}

static bool isBuildIdDebugFileName(std::string_view s)
{
// ^[0-9a-f]{38}\\.debug$
static constexpr std::string_view suffix = ".debug";

return (s.size() == 38 + suffix.size()) && s.ends_with(suffix)
&& std::all_of(s.begin(), s.begin() + 38, isLowerHex);
}

BinaryCacheStore::BinaryCacheStore(Config & config)
: config{config}
{
Expand Down Expand Up @@ -239,19 +259,16 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
upsertFile(key, json.dump(), "application/json");
};

std::regex regex1("^[0-9a-f]{2}$");
std::regex regex2("^[0-9a-f]{38}\\.debug$");
Copy link
Member

@Mic92 Mic92 Jan 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in any case, those regexes could be potentially be re-used i.e. using static?


for (auto & [s1, _type] : narAccessor->readDirectory(buildIdDir)) {
auto dir = buildIdDir / s1;

if (narAccessor->lstat(dir).type != SourceAccessor::tDirectory || !std::regex_match(s1, regex1))
if (narAccessor->lstat(dir).type != SourceAccessor::tDirectory || !isBuildIdDirName(s1))
continue;

for (auto & [s2, _type] : narAccessor->readDirectory(dir)) {
auto debugPath = dir / s2;

if (narAccessor->lstat(debugPath).type != SourceAccessor::tRegular || !std::regex_match(s2, regex2))
if (narAccessor->lstat(debugPath).type != SourceAccessor::tRegular || !isBuildIdDebugFileName(s2))
continue;

auto buildId = s1 + s2;
Expand Down
Loading