refactor(sqlsmith): refactor sqlsmith using http client (#16890)

* refactor(sqlsmith): refactor sqlsmith using http client * fix * rewrite HttpClient
databendlabs · Nov 23, 2024 · 221018b · 221018b
1 parent a2ce45c
commit 221018b
Show file tree

Hide file tree

Showing 10 changed files with 580 additions and 329 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -536,9 +536,6 @@ tracing-appender = "0.2.3"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "valuable"] }
 
 # Databend Integration Test
-databend-client = { version = "0.22" }
-databend-driver = { version = "0.22" }
-databend-driver-core = { version = "0.22" }
 msql-srv = "0.11.0"
 mysql_common = "0.32.4"
 quickcheck = "1.0"

diff --git a/src/query/expression/src/row/row_converter.rs b/src/query/expression/src/row/row_converter.rs
@@ -57,15 +57,17 @@ impl RowConverter {
 
     fn support_data_type(d: &DataType) -> bool {
         match d {
-            DataType::Array(_)
-            | DataType::EmptyArray
-            | DataType::EmptyMap
-            | DataType::Map(_)
-            | DataType::Bitmap
-            | DataType::Tuple(_)
-            | DataType::Generic(_) => false,
+            DataType::Null
+            | DataType::Boolean
+            | DataType::Number(_)
+            | DataType::Decimal(_)
+            | DataType::Timestamp
+            | DataType::Date
+            | DataType::Binary
+            | DataType::String
+            | DataType::Variant => true,
             DataType::Nullable(inner) => Self::support_data_type(inner.as_ref()),
-            _ => true,
+            _ => false,
         }
     }
 

diff --git a/src/tests/sqlsmith/Cargo.toml b/src/tests/sqlsmith/Cargo.toml
@@ -9,24 +9,26 @@ edition = { workspace = true }
 [dependencies]
 chrono-tz = { workspace = true }
 clap = { workspace = true }
-databend-client = { workspace = true }
+cookie = { workspace = true }
 databend-common-ast = { workspace = true }
+databend-common-exception = { workspace = true }
 databend-common-expression = { workspace = true }
 databend-common-formats = { workspace = true }
 databend-common-functions = { workspace = true }
 databend-common-io = { workspace = true }
 databend-common-sql = { workspace = true }
-databend-driver = { workspace = true }
-databend-driver-core = { workspace = true }
 ethnum = { workspace = true }
 itertools = { workspace = true }
 jiff = { workspace = true }
 jsonb = { workspace = true }
 rand = { workspace = true }
+reqwest = { workspace = true, features = ["cookies"] }
+serde = { workspace = true }
+serde_json = { workspace = true }
 tokio = { workspace = true }
-tokio-stream = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
+url = { workspace = true }
 
 [[bin]]
 name = "databend-sqlsmith"

diff --git a/src/tests/sqlsmith/src/bin/main.rs b/src/tests/sqlsmith/src/bin/main.rs
@@ -13,7 +13,10 @@
 // limitations under the License.
 
 use clap::Parser;
+use databend_common_exception::Result;
 use databend_sqlsmith::Runner;
+use tracing::metadata::LevelFilter;
+use tracing_subscriber::EnvFilter;
 
 #[derive(Clone, Debug, PartialEq, Eq, Parser)]
 #[clap(about, author)]
@@ -27,7 +30,7 @@ pub struct Args {
     port: u16,
 
     /// The test database.
-    #[clap(long, default_value = "default")]
+    #[clap(long, default_value = "sqlsmith_test")]
     db: String,
 
     /// The username.
@@ -48,15 +51,26 @@ pub struct Args {
 }
 
 #[tokio::main(flavor = "multi_thread", worker_threads = 5)]
-async fn main() {
-    tracing_subscriber::fmt::init();
+async fn main() -> Result<()> {
+    let filter = EnvFilter::builder()
+        .with_default_directive(LevelFilter::INFO.into())
+        .parse("")
+        .unwrap();
+    tracing_subscriber::fmt().with_env_filter(filter).init();
 
     let args = Args::parse();
+    let host = format!("http://{}:{}", args.host, args.port);
+    let mut runner = Runner::try_new(
+        host,
+        args.user.clone(),
+        args.pass.clone(),
+        args.db.clone(),
+        args.count,
+        None,
+        args.timeout,
+    )
+    .await?;
+    runner.run().await?;
 
-    let dsn = format!(
-        "databend://{}:{}@{}:{}/{}?sslmode=disable",
-        args.user, args.pass, args.host, args.port, args.db
-    );
-    let runner = Runner::new(dsn, args.count, None, args.timeout);
-    runner.run().await;
+    Ok(())
 }