rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-03 20:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: avoid unnecessary alloc by using unwrap_or_else (#3742)

Browse Source 
feat(promql): address post-merge CR
This commit is contained in:
Eugene Tolbakov
2024-04-19 02:31:25 +01:00
committed by GitHub
parent 314f2704d4
commit 2114b153e7
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/operator/src/statement/tql.rs
View File

@@ -37,7 +37,9 @@ impl StatementExecutor {
end: eval.end,
step: eval.step,
query: eval.query,
lookback: eval.lookback.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string()),
lookback: eval
.lookback
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string()),
};
QueryLanguageParser::parse_promql(&promql, &query_ctx).context(ParseQuerySnafu)?
}
@@ -46,7 +48,7 @@ impl StatementExecutor {
query: explain.query,
lookback: explain
.lookback
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string()),
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string()),
..PromQuery::default()
};
let explain_node_name = if explain.is_verbose {
@@ -69,7 +71,7 @@ impl StatementExecutor {
query: analyze.query,
lookback: analyze
.lookback
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string()),
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string()),
};
let analyze_node_name = if analyze.is_verbose {
ANALYZE_VERBOSE_NODE_NAME

2
src/servers/src/http/handler.rs
View File

@@ -218,7 +218,7 @@ impl From<PromqlQuery> for PromQuery {
step: query.step,
lookback: query
.lookback
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string()),
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string()),
}
}
}

10
src/servers/src/http/prometheus.rs
View File

@@ -182,7 +182,7 @@ pub async fn instant_query(
lookback: params
.lookback
.or(form_params.lookback)
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string()),
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string()),
};
let result = handler.do_query(&prom_query, query_ctx).await;
@@ -225,7 +225,7 @@ pub async fn range_query(
lookback: params
.lookback
.or(form_params.lookback)
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string()),
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string()),
};
let result = handler.do_query(&prom_query, query_ctx).await;
@@ -324,7 +324,7 @@ pub async fn labels_query(
let lookback = params
.lookback
.or(form_params.lookback)
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string());
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string());
let mut labels = HashSet::new();
let _ = labels.insert(METRIC_NAME.to_string());
@@ -607,7 +607,7 @@ pub async fn label_values_query(
let end = params.end.unwrap_or_else(current_time_rfc3339);
let lookback = params
.lookback
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string());
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string());
let mut label_values = HashSet::new();
@@ -752,7 +752,7 @@ pub async fn series_query(
let lookback = params
.lookback
.or(form_params.lookback)
.unwrap_or(DEFAULT_LOOKBACK_STRING.to_string());
.unwrap_or_else(|| DEFAULT_LOOKBACK_STRING.to_string());
let mut series = Vec::new();
let mut merge_map = HashMap::new();