refactor(sys): add stmt2.rs

Author: qevolg

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

@@ -21,6 +21,7 @@ pub mod error;
 pub mod query;
 pub mod sml;
 pub mod stmt;
+pub mod stmt2;
 pub mod stub;
 pub mod tmq;
 
@@ -32,6 +33,9 @@ pub type TAOS_ROW = *mut *mut c_void;
 #[allow(non_camel_case_types)]
 pub type TAOS_RES = c_void;
 
+#[allow(non_camel_case_types)]
+pub type __taos_async_fn_t = extern "C" fn(param: *mut c_void, res: *mut TAOS_RES, code: c_int);
+
 type TaosResult<T> = Result<T, TaosError>;
 
 #[repr(C)]

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

@@ -15,12 +15,10 @@ use tracing::trace;
 
 use crate::native::error::{set_err_and_get_code, TaosError, TaosMaybeError};
 use crate::native::{
-    ResultSet, ResultSetOperations, Row, TaosResult, TAOS, TAOS_FIELD, TAOS_RES, TAOS_ROW,
+    ResultSet, ResultSetOperations, Row, TaosResult, __taos_async_fn_t, TAOS, TAOS_FIELD, TAOS_RES,
+    TAOS_ROW,
 };
 
-#[allow(non_camel_case_types)]
-pub type __taos_async_fn_t = extern "C" fn(param: *mut c_void, res: *mut TAOS_RES, code: c_int);
-
 #[no_mangle]
 pub unsafe extern "C" fn taos_query(taos: *mut TAOS, sql: *const c_char) -> *mut TAOS_RES {
     taos_query_with_reqid(taos, sql, generate_req_id() as _)

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

@@ -0,0 +1,112 @@
+use std::ffi::{c_char, c_int, c_ulong, c_void};
+
+use crate::native::{__taos_async_fn_t, TAOS, TAOS_RES};
+
+#[allow(non_camel_case_types)]
+pub type TAOS_STMT2 = c_void;
+
+#[repr(C)]
+#[allow(non_camel_case_types)]
+#[allow(non_snake_case)]
+pub struct TAOS_STMT2_OPTION {
+    pub reqid: i64,
+    pub singleStbInsert: bool,
+    pub singleTableBindOnce: bool,
+    pub asyncExecFn: __taos_async_fn_t,
+    pub userdata: *mut c_void,
+}
+
+#[repr(C)]
+#[allow(non_camel_case_types)]
+pub struct TAOS_STMT2_BIND {
+    pub buffer_type: c_int,
+    pub buffer: *mut c_void,
+    pub length: *mut i32,
+    pub is_null: *mut c_char,
+    pub num: c_int,
+}
+
+#[repr(C)]
+#[allow(non_camel_case_types)]
+pub struct TAOS_STMT2_BINDV {
+    pub count: c_int,
+    pub tbnames: *mut *mut c_char,
+    pub tags: *mut *mut TAOS_STMT2_BIND,
+    pub bind_cols: *mut *mut TAOS_STMT2_BIND,
+}
+
+#[repr(C)]
+#[allow(non_camel_case_types)]
+pub struct TAOS_FIELD_ALL {
+    pub name: [c_char; 65],
+    pub r#type: i8,
+    pub precision: u8,
+    pub scale: u8,
+    pub bytes: i32,
+    pub field_type: u8,
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_init(
+    taos: *mut TAOS,
+    option: *mut TAOS_STMT2_OPTION,
+) -> *mut TAOS_STMT2 {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_prepare(
+    stmt: *mut TAOS_STMT2,
+    sql: *const c_char,
+    length: c_ulong,
+) -> c_int {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_bind_param(
+    stmt: *mut TAOS_STMT2,
+    bindv: *mut TAOS_STMT2_BINDV,
+    col_idx: i32,
+) -> c_int {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_exec(stmt: *mut TAOS_STMT2, affected_rows: *mut c_int) -> c_int {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_close(stmt: *mut TAOS_STMT2) -> c_int {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_is_insert(stmt: *mut TAOS_STMT2, insert: *mut c_int) -> c_int {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_get_fields(
+    stmt: *mut TAOS_STMT2,
+    count: *mut c_int,
+    fields: *mut *mut TAOS_FIELD_ALL,
+) -> c_int {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_free_fields(stmt: *mut TAOS_STMT2, fields: *mut TAOS_FIELD_ALL) {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_result(stmt: *mut TAOS_STMT2) -> *mut TAOS_RES {
+    todo!()
+}
+
+#[no_mangle]
+pub extern "C" fn taos_stmt2_error(stmt: *mut TAOS_STMT2) -> *mut c_char {
+    todo!()
+}

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

@@ -1,9 +1,7 @@
 #![allow(unused_variables)]
 
-use std::ffi::{c_char, c_int, c_ulong, c_void};
+use std::ffi::{c_char, c_int, c_void};
 
-use crate::native::query::__taos_async_fn_t;
-use crate::native::stmt::TAOS_FIELD_E;
 use crate::native::tmq::tmq_t;
 use crate::native::{TAOS, TAOS_FIELD, TAOS_RES};
 
@@ -189,39 +187,6 @@ pub extern "C" fn taos_set_config(config: *const c_char) -> setConfRet {
     todo!("taos_set_config");
 }
 
-#[allow(non_camel_case_types)]
-pub type TAOS_STMT2 = c_void;
-
-#[repr(C)]
-#[allow(non_snake_case)]
-#[allow(non_camel_case_types)]
-pub struct TAOS_STMT2_OPTION {
-    pub reqid: i64,
-    pub singleStbInsert: bool,
-    pub singleTableBindOnce: bool,
-    pub asyncExecFn: __taos_async_fn_t,
-    pub userdata: *mut c_void,
-}
-
-#[repr(C)]
-#[allow(non_camel_case_types)]
-pub struct TAOS_STMT2_BIND {
-    pub buffer_type: i32,
-    pub buffer: *mut c_void,
-    pub length: *mut i32,
-    pub is_null: *mut c_char,
-    pub num: i32,
-}
-
-#[repr(C)]
-#[allow(non_camel_case_types)]
-pub struct TAOS_STMT2_BINDV {
-    pub count: i32,
-    pub tbnames: *mut *mut c_char,
-    pub tags: *mut *mut TAOS_STMT2_BIND,
-    pub bind_cols: *mut *mut TAOS_STMT2_BIND,
-}
-
 #[repr(C)]
 #[allow(non_camel_case_types)]
 pub enum TAOS_FIELD_T {
@@ -242,86 +207,6 @@ pub struct TAOS_FIELD_STB {
     pub field_type: u8,
 }
 
-#[no_mangle]
-pub extern "C" fn taos_stmt2_init(
-    taos: *mut TAOS,
-    option: *mut TAOS_STMT2_OPTION,
-) -> *mut TAOS_STMT2 {
-    todo!("taos_stmt2_init");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_prepare(
-    stmt: *mut TAOS_STMT2,
-    sql: *const c_char,
-    length: c_ulong,
-) -> i32 {
-    todo!("taos_stmt2_prepare");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_bind_param(
-    stmt: *mut TAOS_STMT2,
-    bindv: *mut TAOS_STMT2_BINDV,
-    col_idx: i32,
-) -> i32 {
-    todo!("taos_stmt2_bind_param");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_exec(stmt: *mut TAOS_STMT2, affected_rows: *mut i32) -> i32 {
-    todo!("taos_stmt2_exec");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_close(stmt: *mut TAOS_STMT2) -> i32 {
-    todo!("taos_stmt2_close");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_is_insert(stmt: *mut TAOS_STMT2, insert: *mut i32) -> i32 {
-    todo!("taos_stmt2_is_insert");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_result(stmt: *mut TAOS_STMT2) -> *mut TAOS_RES {
-    todo!("taos_stmt2_result");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_error(stmt: *mut TAOS_STMT2) -> *const c_char {
-    todo!("taos_stmt2_error");
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_get_fields(
-    stmt: *mut TAOS_STMT2,
-    field_type: TAOS_FIELD_T,
-    count: *mut i32,
-    fields: *mut *mut TAOS_FIELD_E,
-) -> i32 {
-    todo!("taos_stmt2_get_fields")
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_get_stb_fields(
-    stmt: *mut TAOS_STMT2,
-    count: *mut i32,
-    fields: *mut *mut TAOS_FIELD_STB,
-) -> i32 {
-    todo!("taos_stmt2_get_stb_fields")
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_free_fields(stmt: *mut TAOS_STMT2, fields: *mut TAOS_FIELD_E) {
-    todo!("taos_stmt2_free_fields")
-}
-
-#[no_mangle]
-pub extern "C" fn taos_stmt2_free_stb_fields(stmt: *mut TAOS_STMT2, fields: *mut TAOS_FIELD_STB) {
-    todo!("taos_stmt2_free_stb_fields")
-}
-
 #[allow(non_camel_case_types)]
 pub type __taos_async_whitelist_fn_t = extern "C" fn(
     param: *mut c_void,