Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 30 additions & 15 deletions src/sagittarius/test_execution_client_impl/result_trim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

use prost::Message;
use tucana::shared::{
Error, ExecutionResult, Value, execution_result, node_execution_result, value::Kind,
Error, ExecutionResult, Value, execution_result, node_execution_result,
node_value_execution_result, value::Kind,
};

/// Placeholder substituted for a plain `Value` that had to be cut (node
Expand Down Expand Up @@ -171,7 +172,9 @@ fn apply_cut(result: &mut ExecutionResult, target: CutTarget) -> Option<usize> {
if let Some(node) = result.node_execution_results.get_mut(node_index)
&& let Some(parameter) = node.parameter_results.get_mut(param_index)
{
parameter.value = Some(marker_value());
parameter.value = Some(node_value_execution_result::Value::RawValue(
marker_value(),
));
}
Some(node_index)
}
Expand Down Expand Up @@ -233,14 +236,20 @@ pub fn trim_execution_result_to_fit(result: &mut ExecutionResult, limit: usize)
#[cfg(test)]
mod tests {
use super::*;
use tucana::shared::{NodeExecutionResult, NodeParameterNodeExecutionResult};
use tucana::shared::{NodeExecutionResult, NodeValueExecutionResult};

fn big_string_value(len: usize) -> Value {
Value {
kind: Some(Kind::StringValue("x".repeat(len))),
}
}

fn node_value(value: Value) -> NodeValueExecutionResult {
NodeValueExecutionResult {
value: Some(node_value_execution_result::Value::RawValue(value)),
}
}

fn node_with_result(result: node_execution_result::Result) -> NodeExecutionResult {
NodeExecutionResult {
started_at: 0,
Expand Down Expand Up @@ -282,15 +291,15 @@ mod tests {
result
.node_execution_results
.push(node_with_result(node_execution_result::Result::Success(
big_string_value(10_000),
node_value(big_string_value(10_000)),
)));
// A second, small node that must stay untouched.
result
.node_execution_results
.push(node_with_result(node_execution_result::Result::Success(
Value {
node_value(Value {
kind: Some(Kind::BoolValue(true)),
},
}),
)));

let cuts = trim_execution_result_to_fit(&mut result, 2048);
Expand All @@ -310,8 +319,10 @@ mod tests {
// Untouched node and the top-level success outcome are preserved.
assert!(matches!(
result.node_execution_results[1].result,
Some(node_execution_result::Result::Success(Value {
kind: Some(Kind::BoolValue(true))
Some(node_execution_result::Result::Success(NodeValueExecutionResult {
value: Some(node_value_execution_result::Value::RawValue(Value {
kind: Some(Kind::BoolValue(true))
}))
}))
));
assert!(matches!(
Expand All @@ -323,11 +334,15 @@ mod tests {
#[test]
fn oversized_parameter_value_becomes_string_marker() {
let mut result = base_result();
let mut node = node_with_result(node_execution_result::Result::Success(Value {
kind: Some(Kind::BoolValue(true)),
}));
node.parameter_results.push(NodeParameterNodeExecutionResult {
value: Some(big_string_value(10_000)),
let mut node = node_with_result(node_execution_result::Result::Success(node_value(
Value {
kind: Some(Kind::BoolValue(true)),
},
)));
node.parameter_results.push(NodeValueExecutionResult {
value: Some(node_value_execution_result::Value::RawValue(
big_string_value(10_000),
)),
});
result.node_execution_results.push(node);

Expand All @@ -337,7 +352,7 @@ mod tests {
assert!(result.encoded_len() <= 2048);
assert_eq!(
result.node_execution_results[0].parameter_results[0].value,
Some(marker_value())
Some(node_value_execution_result::Value::RawValue(marker_value()))
);
}

Expand Down Expand Up @@ -377,7 +392,7 @@ mod tests {
result
.node_execution_results
.push(node_with_result(node_execution_result::Result::Success(
big_string_value(100),
node_value(big_string_value(100)),
)));
}
assert!(result.encoded_len() > 2048);
Expand Down
Loading