diff --git a/Cargo.lock b/Cargo.lock index e88d968647..baf0fa42b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2169,7 +2169,7 @@ dependencies = [ "ioxd_compactor", "ioxd_ingester", "ioxd_querier", - "ioxd_router2", + "ioxd_router", "ioxd_test", "itertools", "libc", @@ -2671,7 +2671,7 @@ dependencies = [ ] [[package]] -name = "ioxd_router2" +name = "ioxd_router" version = "0.1.0" dependencies = [ "arrow-flight", diff --git a/Cargo.toml b/Cargo.toml index a7eff4051e..07aacdb678 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ members = [ "ioxd_compactor", "ioxd_ingester", "ioxd_querier", - "ioxd_router2", + "ioxd_router", "ioxd_test", "logfmt", "metric", diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml index 5f9f0f8294..58962a1f8b 100644 --- a/influxdb_iox/Cargo.toml +++ b/influxdb_iox/Cargo.toml @@ -22,7 +22,7 @@ iox_catalog = { path = "../iox_catalog" } ioxd_common = { path = "../ioxd_common"} ioxd_compactor = { path = "../ioxd_compactor"} ioxd_ingester = { path = "../ioxd_ingester"} -ioxd_router2 = { path = "../ioxd_router2"} +ioxd_router = { path = "../ioxd_router"} ioxd_querier = { path = "../ioxd_querier"} ioxd_test = { path = "../ioxd_test"} logfmt = { path = "../logfmt" } diff --git a/influxdb_iox/src/commands/run/all_in_one.rs b/influxdb_iox/src/commands/run/all_in_one.rs index 58fca31f2e..e5985e55a6 100644 --- a/influxdb_iox/src/commands/run/all_in_one.rs +++ b/influxdb_iox/src/commands/run/all_in_one.rs @@ -14,7 +14,7 @@ use ioxd_common::{ use ioxd_compactor::create_compactor_server_type; use ioxd_ingester::create_ingester_server_type; use ioxd_querier::create_querier_server_type; -use ioxd_router2::create_router2_server_type; +use ioxd_router::create_router2_server_type; use object_store::{DynObjectStore, ObjectStoreImpl}; use observability_deps::tracing::*; use query::exec::Executor; @@ -56,7 +56,7 @@ pub enum Error { ObjectStoreParsing(#[from] clap_blocks::object_store::ParseError), #[error("Router2 error: {0}")] - Router2(#[from] ioxd_router2::Error), + Router2(#[from] ioxd_router::Error), #[error("Ingester error: {0}")] Ingester(#[from] ioxd_ingester::Error), diff --git a/influxdb_iox/src/commands/run/router2.rs b/influxdb_iox/src/commands/run/router2.rs index 6fc4f63d1e..d94074e8b3 100644 --- a/influxdb_iox/src/commands/run/router2.rs +++ b/influxdb_iox/src/commands/run/router2.rs @@ -1,20 +1,19 @@ //! Implementation of command line option for running router2 -use std::sync::Arc; - +use super::main; use clap_blocks::{ catalog_dsn::CatalogDsnConfig, run_config::RunConfig, write_buffer::WriteBufferConfig, }; - -use ioxd_common::server_type::{CommonServerState, CommonServerStateError}; -use ioxd_common::Service; -use ioxd_router2::create_router2_server_type; +use ioxd_common::{ + server_type::{CommonServerState, CommonServerStateError}, + Service, +}; +use ioxd_router::create_router2_server_type; use object_store::{instrumentation::ObjectStoreMetrics, DynObjectStore, ObjectStoreImpl}; use observability_deps::tracing::*; +use std::sync::Arc; use thiserror::Error; -use super::main; - #[derive(Debug, Error)] pub enum Error { #[error("Run: {0}")] @@ -27,7 +26,7 @@ pub enum Error { ObjectStoreParsing(#[from] clap_blocks::object_store::ParseError), #[error("Creating router: {0}")] - Router(#[from] ioxd_router2::Error), + Router(#[from] ioxd_router::Error), #[error("Catalog DSN error: {0}")] CatalogDsn(#[from] clap_blocks::catalog_dsn::Error), diff --git a/ioxd_router2/Cargo.toml b/ioxd_router/Cargo.toml similarity index 98% rename from ioxd_router2/Cargo.toml rename to ioxd_router/Cargo.toml index dbb1f76b5c..ac69b60836 100644 --- a/ioxd_router2/Cargo.toml +++ b/ioxd_router/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ioxd_router2" +name = "ioxd_router" version = "0.1.0" edition = "2021" diff --git a/ioxd_router2/src/lib.rs b/ioxd_router/src/lib.rs similarity index 100% rename from ioxd_router2/src/lib.rs rename to ioxd_router/src/lib.rs