From 5f2b790a01d6bb0ec625e0c90e7a288e1c385b69 Mon Sep 17 00:00:00 2001 From: evenyag Date: Wed, 2 Aug 2023 22:05:48 +0800 Subject: [PATCH] feat: remove code --- src/mito2/src/lib.rs | 1 + src/mito2/src/request.rs | 44 ++++++---------------------------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/src/mito2/src/lib.rs b/src/mito2/src/lib.rs index 1aeacc9270..8f656edcd9 100644 --- a/src/mito2/src/lib.rs +++ b/src/mito2/src/lib.rs @@ -31,6 +31,7 @@ pub mod manifest; pub mod memtable; #[allow(dead_code)] pub mod metadata; +#[allow(dead_code)] pub(crate) mod proto_util; pub mod read; #[allow(dead_code)] diff --git a/src/mito2/src/request.rs b/src/mito2/src/request.rs index fcf6ff3c6e..deb78f7f96 100644 --- a/src/mito2/src/request.rs +++ b/src/mito2/src/request.rs @@ -18,18 +18,14 @@ use std::collections::HashMap; use std::time::Duration; use common_base::readable_size::ReadableSize; -use greptime_proto::v1::{ColumnDataType, ColumnSchema, Rows}; -use snafu::{ensure, OptionExt, ResultExt}; +use greptime_proto::v1::Rows; +use snafu::ensure; use store_api::storage::{ColumnId, CompactionStrategy, OpType, RegionId}; use tokio::sync::oneshot::{self, Receiver, Sender}; use crate::config::DEFAULT_WRITE_BUFFER_SIZE; -use crate::error::{CreateDefaultSnafu, FillDefaultSnafu, InvalidRequestSnafu, Result}; +use crate::error::{FillDefaultSnafu, InvalidRequestSnafu, Result}; use crate::metadata::{ColumnMetadata, RegionMetadata}; -use crate::proto_util::{ - check_column_type, check_semantic_type, to_column_data_type, to_proto_semantic_type, - to_proto_value, -}; /// Options that affect the entire region. /// @@ -144,36 +140,8 @@ impl WriteRequest { // Checks all columns in this region. for column in &metadata.column_metadatas { - if let Some(input_col) = rows_columns.remove(&column.column_schema.name) { - // Check data type. - ensure!( - check_column_type(input_col.datatype, &column.column_schema.data_type), - InvalidRequestSnafu { - region_id, - reason: format!( - "column {} expect type {:?}, given: {:?}({})", - column.column_schema.name, - column.column_schema.data_type, - ColumnDataType::from_i32(input_col.datatype), - input_col.datatype, - ) - } - ); - - // Check semantic type. - ensure!( - check_semantic_type(input_col.semantic_type, column.semantic_type), - InvalidRequestSnafu { - region_id, - reason: format!( - "column {} has semantic type {:?}, given: {:?}({})", - column.column_schema.name, - column.semantic_type, - greptime_proto::v1::SemanticType::from_i32(input_col.semantic_type), - input_col.semantic_type - ), - } - ); + if let Some(_input_col) = rows_columns.remove(&column.column_schema.name) { + todo!("Check data type and semantic type"); } else { // For columns not in rows, checks whether they have default value. ensure!( @@ -221,7 +189,7 @@ impl WriteRequest { } /// Fill default value for specific `column`. - fn fill_column(&mut self, region_id: RegionId, column: &ColumnMetadata) -> Result<()> { + fn fill_column(&mut self, _region_id: RegionId, _column: &ColumnMetadata) -> Result<()> { todo!() } }