Skip to content

Commit ad35d42

Browse files
committed
chore: refactor
1 parent 8e7b84a commit ad35d42

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

server/src/handlers/http/query.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use std::pin::Pin;
2929
use std::sync::Arc;
3030
use std::time::Instant;
3131

32-
use arrow_schema::Schema;
3332
use crate::handlers::http::send_schema_request;
33+
use arrow_schema::Schema;
3434

3535
use crate::event::commit_schema;
3636
use crate::metrics::QUERY_EXECUTE_TIME;
@@ -80,20 +80,16 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result<impl Respon
8080
}
8181
}
8282

83-
let mmem = if CONFIG.parseable.mode == Mode::Query {
83+
let mut mmem = None;
84+
85+
if CONFIG.parseable.mode == Mode::Query {
8486
// create a new query to send to the ingestors
8587
if let Some(que) = transform_query_for_ingestor(&query_request) {
86-
let vals = send_request_to_ingestor(&que)
87-
.await
88-
.map_err(|err| QueryError::Custom(err.to_string()))?;
89-
90-
Some(vals)
91-
} else {
92-
None
88+
if let Ok(vals) = send_request_to_ingestor(&que).await {
89+
mmem = Some(vals);
90+
}
9391
}
94-
} else {
95-
None
96-
};
92+
}
9793

9894
let creds = extract_session_key_from_req(&req).expect("expects basic auth");
9995
let permissions = Users.get_permissions(&creds);

0 commit comments

Comments
 (0)