forked from Deuxfleurs/garage
Reorder imports.
Trying to separate: 1. Stuff for handling the swarm of nodes and generic table data replication 2. Stuff for the object store core application: metadata tables and block management 3. Stuff for the S3 API
This commit is contained in:
parent
bd1618e78e
commit
4ba54ccfca
7 changed files with 18 additions and 11 deletions
|
@ -9,14 +9,15 @@ use hyper::server::conn::AddrStream;
|
|||
use hyper::service::{make_service_fn, service_fn};
|
||||
use hyper::{Body, Method, Request, Response, Server, StatusCode};
|
||||
|
||||
use crate::block::INLINE_THRESHOLD;
|
||||
use crate::block_ref_table::*;
|
||||
use crate::data::*;
|
||||
use crate::error::Error;
|
||||
use crate::http_util::*;
|
||||
use crate::table::EmptySortKey;
|
||||
|
||||
use crate::block::INLINE_THRESHOLD;
|
||||
use crate::block_ref_table::*;
|
||||
use crate::object_table::*;
|
||||
use crate::server::Garage;
|
||||
use crate::table::EmptySortKey;
|
||||
use crate::version_table::*;
|
||||
|
||||
type BodyType = Box<dyn HttpBody<Data = Bytes, Error = Error> + Send + Unpin>;
|
||||
|
|
|
@ -16,6 +16,7 @@ use crate::error::Error;
|
|||
use crate::membership::System;
|
||||
use crate::rpc_client::*;
|
||||
use crate::rpc_server::*;
|
||||
|
||||
use crate::server::Garage;
|
||||
|
||||
pub const INLINE_THRESHOLD: usize = 3072;
|
||||
|
|
|
@ -3,10 +3,11 @@ use serde::{Deserialize, Serialize};
|
|||
use std::sync::Arc;
|
||||
|
||||
use crate::background::*;
|
||||
use crate::block::*;
|
||||
use crate::data::*;
|
||||
use crate::table::*;
|
||||
|
||||
use crate::block::*;
|
||||
|
||||
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct BlockRef {
|
||||
// Primary key
|
||||
|
|
|
@ -5,6 +5,7 @@ use std::sync::Arc;
|
|||
use crate::background::BackgroundRunner;
|
||||
use crate::data::*;
|
||||
use crate::table::*;
|
||||
|
||||
use crate::version_table::*;
|
||||
|
||||
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
|
||||
|
|
|
@ -12,12 +12,12 @@ use hyper::client::{Client, HttpConnector};
|
|||
use hyper::{Body, Method, Request, StatusCode};
|
||||
use tokio::sync::watch;
|
||||
|
||||
use crate::background::*;
|
||||
use crate::background::BackgroundRunner;
|
||||
use crate::data::*;
|
||||
use crate::error::Error;
|
||||
use crate::membership::Status;
|
||||
use crate::rpc_server::RpcMessage;
|
||||
use crate::server::*;
|
||||
use crate::server::TlsConfig;
|
||||
use crate::tls_util;
|
||||
|
||||
pub struct RpcClient<M: RpcMessage> {
|
||||
|
|
|
@ -8,18 +8,20 @@ pub use futures_util::future::FutureExt;
|
|||
use serde::Deserialize;
|
||||
use tokio::sync::watch;
|
||||
|
||||
use crate::api_server;
|
||||
use crate::background::*;
|
||||
use crate::block::*;
|
||||
use crate::block_ref_table::*;
|
||||
use crate::data::*;
|
||||
use crate::error::Error;
|
||||
use crate::membership::System;
|
||||
use crate::object_table::*;
|
||||
use crate::rpc_server::RpcServer;
|
||||
use crate::table::*;
|
||||
|
||||
use crate::block::*;
|
||||
use crate::block_ref_table::*;
|
||||
use crate::object_table::*;
|
||||
use crate::version_table::*;
|
||||
|
||||
use crate::api_server;
|
||||
|
||||
pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
|
|
|
@ -3,10 +3,11 @@ use serde::{Deserialize, Serialize};
|
|||
use std::sync::Arc;
|
||||
|
||||
use crate::background::BackgroundRunner;
|
||||
use crate::block_ref_table::*;
|
||||
use crate::data::*;
|
||||
use crate::table::*;
|
||||
|
||||
use crate::block_ref_table::*;
|
||||
|
||||
#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct Version {
|
||||
// Primary key
|
||||
|
|
Loading…
Reference in a new issue