feat: remove RegionRequestHandler.handle

Signed-off-by: Zhenchi <[email protected]>
GreptimeTeam · Sep 12, 2023 · 094d463 · 094d463
1 parent 95cd86e
commit 094d463
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 44 deletions.
diff --git a/src/client/src/region_handler.rs b/src/client/src/region_handler.rs
@@ -14,17 +14,14 @@
 
 use std::sync::Arc;
 
-use api::v1::region::{QueryRequest, RegionRequest};
+use api::v1::region::QueryRequest;
 use async_trait::async_trait;
-use common_meta::datanode_manager::AffectedRows;
 use common_recordbatch::SendableRecordBatchStream;
 
 use crate::error::Result;
 
 #[async_trait]
 pub trait RegionRequestHandler: Send + Sync {
-    async fn handle(&self, request: RegionRequest) -> Result<AffectedRows>;
-
     // TODO(ruihang): add trace id and span id in the request.
     async fn do_get(&self, request: QueryRequest) -> Result<SendableRecordBatchStream>;
 }

diff --git a/src/frontend/src/instance/distributed.rs b/src/frontend/src/instance/distributed.rs
@@ -14,20 +14,17 @@
 
 use std::sync::Arc;
 
-use api::v1::region::{QueryRequest, RegionRequest};
+use api::v1::region::QueryRequest;
 use async_trait::async_trait;
 use client::error::{HandleRequestSnafu, Result as ClientResult};
 use client::region_handler::RegionRequestHandler;
 use common_error::ext::BoxedError;
-use common_meta::datanode_manager::AffectedRows;
 use common_recordbatch::SendableRecordBatchStream;
 use snafu::{OptionExt, ResultExt};
 use store_api::storage::RegionId;
 
 use crate::catalog::FrontendCatalogManager;
-use crate::error::{
-    FindDatanodeSnafu, FindTableRouteSnafu, NotSupportedSnafu, RequestQuerySnafu, Result,
-};
+use crate::error::{FindDatanodeSnafu, FindTableRouteSnafu, RequestQuerySnafu, Result};
 
 pub(crate) struct DistRegionRequestHandler {
     catalog_manager: Arc<FrontendCatalogManager>,
@@ -41,13 +38,6 @@ impl DistRegionRequestHandler {
 
 #[async_trait]
 impl RegionRequestHandler for DistRegionRequestHandler {
-    async fn handle(&self, request: RegionRequest) -> ClientResult<AffectedRows> {
-        self.handle_inner(request)
-            .await
-            .map_err(BoxedError::new)
-            .context(HandleRequestSnafu)
-    }
-
     async fn do_get(&self, request: QueryRequest) -> ClientResult<SendableRecordBatchStream> {
         self.do_get_inner(request)
             .await
@@ -57,13 +47,6 @@ impl RegionRequestHandler for DistRegionRequestHandler {
 }
 
 impl DistRegionRequestHandler {
-    async fn handle_inner(&self, _request: RegionRequest) -> Result<AffectedRows> {
-        NotSupportedSnafu {
-            feat: "region request",
-        }
-        .fail()
-    }
-
     async fn do_get_inner(&self, request: QueryRequest) -> Result<SendableRecordBatchStream> {
         let region_id = RegionId::from_u64(request.region_id);
 

diff --git a/src/frontend/src/instance/standalone.rs b/src/frontend/src/instance/standalone.rs
@@ -44,7 +44,6 @@ pub(crate) struct StandaloneRegionRequestHandler {
 }
 
 impl StandaloneRegionRequestHandler {
-    #[allow(dead_code)]
     pub fn arc(region_server: RegionServer) -> Arc<Self> {
         Arc::new(Self { region_server })
     }
@@ -63,16 +62,6 @@ impl StandaloneRegionRequestHandler {
 
 #[async_trait]
 impl RegionRequestHandler for StandaloneRegionRequestHandler {
-    async fn handle(&self, request: RegionRequest) -> ClientResult<AffectedRows> {
-        let response = self
-            .handle_inner(request)
-            .await
-            .map_err(BoxedError::new)
-            .context(HandleRequestSnafu)?;
-        check_response_header(response.header)?;
-        Ok(response.affected_rows)
-    }
-
     async fn do_get(&self, request: QueryRequest) -> ClientResult<SendableRecordBatchStream> {
         self.region_server
             .handle_read(request)

diff --git a/src/frontend/src/req_convert/common/partitioner.rs b/src/frontend/src/req_convert/common/partitioner.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use api::v1::region::{DeleteRequest, DeleteRequests, InsertRequest, InsertRequests};
+use api::v1::region::{DeleteRequest, InsertRequest};
 use api::v1::Rows;
 use partition::manager::PartitionRuleManager;
 use snafu::ResultExt;
@@ -33,7 +33,7 @@ impl<'a> Partitioner<'a> {
         &self,
         table_id: TableId,
         rows: Rows,
-    ) -> Result<InsertRequests> {
+    ) -> Result<Vec<InsertRequest>> {
         let requests = self
             .partition_manager
             .split_rows(table_id, rows)
@@ -45,14 +45,14 @@ impl<'a> Partitioner<'a> {
                 rows: Some(rows),
             })
             .collect();
-        Ok(InsertRequests { requests })
+        Ok(requests)
     }
 
     pub async fn partition_delete_requests(
         &self,
         table_id: TableId,
         rows: Rows,
-    ) -> Result<DeleteRequests> {
+    ) -> Result<Vec<DeleteRequest>> {
         let requests = self
             .partition_manager
             .split_rows(table_id, rows)
@@ -64,6 +64,6 @@ impl<'a> Partitioner<'a> {
                 rows: Some(rows),
             })
             .collect();
-        Ok(DeleteRequests { requests })
+        Ok(requests)
     }
 }
diff --git a/src/frontend/src/req_convert/delete/row_to_region.rs b/src/frontend/src/req_convert/delete/row_to_region.rs
@@ -52,7 +52,7 @@ impl<'a> RowToRegion<'a> {
                 .partition_delete_requests(table_id, request.rows.unwrap_or_default())
                 .await?;
 
-            region_request.extend(requests.requests);
+            region_request.extend(requests);
         }
 
         Ok(RegionDeleteRequests {

diff --git a/src/frontend/src/req_convert/delete/table_to_region.rs b/src/frontend/src/req_convert/delete/table_to_region.rs
@@ -44,7 +44,7 @@ impl<'a> TableToRegion<'a> {
         let requests = Partitioner::new(self.partition_manager)
             .partition_delete_requests(self.table_info.table_id(), rows)
             .await?;
-        Ok(requests)
+        Ok(RegionDeleteRequests { requests })
     }
 }
 

diff --git a/src/frontend/src/req_convert/insert/row_to_region.rs b/src/frontend/src/req_convert/insert/row_to_region.rs
@@ -52,7 +52,7 @@ impl<'a> RowToRegion<'a> {
                 .partition_insert_requests(table_id, request.rows.unwrap_or_default())
                 .await?;
 
-            region_request.extend(requests.requests);
+            region_request.extend(requests);
         }
 
         Ok(RegionInsertRequests {

diff --git a/src/frontend/src/req_convert/insert/stmt_to_region.rs b/src/frontend/src/req_convert/insert/stmt_to_region.rs
@@ -106,7 +106,7 @@ impl<'a> StatementToRegion<'a> {
         let requests = Partitioner::new(self.partition_manager)
             .partition_insert_requests(table_info.table_id(), Rows { schema, rows })
             .await?;
-        Ok(requests)
+        Ok(RegionInsertRequests { requests })
     }
 
     async fn get_table(&self, catalog: &str, schema: &str, table: &str) -> Result<TableRef> {

diff --git a/src/frontend/src/req_convert/insert/table_to_region.rs b/src/frontend/src/req_convert/insert/table_to_region.rs
@@ -44,7 +44,7 @@ impl<'a> TableToRegion<'a> {
         let requests = Partitioner::new(self.partition_manager)
             .partition_insert_requests(self.table_info.table_id(), rows)
             .await?;
-        Ok(requests)
+        Ok(RegionInsertRequests { requests })
     }
 }