This PR reverts https://github.com/nushell/nushell/pull/9391 We try not to revert PRs like this, though after discussion with the Nushell team, we decided to revert this one. The main reason is that Nushell, as a codebase, isn't ready for these kinds of optimisations. It's in the part of the development cycle where our main focus should be on improving the algorithms inside of Nushell itself. Once we have matured our algorithms, then we can look for opportunities to switch out technologies we're using for alternate forms. Much of Nushell still has lots of opportunities for tuning the codebase, paying down technical debt, and making the codebase generally cleaner and more robust. This should be the focus. Performance improvements should flow out of that work. Said another, optimisation that isn't part of tuning the codebase is premature at this stage. We need to focus on doing the hard work of making the engine, parser, etc better. # User-Facing Changes Reverts the HashMap -> ahash change. cc @FilipAndersson245
227 lines
6.5 KiB
Rust
227 lines
6.5 KiB
Rust
use std::collections::HashMap;
|
|
|
|
use nu_engine::get_columns;
|
|
use nu_protocol::{ast::PathMember, ListStream, PipelineData, PipelineMetadata, RawStream, Value};
|
|
|
|
use super::NuSpan;
|
|
|
|
pub fn collect_pipeline(input: PipelineData) -> (Vec<String>, Vec<Vec<Value>>) {
|
|
match input {
|
|
PipelineData::Empty => (vec![], vec![]),
|
|
PipelineData::Value(value, ..) => collect_input(value),
|
|
PipelineData::ListStream(stream, ..) => collect_list_stream(stream),
|
|
PipelineData::ExternalStream {
|
|
stdout,
|
|
stderr,
|
|
exit_code,
|
|
metadata,
|
|
span,
|
|
..
|
|
} => collect_external_stream(stdout, stderr, exit_code, metadata.map(|m| *m), span),
|
|
}
|
|
}
|
|
|
|
fn collect_list_stream(mut stream: ListStream) -> (Vec<String>, Vec<Vec<Value>>) {
|
|
let mut records = vec![];
|
|
for item in stream.by_ref() {
|
|
records.push(item);
|
|
}
|
|
|
|
let mut cols = get_columns(&records);
|
|
let data = convert_records_to_dataset(&cols, records);
|
|
|
|
// trying to deal with 'non-standard input'
|
|
if cols.is_empty() && !data.is_empty() {
|
|
let min_column_length = data.iter().map(|row| row.len()).min().unwrap_or(0);
|
|
if min_column_length > 0 {
|
|
cols = (0..min_column_length).map(|i| i.to_string()).collect();
|
|
}
|
|
}
|
|
|
|
(cols, data)
|
|
}
|
|
|
|
fn collect_external_stream(
|
|
stdout: Option<RawStream>,
|
|
stderr: Option<RawStream>,
|
|
exit_code: Option<ListStream>,
|
|
metadata: Option<PipelineMetadata>,
|
|
span: NuSpan,
|
|
) -> (Vec<String>, Vec<Vec<Value>>) {
|
|
let mut columns = vec![];
|
|
let mut data = vec![];
|
|
if let Some(stdout) = stdout {
|
|
let value = stdout.into_string().map_or_else(
|
|
|error| Value::Error {
|
|
error: Box::new(error),
|
|
},
|
|
|string| Value::string(string.item, span),
|
|
);
|
|
|
|
columns.push(String::from("stdout"));
|
|
data.push(value);
|
|
}
|
|
if let Some(stderr) = stderr {
|
|
let value = stderr.into_string().map_or_else(
|
|
|error| Value::Error {
|
|
error: Box::new(error),
|
|
},
|
|
|string| Value::string(string.item, span),
|
|
);
|
|
|
|
columns.push(String::from("stderr"));
|
|
data.push(value);
|
|
}
|
|
if let Some(exit_code) = exit_code {
|
|
let list = exit_code.collect::<Vec<_>>();
|
|
let val = Value::List { vals: list, span };
|
|
|
|
columns.push(String::from("exit_code"));
|
|
data.push(val);
|
|
}
|
|
if metadata.is_some() {
|
|
let val = Value::Record {
|
|
cols: vec![String::from("data_source")],
|
|
vals: vec![Value::String {
|
|
val: String::from("ls"),
|
|
span,
|
|
}],
|
|
span,
|
|
};
|
|
|
|
columns.push(String::from("metadata"));
|
|
data.push(val);
|
|
}
|
|
(columns, vec![data])
|
|
}
|
|
|
|
/// Try to build column names and a table grid.
|
|
pub fn collect_input(value: Value) -> (Vec<String>, Vec<Vec<Value>>) {
|
|
match value {
|
|
Value::Record { cols, vals, .. } => (cols, vec![vals]),
|
|
Value::List { vals, .. } => {
|
|
let mut columns = get_columns(&vals);
|
|
let data = convert_records_to_dataset(&columns, vals);
|
|
|
|
if columns.is_empty() && !data.is_empty() {
|
|
columns = vec![String::from("")];
|
|
}
|
|
|
|
(columns, data)
|
|
}
|
|
Value::String { val, span } => {
|
|
let lines = val
|
|
.lines()
|
|
.map(|line| Value::String {
|
|
val: line.to_string(),
|
|
span,
|
|
})
|
|
.map(|val| vec![val])
|
|
.collect();
|
|
|
|
(vec![String::from("")], lines)
|
|
}
|
|
Value::LazyRecord { val, span } => match val.collect() {
|
|
Ok(value) => collect_input(value),
|
|
Err(_) => (
|
|
vec![String::from("")],
|
|
vec![vec![Value::LazyRecord { val, span }]],
|
|
),
|
|
},
|
|
Value::Nothing { .. } => (vec![], vec![]),
|
|
value => (vec![String::from("")], vec![vec![value]]),
|
|
}
|
|
}
|
|
|
|
fn convert_records_to_dataset(cols: &Vec<String>, records: Vec<Value>) -> Vec<Vec<Value>> {
|
|
if !cols.is_empty() {
|
|
create_table_for_record(cols, &records)
|
|
} else if cols.is_empty() && records.is_empty() {
|
|
vec![]
|
|
} else if cols.len() == records.len() {
|
|
vec![records]
|
|
} else {
|
|
// I am not sure whether it's good to return records as its length LIKELY
|
|
// will not match columns, which makes no sense......
|
|
//
|
|
// BUT...
|
|
// we can represent it as a list; which we do
|
|
|
|
records.into_iter().map(|record| vec![record]).collect()
|
|
}
|
|
}
|
|
|
|
fn create_table_for_record(headers: &[String], items: &[Value]) -> Vec<Vec<Value>> {
|
|
let mut data = vec![Vec::new(); items.len()];
|
|
|
|
for (i, item) in items.iter().enumerate() {
|
|
let row = record_create_row(headers, item);
|
|
data[i] = row;
|
|
}
|
|
|
|
data
|
|
}
|
|
|
|
fn record_create_row(headers: &[String], item: &Value) -> Vec<Value> {
|
|
let mut rows = vec![Value::default(); headers.len()];
|
|
|
|
for (i, header) in headers.iter().enumerate() {
|
|
let value = record_lookup_value(item, header);
|
|
rows[i] = value;
|
|
}
|
|
|
|
rows
|
|
}
|
|
|
|
fn record_lookup_value(item: &Value, header: &str) -> Value {
|
|
match item {
|
|
Value::Record { .. } => {
|
|
let path = PathMember::String {
|
|
val: header.to_owned(),
|
|
span: NuSpan::unknown(),
|
|
optional: false,
|
|
};
|
|
|
|
item.clone()
|
|
.follow_cell_path(&[path], false)
|
|
.unwrap_or_else(|_| unknown_error_value())
|
|
}
|
|
item => item.clone(),
|
|
}
|
|
}
|
|
|
|
pub fn create_map(value: &Value) -> Option<HashMap<String, Value>> {
|
|
let (cols, inner_vals) = value.as_record().ok()?;
|
|
|
|
let mut hm: HashMap<String, Value> = HashMap::new();
|
|
for (k, v) in cols.iter().zip(inner_vals) {
|
|
hm.insert(k.to_string(), v.clone());
|
|
}
|
|
|
|
Some(hm)
|
|
}
|
|
|
|
pub fn map_into_value(hm: HashMap<String, Value>) -> Value {
|
|
let mut columns = Vec::with_capacity(hm.len());
|
|
let mut values = Vec::with_capacity(hm.len());
|
|
|
|
for (key, value) in hm {
|
|
columns.push(key);
|
|
values.push(value);
|
|
}
|
|
|
|
Value::Record {
|
|
cols: columns,
|
|
vals: values,
|
|
span: NuSpan::unknown(),
|
|
}
|
|
}
|
|
|
|
pub fn nu_str<S: AsRef<str>>(s: S) -> Value {
|
|
Value::string(s.as_ref().to_owned(), NuSpan::unknown())
|
|
}
|
|
|
|
fn unknown_error_value() -> Value {
|
|
Value::string(String::from("❎"), NuSpan::unknown())
|
|
}
|