Skip to content

Commit f0b687b

Browse files
authored
chore: bump client (#673)
* chore: bump client * fix clippy
1 parent 0fc481f commit f0b687b

File tree

7 files changed

+31
-45
lines changed

7 files changed

+31
-45
lines changed

Cargo.lock

+25-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ bytes = "1.1.0"
6161
bytes_ext = { path = "components/bytes_ext" }
6262
catalog = { path = "catalog" }
6363
catalog_impls = { path = "catalog_impls" }
64+
ceresdbproto = "1.0.1"
6465
chrono = "0.4"
6566
clap = "3.0"
6667
clru = "0.6.1"
@@ -115,10 +116,6 @@ wal = { path = "wal" }
115116
message_queue = { path = "components/message_queue" }
116117
zstd = { version = "0.12", default-features = false }
117118

118-
[workspace.dependencies.ceresdbproto]
119-
git = "https://github.com/CeresDB/ceresdbproto.git"
120-
rev = "1194907cbc8b28017c6bede2636ee8e18122cfaf"
121-
122119
[dependencies]
123120
analytic_engine = { workspace = true }
124121
catalog = { workspace = true }

integration_tests/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ workspace = true
88
[dependencies]
99
anyhow = "1.0.58"
1010
async-trait = "0.1"
11-
ceresdb-client-rs = { git = "https://github.com/CeresDB/ceresdb-client-rs.git", rev = "69948b9963597ccdb7c73756473393972dfdebd3" }
11+
ceresdb-client = "1.0"
1212
sql = { workspace = true }
13-
sqlness = { git = "https://github.com/CeresDB/sqlness.git", rev = "e6d602ed7d894ffb806580f17f4a6f1283abbf1f" }
13+
sqlness = "0.4.0"
1414
sqlparser = { workspace = true }
1515
tokio = { workspace = true }

integration_tests/src/database.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::{
1111
};
1212

1313
use async_trait::async_trait;
14-
use ceresdb_client_rs::{
14+
use ceresdb_client::{
1515
db_client::{Builder, DbClient, Mode},
1616
model::sql_query::{display::CsvFormatter, Request},
1717
RpcContext,
@@ -20,7 +20,7 @@ use sql::{
2020
ast::{Statement, TableName},
2121
parser::Parser,
2222
};
23-
use sqlness::Database;
23+
use sqlness::{Database, QueryContext};
2424
use sqlparser::ast::{SetExpr, Statement as SqlStatement, TableFactor};
2525

2626
const BINARY_PATH_ENV: &str = "CERESDB_BINARY_PATH";
@@ -42,7 +42,7 @@ pub struct CeresDB {
4242

4343
#[async_trait]
4444
impl Database for CeresDB {
45-
async fn query(&self, query: String) -> Box<dyn Display> {
45+
async fn query(&self, _context: QueryContext, query: String) -> Box<dyn Display> {
4646
Self::execute(query, self.db_client.clone()).await
4747
}
4848
}

router/src/cluster_based.rs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ fn make_route(table_name: &str, endpoint: &str) -> Result<Route> {
2828
Ok(Route {
2929
table: table_name.to_string(),
3030
endpoint: Some(endpoint.into()),
31-
..Default::default()
3231
})
3332
}
3433

router/src/rule_based.rs

-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ impl Router for RuleBasedRouter {
162162
let route = Route {
163163
table,
164164
endpoint: Some(pb_endpoint),
165-
..Default::default()
166165
};
167166
route_results.push(route);
168167
}

server/src/grpc/forward.rs

-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ mod tests {
401401
Some(v) => Ok(vec![Route {
402402
table: req.tables[0].clone(),
403403
endpoint: Some(v.clone().into()),
404-
ext: vec![],
405404
}]),
406405
}
407406
}

0 commit comments

Comments
 (0)