Skip to content

src: simplify legacy resolve functionality #48648

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

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

src: simplify legacy resolve functionality #48648

wants to merge 3 commits into from

Conversation

anonrig
Copy link
Member

@anonrig anonrig commented Jul 3, 2023 •
edited
Loading

Changes and their reasonings:

  • Added DCHECK_NOT_NULL to avoid passing nullptr
  • Replaced env->isolate()->ThrowException with their respective MACROs THROW_ERR_INVALID_URL_SCHEME etc.
  • Removed the usage of NOLINT and used pointers to conform the cpp contributing guidelines.
  • Reduced the number of branches/if statements in for loops to improve performance
  • Added fast paths for percent character findings to avoid unnecessary iterations
  • Moved legacy_main_extensions to header file for readability purposes, made it constexpr to evaluate it in the compile time.
  • Removed unnecessary url->get_pathname() calls which are more costly than url->has_empty_hostname()

cc @H4ad

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. fs Issues and PRs related to the fs subsystem / file system. needs-ci PRs that need a full CI run. labels Jul 3, 2023
@anonrig anonrig force-pushed the refactor-legacy-resolve branch from 3c1be57 to b3f8342 Compare July 3, 2023 20:54
H4ad
H4ad reviewed Jul 3, 2023
View reviewed changes
@anonrig anonrig force-pushed the refactor-legacy-resolve branch 6 times, most recently from 13c8363 to d3cb3e1 Compare July 4, 2023 02:24
RaisinTen
RaisinTen reviewed Jul 4, 2023
View reviewed changes
@anonrig anonrig force-pushed the refactor-legacy-resolve branch from d3cb3e1 to fe9109b Compare July 4, 2023 21:27
@anonrig anonrig requested a review from RaisinTen July 4, 2023 21:27
@anonrig anonrig added the request-ci Add this label to start a Jenkins CI on a PR. label Jul 5, 2023
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jul 5, 2023
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52608/

@github-actions github-actions bot mentioned this pull request Jul 6, 2023
Open
17 tasks
@RaisinTen
Copy link
Member

@anonrig since this change is a list of general improvements, what do you think about briefly describing the changes in the description and the reasoning behind those? For example:

  • DCHECK_NOT_NULL additions to avoid passing nullptrs where nullptrs are not expected
  • env->isolate()->ThrowException(ERR_INVALID_URL_SCHEME(env->isolate())); -> THROW_ERR_INVALID_URL_SCHEME(env) because ...
  • etc.?

I think that would make it easier to review this PR because that way I would know what to expect and then check the diff instead of inferring things from the diff directly.

@anonrig
Copy link
Member Author

anonrig commented Jul 6, 2023

@RaisinTen you're absolutely right. I updated the pull request description. Appreciate your feedback.

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52638/

@anonrig anonrig requested a review from aduh95 July 6, 2023 20:49
@anonrig
Copy link
Member Author

anonrig commented Jul 6, 2023

cc @nodejs/loaders @nodejs/modules

@github-actions github-actions bot mentioned this pull request Jul 7, 2023
Open
20 tasks
RaisinTen
RaisinTen reviewed Jul 7, 2023
View reviewed changes
This was referenced Jul 8, 2023
Open
Open
@anonrig anonrig requested a review from RaisinTen July 9, 2023 03:10
@anonrig anonrig added the review wanted PRs that need reviews. label Jul 9, 2023
@anonrig
Copy link
Member Author

anonrig commented Jul 9, 2023

cc @nodejs/cpp-reviewers

@anonrig anonrig added the request-ci Add this label to start a Jenkins CI on a PR. label Jul 9, 2023
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jul 9, 2023
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52676/

@github-actions github-actions bot mentioned this pull request Jul 10, 2023
Open
17 tasks
RaisinTen
RaisinTen approved these changes Jul 10, 2023
View reviewed changes
Copy link
Member

@RaisinTen RaisinTen left a comment

Choose a reason for hiding this comment

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

LGTM

src/node_file.cc
THROW_ERR_INVALID_FILE_URL_HOST(
env,
"File URL host must be \"localhost\" or empty on %s",
std::string(per_process::metadata.platform));
Copy link
Member

Choose a reason for hiding this comment

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

is the std::string() part needed here?

Suggested change
std::string(per_process::metadata.platform));
per_process::metadata.platform);

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52736/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52744/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52775/

This was referenced Jul 16, 2023
Open
Open
Open
Open
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/52841/

@anonrig anonrig closed this Oct 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@H4ad H4ad H4ad left review comments

@RaisinTen RaisinTen RaisinTen approved these changes

@aduh95 aduh95 Awaiting requested review from aduh95

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. fs Issues and PRs related to the fs subsystem / file system. needs-ci PRs that need a full CI run. review wanted PRs that need reviews.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@anonrig @nodejs-github-bot @RaisinTen @H4ad