perf(rspack_core): replace `HASH_PLACEHOLDER_REGEX` with simple string parsing by shulaoda · Pull Request #7907 · web-infra-dev/rspack

shulaoda · 2024-09-15T13:05:04Z

Summary

I plan to convert all the regular expressions into string lookup, because these regular expressions are very simple and do not require regex.

rspack/crates/rspack_core/src/options/filename.rs

Lines 19 to 38 in a06f078

    
           pub static FILE_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[file\]").expect("Should generate regex")); 
        
           pub static BASE_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[base\]").expect("Should generate regex")); 
        
           pub static NAME_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[name\]").expect("Should generate regex")); 
        
           pub static PATH_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[path\]").expect("Should generate regex")); 
        
           pub static EXT_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[ext\]").expect("Should generate regex")); 
        
           pub static QUERY_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[query\]").expect("Should generate regex")); 
        
           pub static FRAGMENT_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[fragment\]").expect("Should generate regex")); 
        
           pub static ID_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[id\]").expect("Should generate regex")); 
        
           pub static RUNTIME_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[runtime\]").expect("Should generate regex")); 
        
           pub static URL_PLACEHOLDER: LazyLock<Regex> = 
        
             LazyLock::new(|| Regex::new(r"\[url\]").expect("Should generate regex"));

Checklist

Tests updated (or not required).
Documentation updated (or not required).

netlify · 2024-09-15T13:05:20Z

✅ Deploy Preview for rspack canceled.

Built without sensitive environment variables

Name	Link
🔨 Latest commit	`a06f078`
🔍 Latest deploy log	https://app.netlify.com/sites/rspack/deploys/670640b86100ef0008c9cd22

chenjiahan · 2024-10-08T13:03:14Z

@shulaoda can you resolve the conflicts? ❤️

…parsing

h-a-n-a · 2024-10-10T09:12:34Z

Wasn't the issue in the description had been resolved? I think this is necessary.

I'm not sure if the hash pattern appears only once. If there are cases where the pattern appears multiple times, such as [hash]-[hash:6].js, I need to optimize further.

let result = replace_all_hash_pattern("hello-[hash]-[hash:5].js", "[hash]", |n| {
    &"abcdefgh"[..n.unwrap_or(8)]
  });
 assert_eq!(result, Some("hello-abcdefgh-abcde.js".to_string()));

shulaoda · 2024-10-10T09:23:33Z

Wasn't the issue in the description had been resolved? I think this is necessary.

Sorry. This is a PR from a long time ago, and I fixed the issues in the description later. I have revised the description.

github-actions bot added the release: performance release: performance related release(mr only) label Sep 15, 2024

shulaoda marked this pull request as draft September 15, 2024 14:22

shulaoda marked this pull request as ready for review September 16, 2024 05:51

chenjiahan requested a review from h-a-n-a October 8, 2024 13:02

shulaoda marked this pull request as draft October 8, 2024 13:05

shulaoda force-pushed the perf/hash-placeholder-to-simple-string-parse branch from f5a5e21 to a429391 Compare October 8, 2024 23:06

shulaoda marked this pull request as ready for review October 8, 2024 23:23

shulaoda added 7 commits October 9, 2024 16:37

perf(rspack_core): replace HASH_PLACEHOLDER_REGEX with simple string …

ef2e472

…parsing

feat: add replace_all_hash_pattern

ba31e45

refactor: replace_all_hash_pattern

15e7f84

improve

9f3f15d

fix

19bf743

improve

b9dab7a

solve conflicts

a06f078

shulaoda force-pushed the perf/hash-placeholder-to-simple-string-parse branch from 5bd31c7 to a06f078 Compare October 9, 2024 08:37

h-a-n-a approved these changes Oct 14, 2024

View reviewed changes

h-a-n-a merged commit 233e811 into web-infra-dev:main Oct 14, 2024

shulaoda deleted the perf/hash-placeholder-to-simple-string-parse branch October 14, 2024 04:39

shulaoda mentioned this pull request Oct 14, 2024

feat(rspack_core): use simple string parsing instead of regex #8113

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

perf(rspack_core): replace `HASH_PLACEHOLDER_REGEX` with simple string parsing#7907

perf(rspack_core): replace `HASH_PLACEHOLDER_REGEX` with simple string parsing#7907
h-a-n-a merged 7 commits intoweb-infra-dev:mainfrom
shulaoda:perf/hash-placeholder-to-simple-string-parse

shulaoda commented Sep 15, 2024 •

edited

Loading

Uh oh!

netlify bot commented Sep 15, 2024 •

edited

Loading

Uh oh!

chenjiahan commented Oct 8, 2024

Uh oh!

h-a-n-a commented Oct 10, 2024 •

edited

Loading

Uh oh!

shulaoda commented Oct 10, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	pub static FILE_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[file\]").expect("Should generate regex"));
	pub static BASE_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[base\]").expect("Should generate regex"));
	pub static NAME_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[name\]").expect("Should generate regex"));
	pub static PATH_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[path\]").expect("Should generate regex"));
	pub static EXT_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[ext\]").expect("Should generate regex"));
	pub static QUERY_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[query\]").expect("Should generate regex"));
	pub static FRAGMENT_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[fragment\]").expect("Should generate regex"));
	pub static ID_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[id\]").expect("Should generate regex"));
	pub static RUNTIME_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[runtime\]").expect("Should generate regex"));
	pub static URL_PLACEHOLDER: LazyLock<Regex> =
	LazyLock::new(\|\| Regex::new(r"\[url\]").expect("Should generate regex"));

Uh oh!

Conversation

shulaoda commented Sep 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

netlify bot commented Sep 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for rspack canceled.

Uh oh!

chenjiahan commented Oct 8, 2024

Uh oh!

h-a-n-a commented Oct 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shulaoda commented Oct 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

shulaoda commented Sep 15, 2024 •

edited

Loading

netlify bot commented Sep 15, 2024 •

edited

Loading

h-a-n-a commented Oct 10, 2024 •

edited

Loading

shulaoda commented Oct 10, 2024 •

edited

Loading