refactor: move database client to tests/common

Cargo.toml

@@ -59,6 +59,7 @@ members = [
     "src/index",
     "tests-fuzz",
     "tests-integration",
+    "tests/common",
     "tests/runner",
 ]
 resolver = "2"
@@ -233,8 +234,7 @@ sql = { path = "src/sql" }
 store-api = { path = "src/store-api" }
 substrait = { path = "src/common/substrait" }
 table = { path = "src/table" }
-# TODO some code depends on this
-tests-integration = { path = "tests-integration" }
+tests-common = { path = "tests/common" }
 
 [workspace.dependencies.meter-macros]
 git = "https://github.com/GreptimeTeam/greptime-meter.git"

benchmarks/Cargo.toml

@@ -33,8 +33,6 @@ rand.workspace = true
 rskafka.workspace = true
 serde.workspace = true
 store-api.workspace = true
-# TODO depend `Database` client
-tests-integration.workspace = true
 tokio.workspace = true
 toml.workspace = true
 uuid.workspace = true

src/meta-srv/Cargo.toml

@@ -61,7 +61,7 @@ url = "2.3"
 
 [dev-dependencies]
 chrono.workspace = true
-client = { workspace = true, features = ["testing"] }
+client.workspace = true
 common-meta = { workspace = true, features = ["testing"] }
 common-procedure-test.workspace = true
 session.workspace = true

src/servers/Cargo.toml

@@ -125,8 +125,7 @@ serde_json.workspace = true
 session = { workspace = true, features = ["testing"] }
 table.workspace = true
 tempfile = "3.0.0"
-# TODO depend `Database` client
-tests-integration.workspace = true
+tests-common.workspace = true
 tokio-postgres = "0.7"
 tokio-postgres-rustls = "0.11"
 tokio-test = "0.4"

src/servers/tests/grpc/mod.rs

@@ -31,7 +31,7 @@ use servers::server::Server;
 use snafu::ResultExt;
 use table::test_util::MemTable;
 use table::TableRef;
-use tests_integration::database::Database;
+use tests_common::database::Database;
 use tokio::net::TcpListener;
 use tokio_stream::wrappers::TcpListenerStream;
 use tonic::codec::CompressionEncoding;

tests-integration/Cargo.toml

@@ -69,6 +69,7 @@ sqlx = { version = "0.6", features = [
 substrait.workspace = true
 table.workspace = true
 tempfile.workspace = true
+tests-common.workspace = true
 time = "0.3"
 tokio.workspace = true
 tokio-stream = { workspace = true, features = ["net"] }

tests-integration/src/lib.rs

@@ -15,7 +15,6 @@
 #![feature(assert_matches)]
 
 pub mod cluster;
-pub mod database;
 mod grpc;
 mod influxdb;
 mod instance;

tests-integration/src/test_util.rs

@@ -55,8 +55,8 @@ use servers::server::Server;
 use servers::tls::ReloadableTlsServerConfig;
 use servers::Mode;
 use session::context::QueryContext;
+use tests_common::database::Database;
 
-use crate::database::Database;
 use crate::standalone::{GreptimeDbStandalone, GreptimeDbStandaloneBuilder};
 
 pub const PEER_PLACEHOLDER_ADDR: &str = "127.0.0.1:3001";

tests-integration/tests/grpc.rs

@@ -36,7 +36,7 @@ use servers::http::prometheus::{
 };
 use servers::server::Server;
 use servers::tls::{TlsMode, TlsOption};
-use tests_integration::database::Database;
+use tests_common::database::Database;
 use tests_integration::test_util::{
     setup_grpc_server, setup_grpc_server_with, setup_grpc_server_with_user_provider, StorageType,
 };

tests/common/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "tests-common"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+api.workspace = true
+arrow-flight.workspace = true
+async-stream.workspace = true
+async-trait = "0.1"
+client.workspace = true
+common-error.workspace = true
+common-grpc.workspace = true
+common-query.workspace = true
+common-recordbatch.workspace = true
+common-telemetry.workspace = true
+futures.workspace = true
+futures-util.workspace = true
+prost.workspace = true
+snafu.workspace = true
+tonic.workspace = true
+
+[dev-dependencies]
+clap.workspace = true
+cmd.workspace = true
+common-catalog.workspace = true
+common-telemetry.workspace = true
+tempfile.workspace = true
+tokio.workspace = true

tests/common/src/lib.rs

@@ -0,0 +1,15 @@
+// Copyright 2024 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod database;

tests/runner/Cargo.toml

@@ -19,7 +19,6 @@ serde.workspace = true
 serde_json.workspace = true
 sqlness = { version = "0.5" }
 tempfile.workspace = true
-# TODO depend `Database` client
-tests-integration.workspace = true
+tests-common.workspace = true
 tinytemplate = "1.2"
 tokio.workspace = true

tests/runner/src/env.rs

@@ -30,7 +30,7 @@ use common_query::{Output, OutputData};
 use common_recordbatch::RecordBatches;
 use serde::Serialize;
 use sqlness::{Database, EnvController, QueryContext};
-use tests_integration::database::Database as DB;
+use tests_common::database::Database as DB;
 use tinytemplate::TinyTemplate;
 use tokio::sync::Mutex as TokioMutex;