Skip to content

Commit

Permalink
Mini refactor checklist->quickwit-cli
Browse files Browse the repository at this point in the history
Rationale:
- checklist is only used by quickwit-cli.
- checklist pulls the colored dependency.
  • Loading branch information
fulmicoton committed Jul 4, 2023
1 parent ae7821f commit 0d99456
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion quickwit/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions quickwit/quickwit-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion quickwit/quickwit-cli/src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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};

Expand Down
4 changes: 3 additions & 1 deletion quickwit/quickwit-cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-cli/src/source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ 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};
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 {
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-cli/src/split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-cli/src/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-cli/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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};
Expand Down
1 change: 0 additions & 1 deletion quickwit/quickwit-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 0 additions & 4 deletions quickwit/quickwit-common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#![deny(clippy::disallowed_methods)]

mod checklist;
mod coolid;

pub mod binary_heap;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0d99456

Please sign in to comment.