Skip to content

Commit 018fc81

Browse files
KolleidaKolleida
committed
Cargo fmt and clippy.
1 parent 3bca6c3 commit 018fc81

10 files changed

Lines changed: 146 additions & 102 deletions

File tree

‎asap-common/dependencies/rs/asap_types/src/inference_config.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ use crate::aggregation_reference::AggregationReference;
88
use crate::enums::{CleanupPolicy, QueryLanguage};
99
use crate::promql_schema::PromQLSchema;
1010
use crate::query_config::QueryConfig;
11+
use elastic_dsl_utilities::{ElasticIndexSchema, ElasticMappingSchema};
1112
use promql_utilities::data_model::KeyByLabelNames;
1213
use sql_utilities::sqlhelper::{SQLSchema, Table};
13-
use elastic_dsl_utilities::{ElasticIndexSchema, ElasticMappingSchema};
1414

1515
/// Schema configuration that can be either PromQL or SQL format
1616
#[derive(Debug, Clone)]
@@ -182,7 +182,9 @@ impl InferenceConfig {
182182
let metric_columns: HashSet<String> = index_data
183183
.get("metric_columns")
184184
.and_then(|v| v.as_sequence())
185-
.ok_or_else(|| anyhow::anyhow!("Missing metric_columns field in elastic index {name}"))?
185+
.ok_or_else(|| {
186+
anyhow::anyhow!("Missing metric_columns field in elastic index {name}")
187+
})?
186188
.iter()
187189
.filter_map(|v| v.as_str())
188190
.map(|s| s.to_string())
@@ -191,7 +193,9 @@ impl InferenceConfig {
191193
let metadata_columns: HashSet<String> = index_data
192194
.get("metadata_columns")
193195
.and_then(|v| v.as_sequence())
194-
.ok_or_else(|| anyhow::anyhow!("Missing metadata_columns field in elastic index {name}"))?
196+
.ok_or_else(|| {
197+
anyhow::anyhow!("Missing metadata_columns field in elastic index {name}")
198+
})?
195199
.iter()
196200
.filter_map(|v| v.as_str())
197201
.map(|s| s.to_string())

‎asap-common/dependencies/rs/elastic_dsl_utilities/src/lib.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pub use helpers::*;
88

99
use std::collections::{HashMap, HashSet};
1010

11-
1211
#[derive(Debug, Clone)]
1312
pub struct ElasticIndexSchema {
1413
pub time_field: String,
@@ -58,7 +57,9 @@ impl ElasticMappingSchema {
5857
}
5958

6059
pub fn get_metadata_columns(&self, index: &str) -> Option<&HashSet<String>> {
61-
self.config.get(index).map(|schema| &schema.metadata_columns)
60+
self.config
61+
.get(index)
62+
.map(|schema| &schema.metadata_columns)
6263
}
6364

6465
pub fn is_valid_metric_column(&self, index: &str, metric_column: &str) -> bool {
@@ -72,4 +73,4 @@ impl ElasticMappingSchema {
7273
.map(|schema_columns| columns.iter().all(|c| schema_columns.contains(c)))
7374
.unwrap_or(false)
7475
}
75-
}
76+
}

‎asap-planner-rs/src/elastic_dsl/controller.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
use std::path::Path;
32

43
use crate::config::input::ElasticDSLControllerConfig;
4+
use crate::elastic_dsl::generator::{generate_elastic_plan, ElasticRuntimeOptions};
55
use crate::error::ControllerError;
66
use crate::planner_output::PlannerOutput;
7-
use crate::elastic_dsl::generator::{ElasticRuntimeOptions, generate_elastic_plan};
87

98
pub struct ElasticController {
109
config: ElasticDSLControllerConfig,
@@ -43,4 +42,4 @@ impl ElasticController {
4342
std::fs::write(dir.join("inference_config.yaml"), inference_str)?;
4443
Ok(output)
4544
}
46-
}
45+
}

‎asap-planner-rs/src/elastic_dsl/generator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ use crate::generator::{
1010
build_aggregation_entry, build_queries_yaml, GeneratorOutput, KEY_AGGREGATIONS,
1111
KEY_CLEANUP_POLICY, KEY_NAME, KEY_QUERIES,
1212
};
13-
use elastic_dsl_utilities::ast_parsing::{extract_query_info, GroupBySpec, Predicate};
1413
use crate::planner::agg_config::IntermediateAggConfig;
1514
use crate::planner::elastic_dsl::ElasticSingleQueryProcessor;
1615
use crate::StreamingEngine;
16+
use elastic_dsl_utilities::ast_parsing::{extract_query_info, GroupBySpec, Predicate};
1717

1818
#[derive(Default)]
1919
struct ElasticIndexSchemaBuilder {

‎asap-planner-rs/src/elastic_dsl/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
pub mod controller;
22
pub mod generator;
33
pub use controller::ElasticController;
4-
pub use generator::ElasticRuntimeOptions;
4+
pub use generator::ElasticRuntimeOptions;

‎asap-planner-rs/src/lib.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pub mod config;
2+
pub mod elastic_dsl;
23
pub mod error;
34
pub mod generator;
45
pub mod planner;
@@ -7,21 +8,20 @@ pub mod prometheus_client;
78
pub mod promql;
89
pub mod query_log;
910
pub mod sql;
10-
pub mod elastic_dsl;
1111

1212
pub use asap_types::PromQLSchema;
1313
pub use config::input::ControllerConfig;
14-
pub use config::input::SQLControllerConfig;
1514
pub use config::input::ElasticDSLControllerConfig;
15+
pub use config::input::SQLControllerConfig;
16+
pub use elastic_dsl::ElasticController;
17+
pub use elastic_dsl::ElasticRuntimeOptions;
1618
pub use error::ControllerError;
1719
pub use generator::{GeneratorOutput, PuntedQuery};
1820
pub use planner_output::PlannerOutput;
1921
pub use prometheus_client::build_schema_from_prometheus;
2022
pub use promql::Controller;
2123
pub use sql::SQLController;
2224
pub use sql::SQLRuntimeOptions;
23-
pub use elastic_dsl::ElasticController;
24-
pub use elastic_dsl::ElasticRuntimeOptions;
2525

2626
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
2727
pub enum StreamingEngine {

‎asap-planner-rs/src/main.rs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use asap_planner::{Controller, RuntimeOptions, SQLController, SQLRuntimeOptions, ElasticController, ElasticRuntimeOptions, StreamingEngine};
1+
use asap_planner::{
2+
Controller, ElasticController, ElasticRuntimeOptions, RuntimeOptions, SQLController,
3+
SQLRuntimeOptions, StreamingEngine,
4+
};
25
use asap_types::enums::QueryLanguage;
36
use clap::Parser;
47
use std::path::PathBuf;
@@ -129,9 +132,9 @@ fn main() -> anyhow::Result<()> {
129132
let interval = args.data_ingestion_interval.ok_or_else(|| {
130133
anyhow::anyhow!("--data-ingestion-interval is required for Elasticsearch DSL mode")
131134
})?;
132-
let config_path = args
133-
.input_config
134-
.ok_or_else(|| anyhow::anyhow!("--input_config is required for Elasticsearch DSL mode"))?;
135+
let config_path = args.input_config.ok_or_else(|| {
136+
anyhow::anyhow!("--input_config is required for Elasticsearch DSL mode")
137+
})?;
135138
let opts = ElasticRuntimeOptions {
136139
streaming_engine: engine,
137140
data_ingestion_interval: interval,

‎asap-planner-rs/src/planner/elastic_dsl.rs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use promql_utilities::query_logics::enums::{AggregationType, QueryTreatmentType,
77

88
use crate::config::input::SketchParameterOverrides;
99
use crate::error::ControllerError;
10-
use crate::planner::sketch::build_sketch_parameters;
11-
use crate::planner::window::IntermediateWindowConfig;
1210
use crate::planner::agg_config::{build_agg_configs_for_statistics, IntermediateAggConfig};
1311
use crate::planner::cleanup::get_sql_cleanup_param;
12+
use crate::planner::sketch::build_sketch_parameters;
13+
use crate::planner::window::IntermediateWindowConfig;
1414
use crate::StreamingEngine;
1515

1616
pub struct ElasticSingleQueryProcessor {
@@ -126,7 +126,10 @@ fn get_elastic_statistics(
126126
match agg_type {
127127
ElasticAggregationType::Avg => {
128128
// AVG requires SUM and COUNT
129-
Ok((QueryTreatmentType::Exact, vec![Statistic::Sum, Statistic::Count]))
129+
Ok((
130+
QueryTreatmentType::Exact,
131+
vec![Statistic::Sum, Statistic::Count],
132+
))
130133
}
131134
ElasticAggregationType::Sum => Ok((QueryTreatmentType::Approximate, vec![Statistic::Sum])),
132135
ElasticAggregationType::Min => Ok((QueryTreatmentType::Exact, vec![Statistic::Min])),
@@ -145,7 +148,9 @@ fn get_elastic_statistics(
145148
}
146149

147150
/// Extract field names from group by specification
148-
fn get_group_by_fields(bucket_spec: &elastic_dsl_utilities::ast_parsing::GroupBySpec) -> Vec<String> {
151+
fn get_group_by_fields(
152+
bucket_spec: &elastic_dsl_utilities::ast_parsing::GroupBySpec,
153+
) -> Vec<String> {
149154
use elastic_dsl_utilities::ast_parsing::GroupBySpec;
150155
match bucket_spec {
151156
GroupBySpec::Fields(fields) => fields.clone(),

‎asap-planner-rs/src/planner/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
pub mod agg_config;
22
pub mod cleanup;
3+
pub mod elastic_dsl;
34
pub mod labels;
45
pub mod patterns;
56
pub mod promql;
67
pub mod sketch;
78
pub mod sql;
89
pub mod window;
9-
pub mod elastic_dsl;
1010
pub use agg_config::*;
1111
pub use promql::*;

0 commit comments

Comments
 (0)