From 0d9945624c2630b32956f496aa89426e2e95fada Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Mon, 3 Jul 2023 10:55:35 +0900 Subject: [PATCH] Mini refactor checklist->quickwit-cli Rationale: - checklist is only used by quickwit-cli. - checklist pulls the colored dependency. --- quickwit/Cargo.lock | 2 +- quickwit/quickwit-cli/Cargo.toml | 1 + quickwit/{quickwit-common => quickwit-cli}/src/checklist.rs | 0 quickwit/quickwit-cli/src/index.rs | 2 +- quickwit/quickwit-cli/src/lib.rs | 4 +++- quickwit/quickwit-cli/src/main.rs | 2 +- quickwit/quickwit-cli/src/source.rs | 2 +- quickwit/quickwit-cli/src/split.rs | 2 +- quickwit/quickwit-cli/src/tool.rs | 2 +- quickwit/quickwit-cli/tests/cli.rs | 2 +- quickwit/quickwit-common/Cargo.toml | 1 - quickwit/quickwit-common/src/lib.rs | 4 ---- 12 files changed, 11 insertions(+), 13 deletions(-) rename quickwit/{quickwit-common => quickwit-cli}/src/checklist.rs (100%) diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 73b39756faf..93010781044 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -4414,6 +4414,7 @@ dependencies = [ "serde_json", "tabled", "tempfile", + "thiserror", "thousands", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -4499,7 +4500,6 @@ dependencies = [ "async-speed-limit", "async-trait", "byte-unit", - "colored", "dyn-clone", "env_logger", "futures", diff --git a/quickwit/quickwit-cli/Cargo.toml b/quickwit/quickwit-cli/Cargo.toml index f7f4a3854bb..efc03fffaa7 100644 --- a/quickwit/quickwit-cli/Cargo.toml +++ b/quickwit/quickwit-cli/Cargo.toml @@ -43,6 +43,7 @@ reqwest = { workspace = true } serde_json = { workspace = true } tabled = { workspace = true } tempfile = { workspace = true } +thiserror = { workspace = true } thousands = { workspace = true } tikv-jemalloc-ctl = { workspace = true, optional = true } tikv-jemallocator = { workspace = true, optional = true } diff --git a/quickwit/quickwit-common/src/checklist.rs b/quickwit/quickwit-cli/src/checklist.rs similarity index 100% rename from quickwit/quickwit-common/src/checklist.rs rename to quickwit/quickwit-cli/src/checklist.rs diff --git a/quickwit/quickwit-cli/src/index.rs b/quickwit/quickwit-cli/src/index.rs index 9d2d3980ffe..a7c940a3877 100644 --- a/quickwit/quickwit-cli/src/index.rs +++ b/quickwit/quickwit-cli/src/index.rs @@ -35,7 +35,6 @@ use indicatif::{ProgressBar, ProgressStyle}; use itertools::Itertools; use quickwit_actors::{ActorHandle, ObservationType}; use quickwit_common::uri::Uri; -use quickwit_common::GREEN_COLOR; use quickwit_config::{ConfigFormat, IndexConfig}; use quickwit_indexing::models::IndexingStatistics; use quickwit_indexing::IndexingPipeline; @@ -51,6 +50,7 @@ use tabled::{Alignment, Concat, Format, Modify, Panel, Rotate, Style, Table, Tab use thousands::Separable; use tracing::{debug, Level}; +use crate::checklist::GREEN_COLOR; use crate::stats::{mean, percentile, std_deviation}; use crate::{client_args, make_table, prompt_confirmation, ClientArgs, THROUGHPUT_WINDOW_SIZE}; diff --git a/quickwit/quickwit-cli/src/lib.rs b/quickwit/quickwit-cli/src/lib.rs index 87a0c087964..46b8fbde4a8 100644 --- a/quickwit/quickwit-cli/src/lib.rs +++ b/quickwit/quickwit-cli/src/lib.rs @@ -28,7 +28,6 @@ use clap::{arg, Arg, ArgMatches}; use dialoguer::theme::ColorfulTheme; use dialoguer::Confirm; use once_cell::sync::Lazy; -use quickwit_common::run_checklist; use quickwit_common::runtimes::RuntimesConfig; use quickwit_common::uri::Uri; use quickwit_config::service::QuickwitService; @@ -47,6 +46,9 @@ use tabled::object::Rows; use tabled::{Alignment, Header, Modify, Style, Table, Tabled}; use tracing::info; +use crate::checklist::run_checklist; + +pub mod checklist; pub mod cli; pub mod index; #[cfg(feature = "jemalloc")] diff --git a/quickwit/quickwit-cli/src/main.rs b/quickwit/quickwit-cli/src/main.rs index d2d9dfd5d7c..68856484433 100644 --- a/quickwit/quickwit-cli/src/main.rs +++ b/quickwit/quickwit-cli/src/main.rs @@ -25,13 +25,13 @@ use opentelemetry::sdk::propagation::TraceContextPropagator; use opentelemetry::sdk::{trace, Resource}; use opentelemetry::{global, KeyValue}; use opentelemetry_otlp::WithExportConfig; +use quickwit_cli::checklist::RED_COLOR; use quickwit_cli::cli::{build_cli, CliCommand}; #[cfg(feature = "jemalloc")] use quickwit_cli::jemalloc::start_jemalloc_metrics_loop; use quickwit_cli::{ busy_detector, QW_ENABLE_JAEGER_EXPORTER_ENV_KEY, QW_ENABLE_OPENTELEMETRY_OTLP_EXPORTER_ENV_KEY, }; -use quickwit_common::RED_COLOR; use quickwit_serve::BuildInfo; use tracing::Level; use tracing_subscriber::fmt::time::UtcTime; diff --git a/quickwit/quickwit-cli/src/source.rs b/quickwit/quickwit-cli/src/source.rs index b19e621fc47..826f38a2a5a 100644 --- a/quickwit/quickwit-cli/src/source.rs +++ b/quickwit/quickwit-cli/src/source.rs @@ -25,7 +25,6 @@ use clap::{arg, ArgMatches, Command}; use colored::Colorize; use itertools::Itertools; use quickwit_common::uri::Uri; -use quickwit_common::GREEN_COLOR; use quickwit_config::{validate_identifier, ConfigFormat, SourceConfig}; use quickwit_metastore::checkpoint::SourceCheckpoint; use quickwit_storage::{load_file, StorageResolver}; @@ -33,6 +32,7 @@ use serde_json::Value as JsonValue; use tabled::{Table, Tabled}; use tracing::debug; +use crate::checklist::GREEN_COLOR; use crate::{client_args, make_table, prompt_confirmation, ClientArgs}; pub fn build_source_command() -> Command { diff --git a/quickwit/quickwit-cli/src/split.rs b/quickwit/quickwit-cli/src/split.rs index 8dbdfa17b04..4098f4242ab 100644 --- a/quickwit/quickwit-cli/src/split.rs +++ b/quickwit/quickwit-cli/src/split.rs @@ -23,13 +23,13 @@ use anyhow::{bail, Context}; use clap::{arg, ArgMatches, Command}; use colored::Colorize; use itertools::Itertools; -use quickwit_common::GREEN_COLOR; use quickwit_metastore::{Split, SplitState}; use quickwit_serve::ListSplitsQueryParams; use tabled::{Table, Tabled}; use time::{format_description, Date, OffsetDateTime, PrimitiveDateTime}; use tracing::debug; +use crate::checklist::GREEN_COLOR; use crate::{client_args, make_table, prompt_confirmation, ClientArgs}; pub fn build_split_command() -> Command { diff --git a/quickwit/quickwit-cli/src/tool.rs b/quickwit/quickwit-cli/src/tool.rs index 0af62c653d8..a98c8cf65e9 100644 --- a/quickwit/quickwit-cli/src/tool.rs +++ b/quickwit/quickwit-cli/src/tool.rs @@ -35,7 +35,6 @@ use quickwit_actors::{ActorExitStatus, ActorHandle, ObservationType, Universe}; use quickwit_cluster::{Cluster, ClusterMember}; use quickwit_common::runtimes::RuntimesConfig; use quickwit_common::uri::Uri; -use quickwit_common::{GREEN_COLOR, RED_COLOR}; use quickwit_config::service::QuickwitService; use quickwit_config::{ IndexerConfig, QuickwitConfig, SourceConfig, SourceInputFormat, SourceParams, TransformConfig, @@ -51,6 +50,7 @@ use quickwit_storage::{BundleStorage, Storage}; use thousands::Separable; use tracing::{debug, info}; +use crate::checklist::{GREEN_COLOR, RED_COLOR}; use crate::{ config_cli_arg, get_resolvers, load_node_config, parse_duration_with_unit, run_index_checklist, start_actor_runtimes, THROUGHPUT_WINDOW_SIZE, diff --git a/quickwit/quickwit-cli/tests/cli.rs b/quickwit/quickwit-cli/tests/cli.rs index 4e345bbfc3b..8915540f846 100644 --- a/quickwit/quickwit-cli/tests/cli.rs +++ b/quickwit/quickwit-cli/tests/cli.rs @@ -27,6 +27,7 @@ use std::str::FromStr; use anyhow::Result; use clap::error::ErrorKind; use helpers::{TestEnv, TestStorageType}; +use quickwit_cli::checklist::ChecklistError; use quickwit_cli::cli::build_cli; use quickwit_cli::index::{ create_index_cli, delete_index_cli, search_index, CreateIndexArgs, DeleteIndexArgs, @@ -39,7 +40,6 @@ use quickwit_cli::ClientArgs; use quickwit_common::fs::get_cache_directory_path; use quickwit_common::rand::append_random_suffix; use quickwit_common::uri::Uri; -use quickwit_common::ChecklistError; use quickwit_config::{SourceInputFormat, CLI_INGEST_SOURCE_ID}; use quickwit_metastore::{MetastoreError, MetastoreResolver, SplitState}; use serde_json::{json, Number, Value}; diff --git a/quickwit/quickwit-common/Cargo.toml b/quickwit/quickwit-common/Cargo.toml index d73b9b2483e..036129c7b1b 100644 --- a/quickwit/quickwit-common/Cargo.toml +++ b/quickwit/quickwit-common/Cargo.toml @@ -14,7 +14,6 @@ anyhow = { workspace = true } async-speed-limit = { workspace = true } async-trait = { workspace = true } byte-unit = { workspace = true } -colored = { workspace = true } dyn-clone = { workspace = true } env_logger = { workspace = true } futures = { workspace = true } diff --git a/quickwit/quickwit-common/src/lib.rs b/quickwit/quickwit-common/src/lib.rs index 1c3d83f2f31..9ee3d285aa8 100644 --- a/quickwit/quickwit-common/src/lib.rs +++ b/quickwit/quickwit-common/src/lib.rs @@ -19,7 +19,6 @@ #![deny(clippy::disallowed_methods)] -mod checklist; mod coolid; pub mod binary_heap; @@ -49,9 +48,6 @@ use std::fmt::Debug; use std::ops::{Range, RangeInclusive}; use std::str::FromStr; -pub use checklist::{ - print_checklist, run_checklist, ChecklistError, BLUE_COLOR, GREEN_COLOR, RED_COLOR, -}; pub use coolid::new_coolid; pub use file_entry::FileEntry; pub use kill_switch::KillSwitch;