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

feat: switch to using create table procedure (#1861)

Browse Source 
* feat: switch to using create table procedure

* fix: add missing table_id and fix uncaught error

* refactor: remove unused code and metrics

* chore: apply suggestions from CR

* chore: remove unused attributes

* feat: add info log and metrics

* fix: fix conflicts
This commit is contained in:
Weny Xu
2023-07-10 11:08:09 +09:00
committed by GitHub
parent 00181885cc
commit b31fad5d52
13 changed files with 115 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests-integration/src/cluster.rs
View File

@@ -88,12 +88,14 @@ impl GreptimeDbClusterBuilder {
pub async fn build(self) -> GreptimeDbCluster {
let datanodes = self.datanodes.unwrap_or(4);
let meta_srv = self.build_metasrv().await;
let datanode_clients = Arc::new(DatanodeClients::default());
let meta_srv = self.build_metasrv(datanode_clients.clone()).await;
let (datanode_instances, heartbeat_tasks, storage_guards, wal_guards) =
self.build_datanodes(meta_srv.clone(), datanodes).await;
let datanode_clients = build_datanode_clients(&datanode_instances, datanodes).await;
build_datanode_clients(datanode_clients.clone(), &datanode_instances, datanodes).await;
self.wait_datanodes_alive(&meta_srv.meta_srv.meta_peer_client(), datanodes)
.await;
@@ -115,8 +117,14 @@ impl GreptimeDbClusterBuilder {
}
}
async fn build_metasrv(&self) -> MockInfo {
meta_srv::mocks::mock(MetaSrvOptions::default(), self.kv_store.clone(), None).await
async fn build_metasrv(&self, datanode_clients: Arc<DatanodeClients>) -> MockInfo {
meta_srv::mocks::mock(
MetaSrvOptions::default(),
self.kv_store.clone(),
None,
Some(datanode_clients),
)
.await
}
async fn build_datanodes(
@@ -218,6 +226,7 @@ impl GreptimeDbClusterBuilder {
.enable_store()
.enable_heartbeat()
.channel_manager(meta_srv.channel_manager)
.enable_ddl()
.build();
meta_client.start(&[&meta_srv.server_addr]).await.unwrap();
let meta_client = Arc::new(meta_client);
@@ -238,10 +247,10 @@ impl GreptimeDbClusterBuilder {
}
async fn build_datanode_clients(
clients: Arc<DatanodeClients>,
instances: &HashMap<DatanodeId, Arc<DatanodeInstance>>,
datanodes: u32,
) -> Arc<DatanodeClients> {
let clients = Arc::new(DatanodeClients::default());
) {
for i in 0..datanodes {
let datanode_id = i as u64 + 1;
let instance = instances.get(&datanode_id).cloned().unwrap();
@@ -250,7 +259,6 @@ async fn build_datanode_clients(
.insert_client(Peer::new(datanode_id, addr), client)
.await;
}
clients
}
async fn create_datanode_client(datanode_instance: Arc<DatanodeInstance>) -> (String, Client) {