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

refactor: remove misdirectional alias "Request as GreptimeRequest" (#1940)

Browse Source 
remove Request as GreptimeRequest

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2023-07-12 10:06:05 +08:00
committed by GitHub
parent 41e856eb9e
commit 421103c336
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/datanode/src/instance/grpc.rs
View File

@@ -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<Output> {
async fn do_query(&self, request: Request, ctx: QueryContextRef) -> Result<Output> {
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(),
)),

4
src/frontend/src/instance/standalone.rs
View File

@@ -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<Output> {
async fn do_query(&self, query: Request, ctx: QueryContextRef) -> Result<Output> {
self.0
.do_query(query, ctx)
.await

4
src/meta-srv/src/lib.rs
View File

@@ -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;

6
src/servers/src/query_handler/grpc.rs
View File

@@ -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<Output, Self::Error>;
}
@@ -51,7 +51,7 @@ where
{
type Error = error::Error;
async fn do_query(&self, query: GreptimeRequest, ctx: QueryContextRef) -> Result<Output> {
async fn do_query(&self, query: Request, ctx: QueryContextRef) -> Result<Output> {
self.0
.do_query(query, ctx)
.await

4
src/servers/tests/mod.rs
View File

@@ -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<Output, Self::Error> {
let output = match request {