Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit 9ee1669

Browse files
committed
fmt
1 parent 197cbde commit 9ee1669

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

sqld/src/connection/write_proxy.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,10 @@ pub mod test {
471471
use super::*;
472472
use crate::{
473473
query_result_builder::{test::test_driver, Column, QueryResultBuilderError},
474-
rpc::{proxy::rpc::{query_result::RowResult, ExecuteResults}, streaming_exec::test::random_valid_program_resp},
474+
rpc::{
475+
proxy::rpc::{query_result::RowResult, ExecuteResults},
476+
streaming_exec::test::random_valid_program_resp,
477+
},
475478
};
476479

477480
/// generate an arbitraty rpc value. see build.rs for usage.
@@ -562,6 +565,11 @@ pub mod test {
562565
builder_config: QueryBuilderConfig::default(),
563566
};
564567

565-
remote.execute(Program::seq(&[]), validator).await.unwrap().0.into_ret();
568+
remote
569+
.execute(Program::seq(&[]), validator)
570+
.await
571+
.unwrap()
572+
.0
573+
.into_ret();
566574
}
567575
}

sqld/src/http/user/result_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ impl QueryResultBuilder for JsonHttpPayloadBuilder {
312312
#[cfg(test)]
313313
mod test {
314314

315-
use crate::query_result_builder::test::{random_transition, fsm_builder_driver};
315+
use crate::query_result_builder::test::{fsm_builder_driver, random_transition};
316316

317317
use super::*;
318318

sqld/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,8 @@ where
500500
let proxy_service =
501501
ProxyService::new(namespaces.clone(), None, self.disable_namespaces);
502502
// Garbage collect proxy clients every 30 seconds
503+
// TODO: this will no longer be necessary once client have adopted the streaming proxy
504+
// protocol
503505
self.join_set.spawn({
504506
let clients = proxy_service.clients();
505507
async move {

sqld/src/query_result_builder.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ pub mod test {
715715

716716
trace.push(state);
717717
if state == FsmState::Finish {
718-
break
718+
break;
719719
}
720720

721721
max_steps = max_steps.saturating_sub(1);
@@ -818,7 +818,10 @@ pub mod test {
818818
Ok(())
819819
}
820820

821-
fn step_error(&mut self, _error: crate::error::Error) -> Result<(), QueryResultBuilderError> {
821+
fn step_error(
822+
&mut self,
823+
_error: crate::error::Error,
824+
) -> Result<(), QueryResultBuilderError> {
822825
assert_eq!(self.trace[self.current], FsmState::StepError);
823826
self.current += 1;
824827
Ok(())

sqld/src/rpc/streaming_exec.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,9 @@ pub mod test {
365365
use crate::auth::{Authorized, Permission};
366366
use crate::connection::libsql::LibSqlConnection;
367367
use crate::connection::program::Program;
368-
use crate::query_result_builder::test::{TestBuilder, ValidateTraceBuilder, random_transition, fsm_builder_driver};
368+
use crate::query_result_builder::test::{
369+
fsm_builder_driver, random_transition, TestBuilder, ValidateTraceBuilder,
370+
};
369371
use crate::rpc::proxy::rpc::StreamProgramReq;
370372

371373
use super::*;
@@ -615,6 +617,9 @@ pub mod test {
615617
move || fsm_builder_driver(&trace, builder)
616618
});
617619

618-
(ReceiverStream::new(receiver), ValidateTraceBuilder::new(trace))
620+
(
621+
ReceiverStream::new(receiver),
622+
ValidateTraceBuilder::new(trace),
623+
)
619624
}
620625
}

0 commit comments

Comments
 (0)