chore: bump client (#673)

* chore: bump client * fix clippy
apache · Feb 28, 2023 · f0b687b · f0b687b
1 parent 0fc481f
commit f0b687b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,6 +61,7 @@ bytes = "1.1.0"
 bytes_ext = { path = "components/bytes_ext" }
 catalog = { path = "catalog" }
 catalog_impls = { path = "catalog_impls" }
+ceresdbproto = "1.0.1"
 chrono = "0.4"
 clap = "3.0"
 clru = "0.6.1"
@@ -115,10 +116,6 @@ wal = { path = "wal" }
 message_queue = { path = "components/message_queue" }
 zstd = { version = "0.12", default-features = false }
 
-[workspace.dependencies.ceresdbproto]
-git = "https://github.com/CeresDB/ceresdbproto.git"
-rev = "1194907cbc8b28017c6bede2636ee8e18122cfaf"
-
 [dependencies]
 analytic_engine = { workspace = true }
 catalog = { workspace = true }

diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
@@ -8,8 +8,8 @@ workspace = true
 [dependencies]
 anyhow = "1.0.58"
 async-trait = "0.1"
-ceresdb-client-rs = { git = "https://github.com/CeresDB/ceresdb-client-rs.git", rev = "69948b9963597ccdb7c73756473393972dfdebd3" }
+ceresdb-client = "1.0"
 sql = { workspace = true }
-sqlness = { git = "https://github.com/CeresDB/sqlness.git", rev = "e6d602ed7d894ffb806580f17f4a6f1283abbf1f" }
+sqlness = "0.4.0"
 sqlparser = { workspace = true }
 tokio = { workspace = true }
diff --git a/integration_tests/src/database.rs b/integration_tests/src/database.rs
@@ -11,7 +11,7 @@ use std::{
 };
 
 use async_trait::async_trait;
-use ceresdb_client_rs::{
+use ceresdb_client::{
     db_client::{Builder, DbClient, Mode},
     model::sql_query::{display::CsvFormatter, Request},
     RpcContext,
@@ -20,7 +20,7 @@ use sql::{
     ast::{Statement, TableName},
     parser::Parser,
 };
-use sqlness::Database;
+use sqlness::{Database, QueryContext};
 use sqlparser::ast::{SetExpr, Statement as SqlStatement, TableFactor};
 
 const BINARY_PATH_ENV: &str = "CERESDB_BINARY_PATH";
@@ -42,7 +42,7 @@ pub struct CeresDB {
 
 #[async_trait]
 impl Database for CeresDB {
-    async fn query(&self, query: String) -> Box<dyn Display> {
+    async fn query(&self, _context: QueryContext, query: String) -> Box<dyn Display> {
         Self::execute(query, self.db_client.clone()).await
     }
 }

diff --git a/router/src/cluster_based.rs b/router/src/cluster_based.rs
@@ -28,7 +28,6 @@ fn make_route(table_name: &str, endpoint: &str) -> Result<Route> {
     Ok(Route {
         table: table_name.to_string(),
         endpoint: Some(endpoint.into()),
-        ..Default::default()
     })
 }
 

diff --git a/router/src/rule_based.rs b/router/src/rule_based.rs
@@ -162,7 +162,6 @@ impl Router for RuleBasedRouter {
                 let route = Route {
                     table,
                     endpoint: Some(pb_endpoint),
-                    ..Default::default()
                 };
                 route_results.push(route);
             }

diff --git a/server/src/grpc/forward.rs b/server/src/grpc/forward.rs
@@ -401,7 +401,6 @@ mod tests {
                 Some(v) => Ok(vec![Route {
                     table: req.tables[0].clone(),
                     endpoint: Some(v.clone().into()),
-                    ext: vec![],
                 }]),
             }
         }