From e4dc8c206790d7615e62f1a5deceab426b585c6c Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 25 Jul 2022 08:44:37 -0400 Subject: [PATCH] refactor: rename garbage collector crates for consistency (#5196) * refactor: rename garbage collector crates for consistency * fix: cargo fmt Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .guppy/hakari.toml | 2 +- Cargo.lock | 82 +++++++++---------- Cargo.toml | 4 +- .../Cargo.toml | 2 +- .../src/checker.rs | 0 .../src/deleter.rs | 0 .../src/lib.rs | 4 +- .../src/lister.rs | 0 .../src/server.rs | 0 influxdb_iox/Cargo.toml | 2 +- .../src/commands/run/garbage_collector.rs | 2 +- .../Cargo.toml | 4 +- .../src/lib.rs | 10 +-- 13 files changed, 54 insertions(+), 58 deletions(-) rename {iox_objectstore_garbage_collect => garbage_collector}/Cargo.toml (94%) rename {iox_objectstore_garbage_collect => garbage_collector}/src/checker.rs (100%) rename {iox_objectstore_garbage_collect => garbage_collector}/src/deleter.rs (100%) rename {iox_objectstore_garbage_collect => garbage_collector}/src/lib.rs (98%) rename {iox_objectstore_garbage_collect => garbage_collector}/src/lister.rs (100%) rename {iox_objectstore_garbage_collect => garbage_collector}/src/server.rs (100%) rename {ioxd_objectstore_garbage_collect => ioxd_garbage_collector}/Cargo.toml (79%) rename {ioxd_objectstore_garbage_collect => ioxd_garbage_collector}/src/lib.rs (95%) diff --git a/.guppy/hakari.toml b/.guppy/hakari.toml index 254e6508e3..675708edec 100644 --- a/.guppy/hakari.toml +++ b/.guppy/hakari.toml @@ -35,7 +35,7 @@ workspace-members = [ # The garbage collector uses chrono-english which needlessly # brings in chrono with the default features. This exclusion can # likely be removed if they publish a version without that. - "iox_objectstore_garbage_collect", + "garbage_collector", "mutable_batch_tests", ] third-party = [ diff --git a/Cargo.lock b/Cargo.lock index d0472a0efb..208a9d7a14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1666,6 +1666,29 @@ dependencies = [ "slab", ] +[[package]] +name = "garbage_collector" +version = "0.1.0" +dependencies = [ + "chrono", + "chrono-english", + "clap 3.2.14", + "clap_blocks", + "data_types", + "filetime", + "futures", + "iox_catalog", + "metric", + "object_store", + "observability_deps", + "once_cell", + "parquet_file", + "snafu", + "tempfile", + "tokio", + "uuid 1.1.2", +] + [[package]] name = "generated_types" version = "0.1.0" @@ -2061,8 +2084,8 @@ dependencies = [ "iox_time", "ioxd_common", "ioxd_compactor", + "ioxd_garbage_collector", "ioxd_ingester", - "ioxd_objectstore_garbage_collect", "ioxd_querier", "ioxd_router", "ioxd_test", @@ -2302,29 +2325,6 @@ dependencies = [ "uuid 1.1.2", ] -[[package]] -name = "iox_objectstore_garbage_collect" -version = "0.1.0" -dependencies = [ - "chrono", - "chrono-english", - "clap 3.2.14", - "clap_blocks", - "data_types", - "filetime", - "futures", - "iox_catalog", - "metric", - "object_store", - "observability_deps", - "once_cell", - "parquet_file", - "snafu", - "tempfile", - "tokio", - "uuid 1.1.2", -] - [[package]] name = "iox_query" version = "0.1.0" @@ -2454,6 +2454,23 @@ dependencies = [ "workspace-hack", ] +[[package]] +name = "ioxd_garbage_collector" +version = "0.1.0" +dependencies = [ + "async-trait", + "futures", + "garbage_collector", + "hyper", + "ioxd_common", + "metric", + "observability_deps", + "snafu", + "tokio", + "trace", + "workspace-hack", +] + [[package]] name = "ioxd_ingester" version = "0.1.0" @@ -2474,23 +2491,6 @@ dependencies = [ "write_buffer", ] -[[package]] -name = "ioxd_objectstore_garbage_collect" -version = "0.1.0" -dependencies = [ - "async-trait", - "futures", - "hyper", - "iox_objectstore_garbage_collect", - "ioxd_common", - "metric", - "observability_deps", - "snafu", - "tokio", - "trace", - "workspace-hack", -] - [[package]] name = "ioxd_querier" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index a744e9caae..adb03d7259 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,14 +23,14 @@ members = [ "ingester", "iox_catalog", "iox_data_generator", - "iox_objectstore_garbage_collect", + "garbage_collector", "iox_query", "iox_tests", "iox_time", "ioxd_common", "ioxd_compactor", "ioxd_ingester", - "ioxd_objectstore_garbage_collect", + "ioxd_garbage_collector", "ioxd_querier", "ioxd_router", "ioxd_test", diff --git a/iox_objectstore_garbage_collect/Cargo.toml b/garbage_collector/Cargo.toml similarity index 94% rename from iox_objectstore_garbage_collect/Cargo.toml rename to garbage_collector/Cargo.toml index 55294568fb..2821ca9233 100644 --- a/iox_objectstore_garbage_collect/Cargo.toml +++ b/garbage_collector/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "iox_objectstore_garbage_collect" +name = "garbage_collector" version = "0.1.0" edition = "2021" diff --git a/iox_objectstore_garbage_collect/src/checker.rs b/garbage_collector/src/checker.rs similarity index 100% rename from iox_objectstore_garbage_collect/src/checker.rs rename to garbage_collector/src/checker.rs diff --git a/iox_objectstore_garbage_collect/src/deleter.rs b/garbage_collector/src/deleter.rs similarity index 100% rename from iox_objectstore_garbage_collect/src/deleter.rs rename to garbage_collector/src/deleter.rs diff --git a/iox_objectstore_garbage_collect/src/lib.rs b/garbage_collector/src/lib.rs similarity index 98% rename from iox_objectstore_garbage_collect/src/lib.rs rename to garbage_collector/src/lib.rs index d6f6269db3..bd210dbbd6 100644 --- a/iox_objectstore_garbage_collect/src/lib.rs +++ b/garbage_collector/src/lib.rs @@ -265,9 +265,7 @@ mod tests { let metrics = metric::Registry::default().into(); - cfg.get_catalog("iox_objectstore_garbage_collect", metrics) - .await - .unwrap() + cfg.get_catalog("garbage_collector", metrics).await.unwrap() } struct OldFileSetup { diff --git a/iox_objectstore_garbage_collect/src/lister.rs b/garbage_collector/src/lister.rs similarity index 100% rename from iox_objectstore_garbage_collect/src/lister.rs rename to garbage_collector/src/lister.rs diff --git a/iox_objectstore_garbage_collect/src/server.rs b/garbage_collector/src/server.rs similarity index 100% rename from iox_objectstore_garbage_collect/src/server.rs rename to garbage_collector/src/server.rs diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml index 3f1f721522..93b1c137a0 100644 --- a/influxdb_iox/Cargo.toml +++ b/influxdb_iox/Cargo.toml @@ -18,7 +18,7 @@ iox_catalog = { path = "../iox_catalog" } ioxd_common = { path = "../ioxd_common"} ioxd_compactor = { path = "../ioxd_compactor"} ioxd_ingester = { path = "../ioxd_ingester"} -ioxd_objectstore_garbage_collect = { path = "../ioxd_objectstore_garbage_collect" } +ioxd_garbage_collector = { path = "../ioxd_garbage_collector" } ioxd_querier = { path = "../ioxd_querier"} ioxd_router = { path = "../ioxd_router"} ioxd_test = { path = "../ioxd_test"} diff --git a/influxdb_iox/src/commands/run/garbage_collector.rs b/influxdb_iox/src/commands/run/garbage_collector.rs index 8828bda72f..54e3def582 100644 --- a/influxdb_iox/src/commands/run/garbage_collector.rs +++ b/influxdb_iox/src/commands/run/garbage_collector.rs @@ -6,7 +6,7 @@ use ioxd_common::{ server_type::{CommonServerState, CommonServerStateError}, Service, }; -use ioxd_objectstore_garbage_collect as gc; +use ioxd_garbage_collector as gc; use object_store::DynObjectStore; use object_store_metrics::ObjectStoreMetrics; use observability_deps::tracing::*; diff --git a/ioxd_objectstore_garbage_collect/Cargo.toml b/ioxd_garbage_collector/Cargo.toml similarity index 79% rename from ioxd_objectstore_garbage_collect/Cargo.toml rename to ioxd_garbage_collector/Cargo.toml index b04ecf87b2..58a4bed17a 100644 --- a/ioxd_objectstore_garbage_collect/Cargo.toml +++ b/ioxd_garbage_collector/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ioxd_objectstore_garbage_collect" +name = "ioxd_garbage_collector" version = "0.1.0" edition = "2021" @@ -9,7 +9,7 @@ edition = "2021" async-trait = "0.1" futures = "0.3" hyper = "0.14" -iox_objectstore_garbage_collect = { path = "../iox_objectstore_garbage_collect" } +garbage_collector = { path = "../garbage_collector" } ioxd_common = { path = "../ioxd_common" } metric = { path = "../metric" } observability_deps = { path = "../observability_deps" } diff --git a/ioxd_objectstore_garbage_collect/src/lib.rs b/ioxd_garbage_collector/src/lib.rs similarity index 95% rename from ioxd_objectstore_garbage_collect/src/lib.rs rename to ioxd_garbage_collector/src/lib.rs index 35a1ccd6f9..f4e9eae289 100644 --- a/ioxd_objectstore_garbage_collect/src/lib.rs +++ b/ioxd_garbage_collector/src/lib.rs @@ -20,8 +20,8 @@ use futures::{ future::{BoxFuture, Shared}, prelude::*, }; +use garbage_collector::GarbageCollector; use hyper::{Body, Request, Response}; -use iox_objectstore_garbage_collect::GarbageCollector; use ioxd_common::{ http::error::{HttpApiError, HttpApiErrorCode, HttpApiErrorSource}, rpc::RpcBuilderInput, @@ -35,7 +35,7 @@ use std::{fmt::Debug, sync::Arc, time::Duration}; use tokio::{select, sync::broadcast, task::JoinError, time}; use trace::TraceCollector; -pub use iox_objectstore_garbage_collect::{Config, SubConfig}; +pub use garbage_collector::{Config, SubConfig}; /// The object store garbage collection server pub struct Server { @@ -150,13 +150,11 @@ impl HttpApiErrorSource for HttpNotFound { #[allow(missing_docs)] pub enum Error { #[snafu(display("Could not start the garbage collector"))] - StartGarbageCollector { - source: iox_objectstore_garbage_collect::Error, - }, + StartGarbageCollector { source: garbage_collector::Error }, #[snafu(display("Could not join the garbage collector"))] JoinGarbageCollector { - source: Arc, + source: Arc, }, #[snafu(display("Could not join the garbage collector worker task"))]