From f6b7e5f415c68982024b4e50f21cb2e4ea2dea8f Mon Sep 17 00:00:00 2001 From: discord9 Date: Tue, 3 Feb 2026 21:24:25 +0800 Subject: [PATCH] fix: use etcd Signed-off-by: discord9 --- .../granularity_and_false_positive_rate.result | 3 +-- .../granularity_and_false_positive_rate.sql | 1 - .../distributed/common/show-create-table.result | 16 +++++++++++++++- tests/conf/metasrv-test.toml.template | 2 +- tests/runner/src/cmd/compat.rs | 2 ++ tests/runner/src/compatibility_runner.rs | 6 ++++-- tests/runner/src/server_mode.rs | 7 ++----- 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.result b/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.result index 2974597747..bafa1f15f3 100644 --- a/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.result +++ b/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.result @@ -1,5 +1,4 @@ -- SQLNESS ARG since=0.15.0 --- SQLNESS IGNORE_RESULT CREATE TABLE granularity_and_false_positive_rate ( ts timestamp time index, val double @@ -8,5 +7,5 @@ CREATE TABLE granularity_and_false_positive_rate ( "index.false_positive_rate" = "0.01" ); --- IGNORE_RESULT: Query executed successfully +Affected Rows: 0 diff --git a/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.sql b/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.sql index 645882fca4..5dde1e6b24 100644 --- a/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.sql +++ b/tests/compatibility/1.feature/distributed/common/granularity_and_false_positive_rate.sql @@ -1,5 +1,4 @@ -- SQLNESS ARG since=0.15.0 --- SQLNESS IGNORE_RESULT CREATE TABLE granularity_and_false_positive_rate ( ts timestamp time index, val double diff --git a/tests/compatibility/2.verify/distributed/common/show-create-table.result b/tests/compatibility/2.verify/distributed/common/show-create-table.result index 27c01ed877..3440060d12 100644 --- a/tests/compatibility/2.verify/distributed/common/show-create-table.result +++ b/tests/compatibility/2.verify/distributed/common/show-create-table.result @@ -1,4 +1,18 @@ SHOW CREATE TABLE granularity_and_false_positive_rate; -Error: 4001(TableNotFound), Table not found: granularity_and_false_positive_rate ++-------------------------------------+--------------------------------------------------------------------+ +| Table | Create Table | ++-------------------------------------+--------------------------------------------------------------------+ +| granularity_and_false_positive_rate | CREATE TABLE IF NOT EXISTS "granularity_and_false_positive_rate" ( | +| | "ts" TIMESTAMP(3) NOT NULL, | +| | "val" DOUBLE NULL, | +| | TIME INDEX ("ts") | +| | ) | +| | | +| | ENGINE=mito | +| | WITH( | +| | 'index.false_positive_rate' = '0.01', | +| | 'index.granularity' = '8192' | +| | ) | ++-------------------------------------+--------------------------------------------------------------------+ diff --git a/tests/conf/metasrv-test.toml.template b/tests/conf/metasrv-test.toml.template index 64ceb686ac..ecfad6f7d8 100644 --- a/tests/conf/metasrv-test.toml.template +++ b/tests/conf/metasrv-test.toml.template @@ -5,7 +5,7 @@ heartbeat_interval = "1s" store_addrs = [{store_addrs | unescaped}] ## The datastore for meta server. -backend = "EtcdStore" +backend = "etcd_store" {{ endif }} [wal] {{ if is_raft_engine }} diff --git a/tests/runner/src/cmd/compat.rs b/tests/runner/src/cmd/compat.rs index f4845ce291..f25de3702f 100644 --- a/tests/runner/src/cmd/compat.rs +++ b/tests/runner/src/cmd/compat.rs @@ -94,6 +94,8 @@ impl CompatCommand { } if !self.preserve_state { + println!("Stopping etcd"); + crate::util::stop_rm_etcd(); tokio::fs::remove_dir_all(data_dir).await.unwrap(); } } diff --git a/tests/runner/src/compatibility_runner.rs b/tests/runner/src/compatibility_runner.rs index 1807b71772..2a0129c9ac 100644 --- a/tests/runner/src/compatibility_runner.rs +++ b/tests/runner/src/compatibility_runner.rs @@ -69,7 +69,7 @@ impl CompatibilityRunner { }, wal_config: WalConfig::RaftEngine, store_config: StoreConfig { - store_addrs: vec![], + store_addrs: vec!["127.0.0.1:2379".to_string()], setup_etcd: false, setup_pg: None, setup_mysql: None, @@ -100,13 +100,15 @@ impl CompatibilityRunner { } let bins_dir = Self::resolve_bins_dir(version).await?; + let mut store_config = self.store_config.clone(); + store_config.setup_etcd = phase == "1.feature"; let env = Env::new_bare( self.data_dir.clone(), self.server_addr.clone(), self.wal_config.clone(), self.pull_version_on_need, bins_dir.clone(), - self.store_config.clone(), + store_config, self.extra_args.clone(), ); diff --git a/tests/runner/src/server_mode.rs b/tests/runner/src/server_mode.rs index 172baf32ff..63a6733367 100644 --- a/tests/runner/src/server_mode.rs +++ b/tests/runner/src/server_mode.rs @@ -495,11 +495,8 @@ impl ServerMode { metasrv_addr, node_id, } => { - let data_home = sqlness_home.join(format!( - "greptimedb_{}_datanode_{}_{node_id}", - id, - db_ctx.time() - )); + let data_home = + sqlness_home.join(format!("greptimedb-{}-datanode-{}", id, node_id)); args.extend([ format!("--rpc-addr={rpc_bind_addr}"), format!("--rpc-server-addr={rpc_server_addr}"),