Skip to content

fs,path: key glob matcher cache by platform #64571

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
Archkon wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −3
Open

fs,path: key glob matcher cache by platform #64571

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions lib/internal/fs/glob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,15 +936,16 @@ function matchGlobPattern(path, pattern, windows = isWindows) {
validateString(path, 'path');
validateString(pattern, 'pattern');

const cacheKey = `${windows ? 'win32' : 'posix'}:${pattern}`;
let matcher;
if (patternFnCache.has(pattern)) {
matcher = patternFnCache.get(pattern);
if (patternFnCache.has(cacheKey)) {
matcher = patternFnCache.get(cacheKey);
} else {
matcher = createMatcher(pattern, {
kEmptyObject,
platform: windows ? 'win32' : 'posix',
});
patternFnCache.set(pattern, matcher);
patternFnCache.set(cacheKey, matcher);

if (patternFnCache.size >= kGlobPatternCacheLimit) {
patternFnCache.delete(patternFnCache.keys().next().value);
Expand Down
3 changes: 3 additions & 0 deletions test/parallel/test-path-glob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ const globs = {
],
};

// Matchers for the same pattern must not be shared across path platforms.
assert.strictEqual(path.posix.matchesGlob('platform-cache/file', 'platform-cache/**'), true);
assert.strictEqual(path.win32.matchesGlob('platform-cache\\file', 'platform-cache/**'), true);

for (const [platform, platformGlobs] of Object.entries(globs)) {
for (const [pathStr, glob, expected] of platformGlobs) {
Expand Down
Loading