refactor(sys): add logger and format code

Author: qevolg

taos-ws-sys/Cargo.toml

@@ -12,6 +12,7 @@ crate-type = ["cdylib", "staticlib"]
 anyhow = "1"
 bytes = "1.1.0"
 cargo_metadata = "0.18.1"
+ctor = "0.2.9"
 futures = { version = "0.3", features = ["executor"] }
 once_cell = "1.20.2"
 pretty_env_logger = "0.5.0"
@@ -20,14 +21,12 @@ taos-error = { path = "../taos-error" }
 taos-query = { path = "../taos-query" }
 taos-ws = { path = "../taos-ws" }
 tracing = { version = "0.1", features = ["log"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 
 [build-dependencies]
 cbindgen = "0.27.0"
 syn = { version = "2.0.91", features = ["full", "visit"] }
 
-[dev-dependencies]
-pretty_env_logger = "0.5.0"
-
 [features]
 default = ["rustls", "rustls-ring-crypto-provider"]
 

taos-ws-sys/src/native/mod.rs

@@ -1,7 +1,6 @@
 #![allow(unused_variables)]
 
 use std::ffi::{c_char, c_int, c_void, CStr};
-use std::ptr::{null, null_mut};
 use std::sync::RwLock;
 
 use error::{set_err_and_get_code, Error};
@@ -38,7 +37,7 @@ pub unsafe extern "C" fn taos_connect(
         Ok(taos) => Box::into_raw(Box::new(taos)) as _,
         Err(err) => {
             set_err_and_get_code(err);
-            null_mut()
+            std::ptr::null_mut()
         }
     }
 }
@@ -162,7 +161,7 @@ pub unsafe extern "C" fn taos_options(
 pub extern "C" fn taos_data_type(r#type: c_int) -> *const c_char {
     match Ty::from_u8_option(r#type as _) {
         Some(ty) => ty.tsdb_name(),
-        None => null(),
+        None => std::ptr::null(),
     }
 }
 

taos-ws-sys/src/ws/mod.rs

@@ -425,7 +425,7 @@ impl From<&Field> for WS_FIELD {
 pub struct ROW {
     /// Data is used to hold the row data
     data: Vec<*const c_void>,
-    /// current row to get
+    /// Current row to get
     current_row: usize,
 }
 

taos-ws-sys/tests/Makefile

@@ -1,6 +1,16 @@
-DEBUG_PATH=../../target/debug
-FLAGS=-I${DEBUG_PATH} -L${DEBUG_PATH} -Wl,-rpath=${DEBUG_PATH} -ltaosws
+DEBUG_PATH := ../../target/debug
+LINK_FLAGS := -I$(DEBUG_PATH) -L$(DEBUG_PATH) -ltaosws
+
+OS := $(shell uname)
+
+ifeq ($(OS), Linux)
+    export LD_LIBRARY_PATH=$(DEBUG_PATH)
+else ifeq ($(OS), Darwin)
+    export DYLD_LIBRARY_PATH=$(DEBUG_PATH)
+else
+    $(error Unsupported OS: $(OS))
+endif
 
 test_native:
-	gcc -g test_native.c ${FLAGS} -o ${DEBUG_PATH}/test_native
-	./${DEBUG_PATH}/test_native
+	gcc -g test_native.c $(LINK_FLAGS) -o $(DEBUG_PATH)/test_native
+	./$(DEBUG_PATH)/test_native

taos-ws-sys/tests/test_native.c

@@ -3,8 +3,6 @@
 
 int main()
 {
-    init_log();
-
     int code = taos_options(TSDB_OPTION_LOCALE, NULL, "group.id", "10s", "enable.auto.commit", "false", NULL);
     assert(code == 0);