1.0.0 candidate

Author: tephrocactus

Cargo.lock

@@ -1,19 +1,11 @@
 [package]
 name = "chdb-rust"
-version = "0.7.0"
+version = "1.0.0"
 edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+keywords = ["clickhouse", "chdb", "database", "embedded", "analytics"]
 
 [dependencies]
 thiserror = "1"
-serde = { version = "1", features = ["derive"] }
-tracing = { version="0.1", features=["log"] }
-
 
 [build-dependencies]
-bindgen = "0.65.1"
-
-[dev-dependencies]
-tracing-subscriber = { version="0.3.16", features=["env-filter"] }
-clap = { version = "4", features = ["derive"] }
+bindgen = "0.70.1"

Cargo.toml

@@ -13,5 +13,4 @@ Experimental [chDB](https://github.com/chdb-io/chdb) FFI bindings for Rust
 ```bash
 ./update_libchdb.sh
 RUST_BACKTRACE=full cargo build --verbose
-cargo run --example basic
 ```

README.md

@@ -4,11 +4,10 @@ fn main() {
     // Tell cargo to look for shared libraries in the specified directory
     println!("cargo:rustc-link-search=./");
 
-    // Tell cargo to tell rustc to link the system bzip2
-    // shared library.
+    // Tell cargo to tell rustc to link the system chdb library.
     println!("cargo:rustc-link-lib=chdb");
 
-    // Tell cargo to invalidate the built crate whenever the wrapper changes
+    // Tell cargo to invalidate the built crate whenever the wrapper changes.
     println!("cargo:rerun-if-changed=chdb.h");
 
     // The bindgen::Builder is the main entry point
@@ -20,7 +19,7 @@ fn main() {
         .header("chdb.h")
         // Tell cargo to invalidate the built crate whenever any of the
         // included header files changed.
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
         // Finish the builder and generate the bindings.
         .generate()
         // Unwrap the Result and panic on failure.
@@ -31,4 +30,4 @@ fn main() {
     bindings
         .write_to_file(out_path.join("bindings.rs"))
         .expect("Couldn't write bindings!");
-}
+}

build.rs

@@ -0,0 +1,53 @@
+use std::borrow::Cow;
+use std::ffi::CString;
+
+use crate::error::Error;
+use crate::format::InputFormat;
+use crate::format::OutputFormat;
+use crate::log_level::LogLevel;
+
+#[derive(Debug)]
+pub enum Arg<'a> {
+    /// --config-file=<value>
+    ConfigFilePath(Cow<'a, str>),
+    /// --database=<value>
+    Database(Cow<'a, str>),
+    /// --log-level=<value>
+    LogLevel(LogLevel),
+    /// --input-format=<value>
+    InputFormat(InputFormat),
+    /// --output-format=<value>
+    OutputFormat(OutputFormat),
+    /// --multiquery
+    MultiQuery,
+    /// Custom argument.
+    ///
+    /// "--path=/tmp/chdb" translates into one of the following:
+    /// 1. Arg::Custom("path".to_string().into(), Some("/tmp/chdb".to_string().into())).
+    /// 2. Arg::Custom("path".into(), Some("/tmp/chdb".into())).
+    ///
+    /// "--multiline" translates into one of the following:
+    /// 1. Arg::Custom("multiline".to_string().into(), None).
+    /// 2. Arg::Custom("multiline".into(), None).
+    ///
+    /// We should tell user where to look for officially supported arguments.
+    /// Here is some hint for now: https://github.com/fixcik/chdb-rs/blob/master/OPTIONS.md .
+    Custom(Cow<'a, str>, Option<Cow<'a, str>>),
+}
+
+impl<'a> Arg<'a> {
+    pub(crate) fn to_cstring(&self) -> Result<CString, Error> {
+        Ok(match self {
+            Self::ConfigFilePath(v) => CString::new(format!("--config-file={}", v)),
+            Self::Database(v) => CString::new(format!("--database={}", v)),
+            Self::LogLevel(v) => CString::new(format!("--log-level={}", v.as_str())),
+            Self::InputFormat(v) => CString::new(format!("--input-format={}", v.as_str())),
+            Self::OutputFormat(v) => CString::new(format!("--output-format={}", v.as_str())),
+            Self::MultiQuery => CString::new("-n"),
+            Self::Custom(k, v) => match v {
+                None => CString::new(k.as_ref()),
+                Some(v) => CString::new(format!("--{}={}", k, v)),
+            },
+        }?)
+    }
+}