From 4dadb2135244815302dd291135da0449a3460cf1 Mon Sep 17 00:00:00 2001 From: maco Date: Sun, 12 May 2024 22:21:03 +0800 Subject: [PATCH] remove RequestSource::parse --- src/servers/src/http.rs | 10 ---------- src/servers/src/http/handler.rs | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs index 7fa8509e71c5..17bbb112f108 100644 --- a/src/servers/src/http.rs +++ b/src/servers/src/http.rs @@ -15,7 +15,6 @@ use std::collections::HashMap; use std::fmt::Display; use std::net::SocketAddr; -use std::str::FromStr; use std::sync::Mutex as StdMutex; use std::time::Duration; @@ -350,15 +349,6 @@ pub enum RequestSource { Dashboard, } -impl RequestSource { - pub fn parse(s: &str) -> Option { - match RequestSource::from_str(s) { - Ok(v) => Some(v), - _ => None, - } - } -} - #[derive(Serialize, Deserialize, Debug, JsonSchema)] pub enum HttpResponse { Arrow(ArrowResponse), diff --git a/src/servers/src/http/handler.rs b/src/servers/src/http/handler.rs index 8d342714b530..214e077a9acb 100644 --- a/src/servers/src/http/handler.rs +++ b/src/servers/src/http/handler.rs @@ -14,6 +14,7 @@ use std::collections::HashMap; use std::env; +use std::str::FromStr; use std::time::Instant; use aide::transform::TransformOperation; @@ -97,7 +98,7 @@ pub async fn sql( .map(|s| Epoch::parse(s.as_str()).unwrap_or(Epoch::Millisecond)); let source = query_params .source - .and_then(|s| RequestSource::parse(s.as_str())); + .and_then(|s| RequestSource::from_str(s.as_str()).ok()); let result = if let Some(sql) = &sql { if let Some((status, msg)) = validate_schema(sql_handler.clone(), query_ctx.clone()).await {