From 28748edb0d4c4e1fedfce5b179f182cd58e77739 Mon Sep 17 00:00:00 2001 From: Weny Xu Date: Thu, 6 Jul 2023 14:29:36 +0900 Subject: [PATCH] chore: bump proto to 917ead6 (#1892) * feat: add table_id for ddl exprs * chore: bump proto to 917ead6 --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/common/grpc-expr/src/alter.rs | 3 +++ src/common/meta/src/rpc/ddl.rs | 1 + src/datanode/src/instance/grpc.rs | 1 + src/frontend/src/expr_factory.rs | 1 + src/frontend/src/instance.rs | 1 + src/frontend/src/instance/distributed.rs | 2 ++ src/servers/src/http/admin.rs | 1 + tests-integration/src/grpc.rs | 3 +++ tests-integration/tests/grpc.rs | 1 + 11 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c9f2c024e..3401a81c02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4109,7 +4109,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "greptime-proto" version = "0.1.0" -source = "git+https://github.com/WenyXu/greptime-proto.git?rev=1eda4691a5d2c8ffc463d48ca2317905ba7e4b2d#1eda4691a5d2c8ffc463d48ca2317905ba7e4b2d" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=917ead6274b4dccbaf33c59a7360646ba2f285a9#917ead6274b4dccbaf33c59a7360646ba2f285a9" dependencies = [ "prost", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2cb1a1f048..0ad03c3a40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,7 +73,7 @@ datafusion-sql = { git = "https://github.com/waynexia/arrow-datafusion.git", rev datafusion-substrait = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "63e52dde9e44cac4b1f6c6e6b6bf6368ba3bd323" } futures = "0.3" futures-util = "0.3" -greptime-proto = { git = "https://github.com/WenyXu/greptime-proto.git", rev = "1eda4691a5d2c8ffc463d48ca2317905ba7e4b2d" } +greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "917ead6274b4dccbaf33c59a7360646ba2f285a9" } itertools = "0.10" parquet = "40.0" paste = "1.0" diff --git a/src/common/grpc-expr/src/alter.rs b/src/common/grpc-expr/src/alter.rs index c5345a72b3..a98c54d756 100644 --- a/src/common/grpc-expr/src/alter.rs +++ b/src/common/grpc-expr/src/alter.rs @@ -240,6 +240,7 @@ mod tests { location: None, }], })), + ..Default::default() }; let alter_request = alter_expr_to_request(1, expr).unwrap(); @@ -297,6 +298,7 @@ mod tests { }, ], })), + ..Default::default() }; let alter_request = alter_expr_to_request(1, expr).unwrap(); @@ -345,6 +347,7 @@ mod tests { name: "mem_usage".to_string(), }], })), + ..Default::default() }; let alter_request = alter_expr_to_request(1, expr).unwrap(); diff --git a/src/common/meta/src/rpc/ddl.rs b/src/common/meta/src/rpc/ddl.rs index 83a5abbb1c..9d4287d31a 100644 --- a/src/common/meta/src/rpc/ddl.rs +++ b/src/common/meta/src/rpc/ddl.rs @@ -52,6 +52,7 @@ impl TryFrom for DdlTask { Task::CreateTableTask(create_table) => { Ok(DdlTask::CreateTable(create_table.try_into()?)) } + _ => todo!(), } } } diff --git a/src/datanode/src/instance/grpc.rs b/src/datanode/src/instance/grpc.rs index cae4adf66b..327adc2d5e 100644 --- a/src/datanode/src/instance/grpc.rs +++ b/src/datanode/src/instance/grpc.rs @@ -408,6 +408,7 @@ mod test { }, ], })), + ..Default::default() })), }); let output = instance.do_query(query, QueryContext::arc()).await.unwrap(); diff --git a/src/frontend/src/expr_factory.rs b/src/frontend/src/expr_factory.rs index 5eafb7acfb..98b81656da 100644 --- a/src/frontend/src/expr_factory.rs +++ b/src/frontend/src/expr_factory.rs @@ -320,6 +320,7 @@ pub(crate) fn to_alter_expr( schema_name, table_name, kind: Some(kind), + ..Default::default() }) } diff --git a/src/frontend/src/instance.rs b/src/frontend/src/instance.rs index c235f2f185..43fd1fdaab 100644 --- a/src/frontend/src/instance.rs +++ b/src/frontend/src/instance.rs @@ -401,6 +401,7 @@ impl Instance { schema_name: ctx.current_schema(), table_name: table_name.to_string(), kind: Some(Kind::AddColumns(add_columns)), + ..Default::default() }; self.grpc_query_handler diff --git a/src/frontend/src/instance/distributed.rs b/src/frontend/src/instance/distributed.rs index b4fe21e3b5..7bb18d3589 100644 --- a/src/frontend/src/instance/distributed.rs +++ b/src/frontend/src/instance/distributed.rs @@ -270,6 +270,7 @@ impl DistInstance { catalog_name: table_name.catalog_name.clone(), schema_name: table_name.schema_name.clone(), table_name: table_name.table_name.clone(), + ..Default::default() }; for table_route in route_response.table_routes.iter() { for datanode in table_route.find_leaders() { @@ -330,6 +331,7 @@ impl DistInstance { schema_name: table_name.schema_name.clone(), table_name: table_name.table_name.clone(), region_number, + ..Default::default() }; for table_route in &route_response.table_routes { diff --git a/src/servers/src/http/admin.rs b/src/servers/src/http/admin.rs index 1a079ce568..156cae2517 100644 --- a/src/servers/src/http/admin.rs +++ b/src/servers/src/http/admin.rs @@ -59,6 +59,7 @@ pub async fn flush( schema_name: schema_name.clone(), table_name: table_name.clone(), region_number, + ..Default::default() })), }); diff --git a/tests-integration/src/grpc.rs b/tests-integration/src/grpc.rs index 5f997f2fe7..4f5860edd0 100644 --- a/tests-integration/src/grpc.rs +++ b/tests-integration/src/grpc.rs @@ -119,6 +119,7 @@ mod test { location: None, }], })), + ..Default::default() })), }); let output = query(instance, request).await; @@ -152,6 +153,7 @@ mod test { catalog_name: "greptime".to_string(), schema_name: "database_created_through_grpc".to_string(), table_name: "table_created_through_grpc".to_string(), + ..Default::default() })), }); let output = query(instance, request).await; @@ -416,6 +418,7 @@ CREATE TABLE {table_name} ( schema_name: schema_name.to_string(), table_name: table_name.to_string(), region_number, + ..Default::default() })), }); diff --git a/tests-integration/tests/grpc.rs b/tests-integration/tests/grpc.rs index 5684d388b9..d37f1d7841 100644 --- a/tests-integration/tests/grpc.rs +++ b/tests-integration/tests/grpc.rs @@ -209,6 +209,7 @@ pub async fn test_insert_and_select(store_type: StorageType) { schema_name: DEFAULT_SCHEMA_NAME.to_string(), table_name: "demo".to_string(), kind: Some(kind), + ..Default::default() }; let result = db.alter(expr).await.unwrap(); assert!(matches!(result, Output::AffectedRows(0)));