From 421103c3367931345ccbadbe04e180eba17299d8 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Wed, 12 Jul 2023 10:06:05 +0800 Subject: [PATCH] refactor: remove misdirectional alias "Request as GreptimeRequest" (#1940) remove Request as GreptimeRequest Signed-off-by: Ruihang Xia --- src/datanode/src/instance/grpc.rs | 28 ++++++++++++------------- src/frontend/src/instance/standalone.rs | 4 ++-- src/meta-srv/src/lib.rs | 4 ++-- src/servers/src/query_handler/grpc.rs | 6 +++--- src/servers/tests/mod.rs | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/datanode/src/instance/grpc.rs b/src/datanode/src/instance/grpc.rs index 5cd0433003..3a8e97ffa0 100644 --- a/src/datanode/src/instance/grpc.rs +++ b/src/datanode/src/instance/grpc.rs @@ -16,7 +16,7 @@ use std::any::Any; use std::sync::Arc; use api::v1::ddl_request::{Expr as DdlExpr, Expr}; -use api::v1::greptime_request::Request as GrpcRequest; +use api::v1::greptime_request::Request; use api::v1::query_request::Query; use api::v1::{CreateDatabaseExpr, DdlRequest, DeleteRequest, InsertRequests}; use async_trait::async_trait; @@ -207,11 +207,11 @@ impl Instance { impl GrpcQueryHandler for Instance { type Error = error::Error; - async fn do_query(&self, request: GrpcRequest, ctx: QueryContextRef) -> Result { + async fn do_query(&self, request: Request, ctx: QueryContextRef) -> Result { match request { - GrpcRequest::Inserts(requests) => self.handle_inserts(requests, &ctx).await, - GrpcRequest::Delete(request) => self.handle_delete(request, ctx).await, - GrpcRequest::Query(query_request) => { + Request::Inserts(requests) => self.handle_inserts(requests, &ctx).await, + Request::Delete(request) => self.handle_delete(request, ctx).await, + Request::Query(query_request) => { let query = query_request .query .context(error::MissingRequiredFieldSnafu { @@ -219,7 +219,7 @@ impl GrpcQueryHandler for Instance { })?; self.handle_query(query, ctx).await } - GrpcRequest::Ddl(request) => self.handle_ddl(request, ctx).await, + Request::Ddl(request) => self.handle_ddl(request, ctx).await, } } } @@ -332,7 +332,7 @@ mod test { let instance = MockInstance::new("test_handle_ddl").await; let instance = instance.inner(); - let query = GrpcRequest::Ddl(DdlRequest { + let query = Request::Ddl(DdlRequest { expr: Some(DdlExpr::CreateDatabase(CreateDatabaseExpr { database_name: "my_database".to_string(), create_if_not_exists: true, @@ -341,7 +341,7 @@ mod test { let output = instance.do_query(query, QueryContext::arc()).await.unwrap(); assert!(matches!(output, Output::AffectedRows(1))); - let query = GrpcRequest::Ddl(DdlRequest { + let query = Request::Ddl(DdlRequest { expr: Some(DdlExpr::CreateTable(CreateTableExpr { catalog_name: "greptime".to_string(), schema_name: "my_database".to_string(), @@ -369,7 +369,7 @@ mod test { let output = instance.do_query(query, QueryContext::arc()).await.unwrap(); assert!(matches!(output, Output::AffectedRows(0))); - let query = GrpcRequest::Ddl(DdlRequest { + let query = Request::Ddl(DdlRequest { expr: Some(DdlExpr::Alter(AlterExpr { catalog_name: "greptime".to_string(), schema_name: "my_database".to_string(), @@ -494,7 +494,7 @@ mod test { ..Default::default() }; - let query = GrpcRequest::Inserts(InsertRequests { + let query = Request::Inserts(InsertRequests { inserts: vec![insert], }); let output = instance.do_query(query, QueryContext::arc()).await.unwrap(); @@ -525,7 +525,7 @@ mod test { .await .is_ok()); - let query = GrpcRequest::Query(QueryRequest { + let query = Request::Query(QueryRequest { query: Some(Query::Sql( "INSERT INTO demo(host, cpu, memory, ts) VALUES \ ('host1', 66.6, 1024, 1672201025000),\ @@ -563,7 +563,7 @@ mod test { row_count: 1, }; - let request = GrpcRequest::Delete(request); + let request = Request::Delete(request); let output = instance .do_query(request, QueryContext::arc()) .await @@ -594,7 +594,7 @@ mod test { .await .is_ok()); - let query = GrpcRequest::Query(QueryRequest { + let query = Request::Query(QueryRequest { query: Some(Query::Sql( "INSERT INTO demo(host, cpu, memory, ts) VALUES \ ('host1', 66.6, 1024, 1672201025000),\ @@ -605,7 +605,7 @@ mod test { let output = instance.do_query(query, QueryContext::arc()).await.unwrap(); assert!(matches!(output, Output::AffectedRows(2))); - let query = GrpcRequest::Query(QueryRequest { + let query = Request::Query(QueryRequest { query: Some(Query::Sql( "SELECT ts, host, cpu, memory FROM demo".to_string(), )), diff --git a/src/frontend/src/instance/standalone.rs b/src/frontend/src/instance/standalone.rs index 4e54d073f9..af5c224e7c 100644 --- a/src/frontend/src/instance/standalone.rs +++ b/src/frontend/src/instance/standalone.rs @@ -14,7 +14,7 @@ use std::sync::Arc; -use api::v1::greptime_request::Request as GreptimeRequest; +use api::v1::greptime_request::Request; use async_trait::async_trait; use common_query::Output; use datanode::error::Error as DatanodeError; @@ -36,7 +36,7 @@ impl StandaloneGrpcQueryHandler { impl GrpcQueryHandler for StandaloneGrpcQueryHandler { type Error = error::Error; - async fn do_query(&self, query: GreptimeRequest, ctx: QueryContextRef) -> Result { + async fn do_query(&self, query: Request, ctx: QueryContextRef) -> Result { self.0 .do_query(query, ctx) .await diff --git a/src/meta-srv/src/lib.rs b/src/meta-srv/src/lib.rs index 9d9e0c28f6..6034bbe11c 100644 --- a/src/meta-srv/src/lib.rs +++ b/src/meta-srv/src/lib.rs @@ -37,7 +37,7 @@ mod sequence; pub mod service; pub mod table_routes; +pub use crate::error::Result; + #[cfg(test)] mod test_util; - -pub use crate::error::Result; diff --git a/src/servers/src/query_handler/grpc.rs b/src/servers/src/query_handler/grpc.rs index b82ff4c379..c335b185df 100644 --- a/src/servers/src/query_handler/grpc.rs +++ b/src/servers/src/query_handler/grpc.rs @@ -14,7 +14,7 @@ use std::sync::Arc; -use api::v1::greptime_request::Request as GreptimeRequest; +use api::v1::greptime_request::Request; use async_trait::async_trait; use common_error::prelude::*; use common_query::Output; @@ -31,7 +31,7 @@ pub trait GrpcQueryHandler { async fn do_query( &self, - query: GreptimeRequest, + query: Request, ctx: QueryContextRef, ) -> std::result::Result; } @@ -51,7 +51,7 @@ where { type Error = error::Error; - async fn do_query(&self, query: GreptimeRequest, ctx: QueryContextRef) -> Result { + async fn do_query(&self, query: Request, ctx: QueryContextRef) -> Result { self.0 .do_query(query, ctx) .await diff --git a/src/servers/tests/mod.rs b/src/servers/tests/mod.rs index 91be2ae627..ee8f72600a 100644 --- a/src/servers/tests/mod.rs +++ b/src/servers/tests/mod.rs @@ -15,7 +15,7 @@ use std::collections::HashMap; use std::sync::{Arc, RwLock}; -use api::v1::greptime_request::{Request as GreptimeRequest, Request}; +use api::v1::greptime_request::Request; use api::v1::query_request::Query; use async_trait::async_trait; use catalog::local::MemoryCatalogManager; @@ -156,7 +156,7 @@ impl GrpcQueryHandler for DummyInstance { async fn do_query( &self, - request: GreptimeRequest, + request: Request, ctx: QueryContextRef, ) -> std::result::Result { let output = match request {