refactor: rename `influxdb_ioxd` to `ioxd` (#4162)

* refactor: rename influxdb_ioxd to ioxd * fix: fmt Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-30 09:31:27 -04:00 · 2022-03-30 09:31:27 -04:00 · f2a3dd58b2
parent 20bbb88dc5
commit f2a3dd58b2
22 changed files with 96 additions and 96 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2138,7 +2138,6 @@ dependencies = [
 "humantime",
 "hyper",
 "influxdb_iox_client",
- "influxdb_ioxd",
 "influxdb_line_protocol",
 "influxdb_storage_client",
 "influxrpc_parser",
@ -2147,6 +2146,7 @@ dependencies = [
 "iox_catalog",
 "iox_object_store",
 "iox_tests",
+ "ioxd",
 "ioxd_common",
 "ioxd_database",
 "ioxd_router",
@ -2240,66 +2240,6 @@ dependencies = [
 "uuid",
 ]

-[[package]]
-name = "influxdb_ioxd"
-version = "0.1.0"
-dependencies = [
- "ansi_term",
- "arrow-flight",
- "arrow_util",
- "assert_cmd",
- "async-trait",
- "clap 3.1.6",
- "clap_blocks",
- "compactor",
- "data_types2",
- "dml",
- "futures",
- "generated_types",
- "hashbrown 0.12.0",
- "heappy",
- "http",
- "hyper",
- "ingester",
- "iox_catalog",
- "ioxd_common",
- "metric",
- "metric_exporters",
- "mutable_batch",
- "num_cpus",
- "object_store",
- "observability_deps",
- "panic_logging",
- "pprof 0.7.0",
- "querier",
- "query",
- "router",
- "router2",
- "server",
- "service_common",
- "service_grpc_flight",
- "service_grpc_influxrpc",
- "service_grpc_testing",
- "snafu",
- "tempfile",
- "test_helpers",
- "thiserror",
- "tikv-jemalloc-ctl",
- "tikv-jemalloc-sys",
- "time 0.1.0",
- "tokio",
- "tokio-stream",
- "tokio-util 0.7.1",
- "tonic",
- "tonic-health",
- "tonic-reflection",
- "trace",
- "trace_exporters",
- "trace_http",
- "workspace-hack",
- "write_buffer",
-]
-
 [[package]]
 name = "influxdb_line_protocol"
 version = "0.1.0"
@ -2561,6 +2501,66 @@ dependencies = [
 "workspace-hack",
 ]

+[[package]]
+name = "ioxd"
+version = "0.1.0"
+dependencies = [
+ "ansi_term",
+ "arrow-flight",
+ "arrow_util",
+ "assert_cmd",
+ "async-trait",
+ "clap 3.1.6",
+ "clap_blocks",
+ "compactor",
+ "data_types2",
+ "dml",
+ "futures",
+ "generated_types",
+ "hashbrown 0.12.0",
+ "heappy",
+ "http",
+ "hyper",
+ "ingester",
+ "iox_catalog",
+ "ioxd_common",
+ "metric",
+ "metric_exporters",
+ "mutable_batch",
+ "num_cpus",
+ "object_store",
+ "observability_deps",
+ "panic_logging",
+ "pprof 0.7.0",
+ "querier",
+ "query",
+ "router",
+ "router2",
+ "server",
+ "service_common",
+ "service_grpc_flight",
+ "service_grpc_influxrpc",
+ "service_grpc_testing",
+ "snafu",
+ "tempfile",
+ "test_helpers",
+ "thiserror",
+ "tikv-jemalloc-ctl",
+ "tikv-jemalloc-sys",
+ "time 0.1.0",
+ "tokio",
+ "tokio-stream",
+ "tokio-util 0.7.1",
+ "tonic",
+ "tonic-health",
+ "tonic-reflection",
+ "trace",
+ "trace_exporters",
+ "trace_http",
+ "workspace-hack",
+ "write_buffer",
+]
+
 [[package]]
 name = "ioxd_common"
 version = "0.1.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -17,7 +17,7 @@ members = [
    "grpc-router",
    "grpc-router-test-gen",
    "influxdb_iox",
-    "influxdb_ioxd",
+    "ioxd",
    "influxdb_iox_client",
    "influxdb_line_protocol",
    "influxdb_storage_client",
--- a/influxdb_iox/Cargo.toml
+++ b/influxdb_iox/Cargo.toml
@ -15,7 +15,7 @@ datafusion = { path = "../datafusion" }
 db = { path = "../db" }
 dml = { path = "../dml" }
 generated_types = { path = "../generated_types" }
-influxdb_ioxd = { path = "../influxdb_ioxd", default-features = false }
+ioxd = { path = "../ioxd", default-features = false }
 influxdb_iox_client = { path = "../influxdb_iox_client", features = ["flight", "format", "write_lp"] }
 influxdb_storage_client = { path = "../influxdb_storage_client" }
 influxdb_line_protocol = { path = "../influxdb_line_protocol" }
@ -138,7 +138,7 @@ aws = ["object_store/aws"] # Optional AWS / S3 object store support
 # runtime overhead on all allocations (calls to malloc).
 # Cargo cannot currently implement mutually exclusive features so let's force every build
 # to pick either heappy or jemalloc_replacing_malloc feature at least until we figure out something better.
-jemalloc_replacing_malloc = ["tikv-jemalloc-sys", "tikv-jemalloc-ctl", "influxdb_ioxd/jemalloc_replacing_malloc"]
+jemalloc_replacing_malloc = ["tikv-jemalloc-sys", "tikv-jemalloc-ctl", "ioxd/jemalloc_replacing_malloc"]

 # Implicit feature selected when running under `clippy --all-features` to accept mutable exclusive features during
 # linting
--- a/influxdb_iox/src/commands/run/all_in_one.rs
+++ b/influxdb_iox/src/commands/run/all_in_one.rs
@ -11,7 +11,7 @@ use clap_blocks::{
 };
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};

-use influxdb_ioxd::{
+use ioxd::{
    self,
    server_type::{
        compactor::create_compactor_server_type, ingester::create_ingester_server_type,
@ -43,7 +43,7 @@ pub const DEFAULT_COMPACTOR_GRPC_BIND_ADDR: &str = "127.0.0.1:8084";
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Catalog DSN error: {0}")]
    CatalogDsn(#[from] clap_blocks::catalog_dsn::Error),
@ -55,13 +55,13 @@ pub enum Error {
    ObjectStoreParsing(#[from] clap_blocks::object_store::ParseError),

    #[error("Router2 error: {0}")]
-    Router2(#[from] influxdb_ioxd::server_type::router2::Error),
+    Router2(#[from] ioxd::server_type::router2::Error),

    #[error("Ingester error: {0}")]
-    Ingester(#[from] influxdb_ioxd::server_type::ingester::Error),
+    Ingester(#[from] ioxd::server_type::ingester::Error),

    #[error("error initializing compactor: {0}")]
-    Compactor(#[from] influxdb_ioxd::server_type::compactor::Error),
+    Compactor(#[from] ioxd::server_type::compactor::Error),

    #[error("Invalid config: {0}")]
    InvalidConfig(#[from] CommonServerStateError),
@ -384,5 +384,5 @@ pub async fn command(config: Config) -> Result<()> {
        Service::create_grpc_only(querier, &querier_run_config),
    ];

-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/compactor.rs
+++ b/influxdb_iox/src/commands/run/compactor.rs
@ -10,13 +10,13 @@ use time::SystemProvider;
 use clap_blocks::{
    catalog_dsn::CatalogDsnConfig, compactor::CompactorConfig, run_config::RunConfig,
 };
-use influxdb_ioxd::{self, server_type::compactor::create_compactor_server_type, Service};
+use ioxd::{self, server_type::compactor::create_compactor_server_type, Service};
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};

 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Invalid config: {0}")]
    InvalidConfig(#[from] CommonServerStateError),
@ -31,7 +31,7 @@ pub enum Error {
    ObjectStoreParsing(#[from] clap_blocks::object_store::ParseError),

    #[error("error initializing compactor: {0}")]
-    Compactor(#[from] influxdb_ioxd::server_type::compactor::Error),
+    Compactor(#[from] ioxd::server_type::compactor::Error),
 }

 #[derive(Debug, clap::Parser)]
@ -100,5 +100,5 @@ pub async fn command(config: Config) -> Result<(), Error> {
    info!("starting compactor");

    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/database.rs
+++ b/influxdb_iox/src/commands/run/database.rs
@ -4,7 +4,7 @@ use std::sync::Arc;

 use clap_blocks::run_config::RunConfig;
 use data_types::boolean_flag::BooleanFlag;
-use influxdb_ioxd::{self, Service};
+use ioxd::{self, Service};
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};
 use ioxd_database::{
    setup::{make_application, make_server},
@ -16,7 +16,7 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Cannot setup server: {0}")]
    Setup(#[from] ioxd_database::setup::Error),
@ -128,5 +128,5 @@ pub async fn command(config: Config) -> Result<()> {
    ));

    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/ingester.rs
+++ b/influxdb_iox/src/commands/run/ingester.rs
@ -4,7 +4,7 @@ use clap_blocks::{
    catalog_dsn::CatalogDsnConfig, ingester::IngesterConfig, run_config::RunConfig,
    write_buffer::WriteBufferConfig,
 };
-use influxdb_ioxd::{self, server_type::ingester::create_ingester_server_type, Service};
+use ioxd::{self, server_type::ingester::create_ingester_server_type, Service};
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};
 use object_store::{instrumentation::ObjectStoreMetrics, DynObjectStore, ObjectStoreImpl};
 use observability_deps::tracing::*;
@ -15,7 +15,7 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Invalid config: {0}")]
    InvalidConfig(#[from] CommonServerStateError),
@ -24,7 +24,7 @@ pub enum Error {
    ObjectStoreParsing(#[from] clap_blocks::object_store::ParseError),

    #[error("error initializing ingester: {0}")]
-    Ingester(#[from] influxdb_ioxd::server_type::ingester::Error),
+    Ingester(#[from] ioxd::server_type::ingester::Error),

    #[error("Catalog DSN error: {0}")]
    CatalogDsn(#[from] clap_blocks::catalog_dsn::Error),
@ -98,5 +98,5 @@ pub async fn command(config: Config) -> Result<()> {
    info!("starting ingester");

    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/querier.rs
+++ b/influxdb_iox/src/commands/run/querier.rs
@ -8,13 +8,13 @@ use thiserror::Error;
 use time::SystemProvider;

 use clap_blocks::{catalog_dsn::CatalogDsnConfig, run_config::RunConfig};
-use influxdb_ioxd::{self, server_type::querier::create_querier_server_type, Service};
+use ioxd::{self, server_type::querier::create_querier_server_type, Service};
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};

 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Invalid config: {0}")]
    InvalidConfig(#[from] CommonServerStateError),
@ -92,5 +92,5 @@ pub async fn command(config: Config) -> Result<(), Error> {
    info!("starting querier");

    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/router.rs
+++ b/influxdb_iox/src/commands/run/router.rs
@ -7,7 +7,7 @@ use clap_blocks::run_config::RunConfig;

 use data_types::router::Router as RouterConfig;
 use generated_types::{google::FieldViolation, influxdata::iox::router::v1::RouterConfigFile};
-use influxdb_ioxd::{self, Service};
+use ioxd::{self, Service};
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};
 use ioxd_router::RouterServerType;
 use observability_deps::tracing::warn;
@ -18,7 +18,7 @@ use time::SystemProvider;
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Cannot setup server: {0}")]
    Setup(#[from] ioxd_database::setup::Error),
@ -157,5 +157,5 @@ pub async fn command(config: Config) -> Result<()> {
    ));

    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/router2.rs
+++ b/influxdb_iox/src/commands/run/router2.rs
@ -5,7 +5,7 @@ use std::sync::Arc;
 use clap_blocks::{
    catalog_dsn::CatalogDsnConfig, run_config::RunConfig, write_buffer::WriteBufferConfig,
 };
-use influxdb_ioxd::{self, server_type::router2::create_router2_server_type, Service};
+use ioxd::{self, server_type::router2::create_router2_server_type, Service};
 use ioxd_common::server_type::{CommonServerState, CommonServerStateError};
 use observability_deps::tracing::*;
 use thiserror::Error;
@ -13,13 +13,13 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Invalid config: {0}")]
    InvalidConfig(#[from] CommonServerStateError),

    #[error("Creating router: {0}")]
-    Router(#[from] influxdb_ioxd::server_type::router2::Error),
+    Router(#[from] ioxd::server_type::router2::Error),

    #[error("Catalog DSN error: {0}")]
    CatalogDsn(#[from] clap_blocks::catalog_dsn::Error),
@ -81,5 +81,5 @@ pub async fn command(config: Config) -> Result<()> {

    info!("starting router2");
    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_iox/src/commands/run/test.rs
+++ b/influxdb_iox/src/commands/run/test.rs
@ -3,7 +3,7 @@
 use std::sync::Arc;

 use clap_blocks::run_config::RunConfig;
-use influxdb_ioxd::{
+use ioxd::{
    self,
    server_type::test::{TestAction, TestServerType},
    Service,
@ -15,7 +15,7 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Run: {0}")]
-    Run(#[from] influxdb_ioxd::Error),
+    Run(#[from] ioxd::Error),

    #[error("Invalid config: {0}")]
    InvalidConfig(#[from] CommonServerStateError),
@ -62,5 +62,5 @@ pub async fn command(config: Config) -> Result<()> {
    ));

    let services = vec![Service::create(server_type, common_state.run_config())];
-    Ok(influxdb_ioxd::main(common_state, services).await?)
+    Ok(ioxd::main(common_state, services).await?)
 }
--- a/influxdb_ioxd/Cargo.toml
+++ b/influxdb_ioxd/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "influxdb_ioxd"
+name = "ioxd"
 version = "0.1.0"
 edition = "2021"

--- a/influxdb_ioxd/src/jemalloc.rs
+++ b/influxdb_ioxd/src/jemalloc.rs
--- a/influxdb_ioxd/src/lib.rs
+++ b/influxdb_ioxd/src/lib.rs
--- a/influxdb_ioxd/src/server_type/compactor.rs
+++ b/influxdb_ioxd/src/server_type/compactor.rs
--- a/influxdb_ioxd/src/server_type/ingester.rs
+++ b/influxdb_ioxd/src/server_type/ingester.rs
--- a/influxdb_ioxd/src/server_type/mod.rs
+++ b/influxdb_ioxd/src/server_type/mod.rs
--- a/influxdb_ioxd/src/server_type/querier/mod.rs
+++ b/influxdb_ioxd/src/server_type/querier/mod.rs
--- a/influxdb_ioxd/src/server_type/querier/rpc/mod.rs
+++ b/influxdb_ioxd/src/server_type/querier/rpc/mod.rs
--- a/influxdb_ioxd/src/server_type/querier/rpc/query.rs
+++ b/influxdb_ioxd/src/server_type/querier/rpc/query.rs
--- a/influxdb_ioxd/src/server_type/router2.rs
+++ b/influxdb_ioxd/src/server_type/router2.rs
@ -120,7 +120,7 @@ where
 }

 /// This adaptor converts the `router2` http error type into a type that
-/// satisfies the requirements of influxdb_ioxd's runner framework, keeping the
+/// satisfies the requirements of ioxd's runner framework, keeping the
 /// two decoupled.
 #[derive(Debug)]
 pub struct IoxHttpErrorAdaptor(router2::server::http::Error);
--- a/influxdb_ioxd/src/server_type/test.rs
+++ b/influxdb_ioxd/src/server_type/test.rs