extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-12 05:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run-time pipeline input type checking performance optimizations (#15192)

Browse Source 
# Description

Avoids cloning custom command signatures during run-time pipeline input
type checking

# User-Facing Changes

N/A

# Tests + Formatting

N/A
This commit is contained in:
132ikl 2025-02-27 08:29:25 -05:00 committed by GitHub
parent 96af27fb4c
commit 78c93e5ae0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-engine/src/eval_ir.rs
View File

@ -1023,8 +1023,6 @@ fn eval_call<D: DebugContext>(
let args_len = caller_stack.arguments.get_len(*args_base); let args_len = caller_stack.arguments.get_len(*args_base);
let decl = engine_state.get_decl(decl_id); let decl = engine_state.get_decl(decl_id);
check_input_types(&input, decl.signature(), head)?;
// Set up redirect modes // Set up redirect modes
let mut caller_stack = caller_stack.push_redirection(redirect_out.take(), redirect_err.take()); let mut caller_stack = caller_stack.push_redirection(redirect_out.take(), redirect_err.take());
@ -1034,6 +1032,9 @@ fn eval_call<D: DebugContext>(
// If the decl is a custom command // If the decl is a custom command
let block = engine_state.get_block(block_id); let block = engine_state.get_block(block_id);
// check types after acquiring block to avoid unnecessarily cloning Signature
check_input_types(&input, &block.signature, head)?;
// Set up a callee stack with the captures and move arguments from the stack into variables // Set up a callee stack with the captures and move arguments from the stack into variables
let mut callee_stack = caller_stack.gather_captures(engine_state, &block.captures); let mut callee_stack = caller_stack.gather_captures(engine_state, &block.captures);
@ -1058,6 +1059,8 @@ fn eval_call<D: DebugContext>(
redirect_env(engine_state, &mut caller_stack, &callee_stack); redirect_env(engine_state, &mut caller_stack, &callee_stack);
} }
} else { } else {
check_input_types(&input, &decl.signature(), head)?;
// FIXME: precalculate this and save it somewhere // FIXME: precalculate this and save it somewhere
let span = Span::merge_many( let span = Span::merge_many(
std::iter::once(head).chain( std::iter::once(head).chain(
@ -1277,10 +1280,10 @@ fn check_type(val: &Value, ty: &Type) -> Result<(), ShellError> {
/// Type check pipeline input against command's input types /// Type check pipeline input against command's input types
fn check_input_types( fn check_input_types(
input: &PipelineData, input: &PipelineData,
signature: Signature, signature: &Signature,
head: Span, head: Span,
) -> Result<(), ShellError> { ) -> Result<(), ShellError> {
let io_types = signature.input_output_types; let io_types = &signature.input_output_types;
// If a command doesn't have any input/output types, then treat command input type as any // If a command doesn't have any input/output types, then treat command input type as any
if io_types.is_empty() { if io_types.is_empty() {