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

refactor: common semantic-type (#2057)

Browse Source
This commit is contained in:
JeremyHi
2023-08-01 19:18:05 +08:00
committed by GitHub
parent 090b7e61ca
commit fd7eb87a52
14 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@@ -4130,7 +4130,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "greptime-proto"
version = "0.1.0"
source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=356694a72f12ad9e15008d4245a0b4fe48f982ad#356694a72f12ad9e15008d4245a0b4fe48f982ad"
source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=3d8ac534a0c8fd1c6ec66d129345b44c95665ebc#3d8ac534a0c8fd1c6ec66d129345b44c95665ebc"
dependencies = [
"prost",
"serde",
@@ -9211,7 +9211,6 @@ dependencies = [
"datatypes",
"hex",
"itertools 0.10.5",
"mito",
"once_cell",
"snafu",
"sqlparser",

2
Cargo.toml
View File

@@ -74,7 +74,7 @@ datafusion-substrait = { git = "https://github.com/waynexia/arrow-datafusion.git
derive_builder = "0.12"
futures = "0.3"
futures-util = "0.3"
greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "356694a72f12ad9e15008d4245a0b4fe48f982ad" }
greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "3d8ac534a0c8fd1c6ec66d129345b44c95665ebc" }
itertools = "0.10"
lazy_static = "1.4"
once_cell = "1.18"

2
src/api/src/helper.rs
View File

@@ -611,7 +611,7 @@ mod tests {
#[test]
fn test_column_put_vector() {
use crate::v1::column::SemanticType;
use crate::v1::SemanticType;
// Some(false), None, Some(true), Some(true)
let mut column = Column {
column_name: "test".to_string(),

1
src/client/examples/stream_ingest.rs
View File

@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use api::v1::column::*;
use api::v1::*;
use client::{Client, Database, DEFAULT_SCHEMA_NAME};
use derive_new::new;

18
src/common/grpc-expr/src/insert.rs
View File

@@ -16,10 +16,10 @@ use std::collections::{HashMap, HashSet};
use std::sync::Arc;
use api::helper::ColumnDataTypeWrapper;
use api::v1::column::{SemanticType, Values};
use api::v1::column::Values;
use api::v1::{
AddColumn, AddColumns, Column, ColumnDataType, ColumnDef, CreateTableExpr,
InsertRequest as GrpcInsertRequest,
InsertRequest as GrpcInsertRequest, SemanticType,
};
use common_base::BitVec;
use common_time::time::Time;
@@ -575,8 +575,8 @@ mod tests {
use std::{assert_eq, vec};
use api::helper::ColumnDataTypeWrapper;
use api::v1::column::{self, SemanticType, Values};
use api::v1::{Column, ColumnDataType};
use api::v1::column::Values;
use api::v1::{Column, ColumnDataType, SemanticType};
use common_base::BitVec;
use common_catalog::consts::MITO_ENGINE;
use common_time::timestamp::{TimeUnit, Timestamp};
@@ -1028,7 +1028,7 @@ mod tests {
fn mock_insert_batch() -> (Vec<Column>, u32) {
let row_count = 2;
let host_vals = column::Values {
let host_vals = Values {
string_values: vec!["host1".to_string(), "host2".to_string()],
..Default::default()
};
@@ -1040,7 +1040,7 @@ mod tests {
datatype: ColumnDataType::String as i32,
};
let cpu_vals = column::Values {
let cpu_vals = Values {
f64_values: vec![0.31],
..Default::default()
};
@@ -1052,7 +1052,7 @@ mod tests {
datatype: ColumnDataType::Float64 as i32,
};
let mem_vals = column::Values {
let mem_vals = Values {
f64_values: vec![0.1],
..Default::default()
};
@@ -1064,7 +1064,7 @@ mod tests {
datatype: ColumnDataType::Float64 as i32,
};
let time_vals = column::Values {
let time_vals = Values {
time_millisecond_values: vec![100, 101],
..Default::default()
};
@@ -1076,7 +1076,7 @@ mod tests {
datatype: ColumnDataType::TimeMillisecond as i32,
};
let ts_vals = column::Values {
let ts_vals = Values {
ts_millisecond_values: vec![100, 101],
..Default::default()
};

6
src/common/grpc/src/writer.rs
View File

@@ -16,8 +16,7 @@ use std::collections::HashMap;
use std::fmt::Display;
use api::helper::values_with_capacity;
use api::v1::column::SemanticType;
use api::v1::{Column, ColumnDataType};
use api::v1::{Column, ColumnDataType, SemanticType};
use common_base::BitVec;
use snafu::ensure;
@@ -262,8 +261,7 @@ impl Display for Precision {
#[cfg(test)]
mod tests {
use api::v1::column::SemanticType;
use api::v1::ColumnDataType;
use api::v1::{ColumnDataType, SemanticType};
use common_base::BitVec;
use super::LinesWriter;

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

@@ -301,11 +301,11 @@ async fn new_dummy_catalog_list(
mod test {
use api::v1::add_column::location::LocationType;
use api::v1::add_column::Location;
use api::v1::column::{SemanticType, Values};
use api::v1::column::Values;
use api::v1::{
alter_expr, AddColumn, AddColumns, AlterExpr, Column, ColumnDataType, ColumnDef,
CreateDatabaseExpr, CreateTableExpr, DropTableExpr, InsertRequest, InsertRequests,
QueryRequest, RenameTable, TableId, TruncateTableExpr,
QueryRequest, RenameTable, SemanticType, TableId, TruncateTableExpr,
};
use common_catalog::consts::MITO_ENGINE;
use common_error::ext::ErrorExt;

4
src/frontend/src/instance/distributed/inserter.rs
View File

@@ -175,8 +175,8 @@ impl DistInserter {
#[cfg(test)]
mod tests {
use api::v1::column::{SemanticType, Values};
use api::v1::{Column, ColumnDataType, InsertRequest as GrpcInsertRequest};
use api::v1::column::Values;
use api::v1::{Column, ColumnDataType, InsertRequest as GrpcInsertRequest, SemanticType};
use client::client_manager::DatanodeClients;
use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
use common_meta::helper::{CatalogKey, CatalogValue, SchemaKey, SchemaValue};

4
src/frontend/src/table/delete.rs
View File

@@ -68,8 +68,8 @@ mod tests {
use std::collections::HashMap;
use std::sync::Arc;
use api::v1::column::{SemanticType, Values};
use api::v1::{Column, ColumnDataType};
use api::v1::column::Values;
use api::v1::{Column, ColumnDataType, SemanticType};
use datatypes::prelude::{ConcreteDataType, VectorRef};
use datatypes::schema::{ColumnSchema, Schema};
use datatypes::vectors::Int32Vector;

4
src/frontend/src/table/insert.rs
View File

@@ -15,8 +15,8 @@
use std::collections::HashMap;
use api::helper::{push_vals, ColumnDataTypeWrapper};
use api::v1::column::{SemanticType, Values};
use api::v1::{Column, InsertRequest as GrpcInsertRequest};
use api::v1::column::Values;
use api::v1::{Column, InsertRequest as GrpcInsertRequest, SemanticType};
use datatypes::prelude::*;
use snafu::{ensure, OptionExt, ResultExt};
use store_api::storage::RegionNumber;

4
src/servers/src/influxdb.rs
View File

@@ -151,8 +151,8 @@ fn unwarp_or_default_precision(precision: Option<Precision>) -> Precision {
#[cfg(test)]
mod tests {
use api::v1::column::{SemanticType, Values};
use api::v1::{Column, ColumnDataType};
use api::v1::column::Values;
use api::v1::{Column, ColumnDataType, SemanticType};
use common_base::BitVec;
use super::*;

3
src/servers/src/opentsdb/codec.rs
View File

@@ -12,8 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use api::v1::column::SemanticType;
use api::v1::{column, Column, ColumnDataType, InsertRequest as GrpcInsertRequest};
use api::v1::{column, Column, ColumnDataType, InsertRequest as GrpcInsertRequest, SemanticType};
use crate::error::{self, Result};

4
tests-integration/src/grpc.rs
View File

@@ -16,14 +16,14 @@
mod test {
use std::collections::HashMap;
use api::v1::column::{SemanticType, Values};
use api::v1::column::Values;
use api::v1::ddl_request::Expr as DdlExpr;
use api::v1::greptime_request::Request;
use api::v1::query_request::Query;
use api::v1::{
alter_expr, AddColumn, AddColumns, AlterExpr, Column, ColumnDataType, ColumnDef,
CreateDatabaseExpr, CreateTableExpr, DdlRequest, DeleteRequest, DropTableExpr,
FlushTableExpr, InsertRequest, InsertRequests, QueryRequest,
FlushTableExpr, InsertRequest, InsertRequests, QueryRequest, SemanticType,
};
use common_catalog::consts::MITO_ENGINE;
use common_query::Output;

3
tests-integration/tests/grpc.rs
View File

@@ -13,12 +13,11 @@
// limitations under the License.
use api::v1::alter_expr::Kind;
use api::v1::column::SemanticType;
use api::v1::promql_request::Promql;
use api::v1::{
column, AddColumn, AddColumns, AlterExpr, Column, ColumnDataType, ColumnDef, CreateTableExpr,
InsertRequest, InsertRequests, PromInstantQuery, PromRangeQuery, PromqlRequest, RequestHeader,
TableId,
SemanticType, TableId,
};
use client::{Client, Database, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
use common_catalog::consts::{MIN_USER_TABLE_ID, MITO_ENGINE};