Skip to content

Commit 078ddcd

Browse files
Cargo fmt
1 parent 6e002dc commit 078ddcd

9 files changed

Lines changed: 24 additions & 28 deletions

File tree

examples/prometheus_track.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use std::thread::{
66
};
77
use std::time::Duration;
88

9+
use axum::Router;
910
use axum::extract::State;
1011
use axum::routing::get;
11-
use axum::Router;
1212
use epoch_db::DB;
1313
use metrics_exporter_prometheus::{
1414
PrometheusBuilder,

src/bin/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use std::path::PathBuf;
44
use std::sync::Arc;
55
use std::time::Duration;
66

7+
use epoch_db::DB;
78
use epoch_db::server::response_handler;
89
use epoch_db::server::utils::init_logger;
9-
use epoch_db::DB;
1010
use tokio::net::TcpListener;
1111
use tokio::spawn;
1212
use tokio::time::sleep;

src/db/iter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use std::str::from_utf8;
33
use std::sync::Arc;
44

55
use crate::{
6-
Metadata,
7-
DB
6+
DB,
7+
Metadata
88
};
99

1010
/// This is an iterator struct that represents the Database main iterator

src/db/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use std::io::{
1414
};
1515
use std::path::Path;
1616
use std::str::from_utf8;
17-
use std::sync::atomic::AtomicBool;
1817
use std::sync::Arc;
18+
use std::sync::atomic::AtomicBool;
1919
use std::thread::{
2020
self,
2121
JoinHandle
@@ -28,12 +28,12 @@ use std::time::{
2828

2929
use chrono::Local;
3030
use errors::TransientError;
31+
use sled::Config;
3132
use sled::transaction::{
3233
ConflictableTransactionError,
3334
TransactionError,
3435
Transactional
3536
};
36-
use sled::Config;
3737
use zip::write::SimpleFileOptions;
3838
use zip::{
3939
ZipArchive,
@@ -42,8 +42,8 @@ use zip::{
4242

4343
use crate::metrics::Metrics;
4444
use crate::{
45-
Metadata,
46-
DB
45+
DB,
46+
Metadata
4747
};
4848

4949
impl DB {

src/db/transaction/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use sled::transaction::{
1616
use crate::db::errors::TransientError;
1717
use crate::db::transaction::metric_handler::GuardMetricChanged;
1818
use crate::{
19-
Metadata,
20-
DB
19+
DB,
20+
Metadata
2121
};
2222

2323
pub mod metric_handler;

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
//! frequency** and **age** as first-class citizens.
1313
1414
use std::path::PathBuf;
15-
use std::sync::atomic::AtomicBool;
1615
use std::sync::Arc;
16+
use std::sync::atomic::AtomicBool;
1717
use std::thread::JoinHandle;
1818

1919
use db::errors::TransientError;

src/server/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ use tokio::io::{
1313
BufReader,
1414
BufWriter
1515
};
16-
use tokio::net::tcp::WriteHalf;
1716
use tokio::net::TcpStream;
17+
use tokio::net::tcp::WriteHalf;
1818
use tracing::{
1919
error,
2020
info,
2121
warn
2222
};
2323

24+
use crate::DB;
2425
use crate::db::errors::TransientError;
2526
use crate::metadata::RespValue;
2627
use crate::server::commands::{
@@ -32,7 +33,6 @@ use crate::server::utils::{
3233
parse_bulk_string,
3334
parse_integer
3435
};
35-
use crate::DB;
3636

3737
pub static CLIENT_COMMAND_SIZE: u64 = 4096;
3838

src/server/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use tokio::io::{
99
};
1010
use tracing::error;
1111
use tracing_subscriber::{
12-
fmt,
13-
EnvFilter
12+
EnvFilter,
13+
fmt
1414
};
1515

1616
use crate::db::errors::TransientError;

tests/server_parser_test.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
use std::io::Cursor;
22

3-
use epoch_db::server::{commands::ParsedResponse, parse_command};
3+
use epoch_db::server::commands::ParsedResponse;
4+
use epoch_db::server::parse_command;
45
use tokio::io::BufReader;
56

6-
mod server_common;
7-
8-
9-
107
#[tokio::test]
11-
async fn valid_command_test () {
12-
/*
13-
* *2\r\n$3\r\nGET\r\n$3\r\nkey\r\n
14-
* *4\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n$4\r\n1000\r\n
15-
* *3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$0\r\n\r\n
16-
*/
8+
async fn valid_command_test() {
9+
/*
10+
* *2\r\n$3\r\nGET\r\n$3\r\nkey\r\n
11+
* *4\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n$4\r\n1000\r\n
12+
* *3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$0\r\n\r\n
13+
*/
1714
let buf = b"*2\r\n$3\r\nGET\r\n$3\r\nkey\r\n";
1815
let c = Cursor::new(buf);
1916

@@ -25,9 +22,8 @@ async fn valid_command_test () {
2522
command: epoch_db::server::commands::Command::Get,
2623
key: Some(Vec::from(b"key")),
2724
value: None,
28-
ttl: None,
25+
ttl: None,
2926
len: 2
3027
}
3128
)
32-
3329
}

0 commit comments

Comments
 (0)