Skip to content

Commit 203bfe7

Browse files
KSDaemonKSDaemon
committed
cargo fmt
1 parent 2b1d272 commit 203bfe7

File tree

2 files changed

+77
-85
lines changed

2 files changed

+77
-85
lines changed

‎packages/cubejs-backend-native/src/node_export.rs

+73-83
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ use futures::StreamExt;
99
use serde_json::Map;
1010
use tokio::sync::Semaphore;
1111

12-
use std::net::SocketAddr;
13-
use std::rc::Rc;
14-
use std::str::FromStr;
15-
use std::sync::Arc;
1612
use crate::auth::{NativeAuthContext, NodeBridgeAuthService};
1713
use crate::channel::call_js_fn;
1814
use crate::config::{NodeConfiguration, NodeConfigurationFactoryOptions, NodeCubeServices};
@@ -30,6 +26,10 @@ use cubenativeutils::wrappers::serializer::NativeDeserialize;
3026
use cubenativeutils::wrappers::NativeContextHolder;
3127
use cubesqlplanner::cube_bridge::base_query_options::NativeBaseQueryOptions;
3228
use cubesqlplanner::planner::base_query::BaseQuery;
29+
use std::net::SocketAddr;
30+
use std::rc::Rc;
31+
use std::str::FromStr;
32+
use std::sync::Arc;
3333

3434
use cubeorchestrator::cubestore_message_parser::CubeStoreResult;
3535

@@ -520,11 +520,9 @@ fn parse_cubestore_ws_result_message(mut cx: FunctionContext) -> JsResult<JsProm
520520

521521
let promise = cx
522522
.task(move || CubeStoreResult::new(&msg_data))
523-
.promise(move |mut cx, res| {
524-
match res {
525-
Ok(result) => Ok(cx.boxed(Arc::new(result))),
526-
Err(err) => cx.throw_error(err.to_string()),
527-
}
523+
.promise(move |mut cx, res| match res {
524+
Ok(result) => Ok(cx.boxed(Arc::new(result))),
525+
Err(err) => cx.throw_error(err.to_string()),
528526
});
529527

530528
Ok(promise)
@@ -589,18 +587,16 @@ fn transform_query_data(mut cx: FunctionContext) -> JsResult<JsPromise> {
589587
Err(err) => Err(anyhow::Error::from(err)),
590588
}
591589
})
592-
.promise(move |mut cx, json_data| {
593-
match json_data {
594-
Ok(json_data) => {
595-
let js_string = cx.string(json_data);
590+
.promise(move |mut cx, json_data| match json_data {
591+
Ok(json_data) => {
592+
let js_string = cx.string(json_data);
596593

597-
let js_result = cx.empty_object();
598-
js_result.set(&mut cx, "result", js_string)?;
594+
let js_result = cx.empty_object();
595+
js_result.set(&mut cx, "result", js_string)?;
599596

600-
Ok(js_result)
601-
}
602-
Err(err) => cx.throw_error(err.to_string()),
597+
Ok(js_result)
603598
}
599+
Err(err) => cx.throw_error(err.to_string()),
604600
});
605601

606602
Ok(promise)
@@ -620,7 +616,8 @@ fn final_cubestore_result(mut cx: FunctionContext) -> JsResult<JsPromise> {
620616
Err(err) => return Err(anyhow::Error::from(err)),
621617
};
622618

623-
let mut result_data = match serde_json::from_str::<RequestResultData>(&result_data_str) {
619+
let mut result_data = match serde_json::from_str::<RequestResultData>(&result_data_str)
620+
{
624621
Ok(data) => data,
625622
Err(err) => return Err(anyhow::Error::from(err)),
626623
};
@@ -636,21 +633,19 @@ fn final_cubestore_result(mut cx: FunctionContext) -> JsResult<JsPromise> {
636633
Err(err) => Err(anyhow::Error::from(err)),
637634
}
638635
})
639-
.promise(move |mut cx, json_string| {
640-
match json_string {
641-
Ok(json_string) => {
642-
let json_bytes = json_string.as_bytes();
643-
644-
let mut js_buffer = cx.array_buffer(json_bytes.len())?;
645-
{
646-
let buffer = js_buffer.as_mut_slice(&mut cx);
647-
buffer.copy_from_slice(json_bytes);
648-
}
649-
650-
Ok(js_buffer)
636+
.promise(move |mut cx, json_string| match json_string {
637+
Ok(json_string) => {
638+
let json_bytes = json_string.as_bytes();
639+
640+
let mut js_buffer = cx.array_buffer(json_bytes.len())?;
641+
{
642+
let buffer = js_buffer.as_mut_slice(&mut cx);
643+
buffer.copy_from_slice(json_bytes);
651644
}
652-
Err(err) => cx.throw_error(err.to_string()),
645+
646+
Ok(js_buffer)
653647
}
648+
Err(err) => cx.throw_error(err.to_string()),
654649
});
655650

656651
Ok(promise)
@@ -672,10 +667,7 @@ fn final_cubestore_result_array(mut cx: FunctionContext) -> JsResult<JsPromise>
672667
let cube_store_results_boxed: Vec<Handle<JsBox<Arc<CubeStoreResult>>>> = cube_store_array
673668
.to_vec(&mut cx)?
674669
.into_iter()
675-
.map(|js_value| {
676-
js_value
677-
.downcast_or_throw::<JsBox<Arc<CubeStoreResult>>, _>(&mut cx)
678-
})
670+
.map(|js_value| js_value.downcast_or_throw::<JsBox<Arc<CubeStoreResult>>, _>(&mut cx))
679671
.collect::<Result<_, _>>()?;
680672
let cube_store_results: Vec<Arc<CubeStoreResult>> = cube_store_results_boxed
681673
.iter()
@@ -697,22 +689,22 @@ fn final_cubestore_result_array(mut cx: FunctionContext) -> JsResult<JsPromise>
697689
.task(move || {
698690
let transform_requests: Vec<TransformDataRequest> = transform_request_strings
699691
.into_iter()
700-
.map(|req_str| {
701-
match serde_json::from_str::<TransformDataRequest>(&req_str) {
692+
.map(
693+
|req_str| match serde_json::from_str::<TransformDataRequest>(&req_str) {
702694
Ok(request) => Ok(request),
703695
Err(err) => Err(anyhow::Error::from(err)),
704-
}
705-
})
696+
},
697+
)
706698
.collect::<Result<_, _>>()?;
707699

708700
let mut request_results: Vec<RequestResultData> = request_result_strings
709701
.into_iter()
710-
.map(|req_str| {
711-
match serde_json::from_str::<RequestResultData>(&req_str) {
702+
.map(
703+
|req_str| match serde_json::from_str::<RequestResultData>(&req_str) {
712704
Ok(request) => Ok(request),
713705
Err(err) => Err(anyhow::Error::from(err)),
714-
}
715-
})
706+
},
707+
)
716708
.collect::<Result<_, _>>()?;
717709

718710
get_final_cubestore_result_array(
@@ -730,21 +722,19 @@ fn final_cubestore_result_array(mut cx: FunctionContext) -> JsResult<JsPromise>
730722
Err(err) => Err(anyhow::Error::from(err)),
731723
}
732724
})
733-
.promise(move |mut cx, json_data| {
734-
match json_data {
735-
Ok(json_data) => {
736-
let json_bytes = json_data.as_bytes();
737-
738-
let mut js_buffer = cx.array_buffer(json_bytes.len())?;
739-
{
740-
let buffer = js_buffer.as_mut_slice(&mut cx);
741-
buffer.copy_from_slice(json_bytes);
742-
}
743-
744-
Ok(js_buffer)
725+
.promise(move |mut cx, json_data| match json_data {
726+
Ok(json_data) => {
727+
let json_bytes = json_data.as_bytes();
728+
729+
let mut js_buffer = cx.array_buffer(json_bytes.len())?;
730+
{
731+
let buffer = js_buffer.as_mut_slice(&mut cx);
732+
buffer.copy_from_slice(json_bytes);
745733
}
746-
Err(err) => cx.throw_error(err.to_string()),
734+
735+
Ok(js_buffer)
747736
}
737+
Err(err) => cx.throw_error(err.to_string()),
748738
});
749739

750740
Ok(promise)
@@ -766,10 +756,7 @@ fn final_cubestore_result_multi(mut cx: FunctionContext) -> JsResult<JsPromise>
766756
let cube_store_results_boxed: Vec<Handle<JsBox<Arc<CubeStoreResult>>>> = cube_store_array
767757
.to_vec(&mut cx)?
768758
.into_iter()
769-
.map(|js_value| {
770-
js_value
771-
.downcast_or_throw::<JsBox<Arc<CubeStoreResult>>, _>(&mut cx)
772-
})
759+
.map(|js_value| js_value.downcast_or_throw::<JsBox<Arc<CubeStoreResult>>, _>(&mut cx))
773760
.collect::<Result<_, _>>()?;
774761
let cube_store_results: Vec<Arc<CubeStoreResult>> = cube_store_results_boxed
775762
.iter()
@@ -782,41 +769,44 @@ fn final_cubestore_result_multi(mut cx: FunctionContext) -> JsResult<JsPromise>
782769
.task(move || {
783770
let transform_requests: Vec<TransformDataRequest> = transform_request_strings
784771
.into_iter()
785-
.map(|req_str| {
786-
match serde_json::from_str::<TransformDataRequest>(&req_str) {
772+
.map(
773+
|req_str| match serde_json::from_str::<TransformDataRequest>(&req_str) {
787774
Ok(request) => Ok(request),
788775
Err(err) => Err(anyhow::Error::from(err)),
789-
}
790-
})
776+
},
777+
)
791778
.collect::<Result<_, _>>()?;
792779

793-
let mut result_data = match serde_json::from_str::<RequestResultDataMulti>(&result_data_str) {
794-
Ok(data) => data,
795-
Err(err) => return Err(anyhow::Error::from(err)),
796-
};
780+
let mut result_data =
781+
match serde_json::from_str::<RequestResultDataMulti>(&result_data_str) {
782+
Ok(data) => data,
783+
Err(err) => return Err(anyhow::Error::from(err)),
784+
};
797785

798-
get_final_cubestore_result_multi(&transform_requests, &cube_store_results, &mut result_data)?;
786+
get_final_cubestore_result_multi(
787+
&transform_requests,
788+
&cube_store_results,
789+
&mut result_data,
790+
)?;
799791

800792
match serde_json::to_string(&result_data) {
801793
Ok(json) => Ok(json),
802794
Err(err) => Err(anyhow::Error::from(err)),
803795
}
804796
})
805-
.promise(move |mut cx, json_data| {
806-
match json_data {
807-
Ok(json_data) => {
808-
let json_bytes = json_data.as_bytes();
809-
810-
let mut js_buffer = cx.array_buffer(json_bytes.len())?;
811-
{
812-
let buffer = js_buffer.as_mut_slice(&mut cx);
813-
buffer.copy_from_slice(json_bytes);
814-
}
815-
816-
Ok(js_buffer)
797+
.promise(move |mut cx, json_data| match json_data {
798+
Ok(json_data) => {
799+
let json_bytes = json_data.as_bytes();
800+
801+
let mut js_buffer = cx.array_buffer(json_bytes.len())?;
802+
{
803+
let buffer = js_buffer.as_mut_slice(&mut cx);
804+
buffer.copy_from_slice(json_bytes);
817805
}
818-
Err(err) => cx.throw_error(err.to_string()),
806+
807+
Ok(js_buffer)
819808
}
809+
Err(err) => cx.throw_error(err.to_string()),
820810
});
821811

822812
Ok(promise)

‎rust/cubeorchestrator/src/cubestore_result_transform.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ use crate::{
1010
use anyhow::{bail, Context, Result};
1111
use chrono::{DateTime, SecondsFormat};
1212
use itertools::multizip;
13-
use std::collections::{HashMap, HashSet};
14-
use std::sync::Arc;
13+
use std::{
14+
collections::{HashMap, HashSet},
15+
sync::Arc,
16+
};
1517

1618
/// Transform specified `value` with specified `type` to the network protocol type.
1719
pub fn transform_value(value: String, type_: &str) -> String {

0 commit comments

Comments
 (0)