Skip to content

Commit 84ae05d

Browse files
goffrieConvex, Inc.
authored andcommitted
Use JsonPackedValue::from_network (#35918)
GitOrigin-RevId: d8d274bc5faba70a360f2e4e6ef422aafe4e7b7d
1 parent 5e0c30e commit 84ae05d

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

crates/udf/src/action_outcome.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ use pb::{
2424
#[cfg(any(test, feature = "testing"))]
2525
use proptest::prelude::*;
2626
use semver::Version;
27-
use serde_json::Value as JsonValue;
28-
use value::{
29-
ConvexValue,
30-
JsonPackedValue,
31-
};
27+
use value::JsonPackedValue;
3228

3329
#[cfg(any(test, feature = "testing"))]
3430
use crate::HttpActionRequest;
@@ -97,9 +93,7 @@ impl ActionOutcome {
9793
let result = result.ok_or_else(|| anyhow::anyhow!("Missing result"))?;
9894
let result = match result.result {
9995
Some(FunctionResultTypeProto::JsonPackedValue(value)) => {
100-
let json: JsonValue = serde_json::from_str(&value)?;
101-
let value = ConvexValue::try_from(json)?;
102-
Ok(JsonPackedValue::pack(value))
96+
Ok(JsonPackedValue::from_network(value)?)
10397
},
10498
Some(FunctionResultTypeProto::JsError(js_error)) => Err(js_error.try_into()?),
10599
None => anyhow::bail!("Missing result"),

crates/udf/src/udf_outcome.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ use proptest::prelude::Arbitrary;
2626
#[cfg(any(test, feature = "testing"))]
2727
use proptest::prelude::Strategy;
2828
use rand::Rng;
29-
use serde_json::Value as JsonValue;
3029
use value::{
3130
heap_size::HeapSize,
32-
ConvexValue,
3331
JsonPackedValue,
3432
};
3533

@@ -223,9 +221,7 @@ impl UdfOutcome {
223221
let result = result.ok_or_else(|| anyhow::anyhow!("Missing result"))?;
224222
let result = match result.result {
225223
Some(FunctionResultTypeProto::JsonPackedValue(value)) => {
226-
let json: JsonValue = serde_json::from_str(&value)?;
227-
let value = ConvexValue::try_from(json)?;
228-
Ok(JsonPackedValue::pack(value))
224+
Ok(JsonPackedValue::from_network(value)?)
229225
},
230226
Some(FunctionResultTypeProto::JsError(js_error)) => Err(js_error.try_into()?),
231227
None => anyhow::bail!("Missing result"),

0 commit comments

Comments
 (0)