Skip to content
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

perf: speed improvements #1441

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

perf: speed improvements #1441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
417c122
feat: first pass at improving speed, mostly for list and current comm…
stephanGarland Jan 15, 2023
009ab6e
feat: added a fast_tr command, did some more grouping of commands whe…
stephanGarland Jan 20, 2023
f410204
fix: using native bash versinfo array to check versions; fixed a bash…
stephanGarland Jan 25, 2023
f585713
feat: changed fast_basename to use REPLY
stephanGarland Jan 25, 2023
0084332
feat: changed fast_tr to use REPLY; eliminated an unnecessary tr call
stephanGarland Jan 25, 2023
3d86e29
feat: minor changes to two functions; added comment for
stephanGarland Jan 25, 2023
1a6d8b9
fix: identified and fixed bug with parse_asdf_version_file that was a…
stephanGarland Feb 10, 2023
08beda0
chore: merge branch 'master' into develop
stephanGarland Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions lib/utils.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,9 @@ parse_asdf_version_file() {

if [ -f "$file_path" ]; then
local version
# this is actually only about 5% faster than the original, despite losing a function call and two pipes
# this is causing multiple failures in tests/utils.bash, despite seeming to work identically
stephanGarland marked this conversation as resolved.
Show resolved Hide resolved
version=$(awk -v plugin_name="$plugin_name" '!/^#/ { gsub(/#.*/,"",$0); gsub(/ +$/,"",$0)} $1 == plugin_name {print $NF}' "$file_path")
#version=$(strip_tool_version_comments "$file_path" | grep "^${plugin_name} " | sed -e "s/^${plugin_name} //")
if [ -n "$version" ]; then
if [[ "$version" == path:* ]]; then
util_resolve_user_path "${version#path:}"
Expand Down Expand Up @@ -663,10 +664,8 @@ plugin_executables() {

is_executable() {
local executable_path=$1
if [[ (-f "$executable_path") && (-x "$executable_path") ]]; then
return 0
fi
return 1
[ -x "$executable_path" ]
return $?
}

plugin_shims() {
Expand Down Expand Up @@ -710,13 +709,10 @@ strip_tool_version_comments() {
local tool_version_path="$1"
# Use sed to strip comments from the tool version file
# Breakdown of sed command:
# This command represents 3 steps, separated by a semi-colon (;), that run on each line.
# This command represents 2 steps, separated by a semi-colon (;), that run on each line.
# 1. Delete line if it starts with any blankspace and a #.
# 2. Find a # and delete it and everything after the #.
# 3. Remove any whitespace from the end of the line.
# 2. Find a # and delete it and everything after the #, and remove trailing whitespace.
# Finally, the command will print the lines that are not empty.
# this is ~2% faster than the original implementation
# by combining steps 2 and 3
sed '/^[[:blank:]]*#/d; s/\s*#.*$//;' "$tool_version_path"
}

Expand Down Expand Up @@ -892,7 +888,9 @@ remove_path_from_path() {
# Output is a new string suitable for assignment to PATH
local PATH=$1
local path=$2
substitute "$PATH" "$path" "" | sed -e "s|::|:|g"
PATH=${PATH//"$path"}
Copy link
Author

Choose a reason for hiding this comment

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

There is an argument to be made for using the substitute call everywhere to make it more easily understandable, but at the very least, here the sed pipe is unnecessary and this can simply be modified twice.

PATH=${PATH//"::"/":"}
printf "%s" $PATH
}

# @description Strings that began with a ~ are always paths. In
Expand Down