Merge pull request #245 from taosdata/fix/TD-26154-ws-stop-query-crash

fix: ws stop query crash

Author: zitsen

taos-ws-sys/README.md

@@ -7,3 +7,15 @@ cargo build --release -p taos-ws-sys
 #   libtaosws.so/libtaosws.a in target/libtaosws/ directory.
 ls target/libtaosws*
 ```
+
+Build with tls support:
+
+```sh
+cargo build --release -p taos-ws-sys --features native-tls-vendored
+```
+
+Use libtaosws in taos cli:
+
+```sh
+LD_LIBRARY_PATH=/$home/taos-connector-rust/target/release taos -E "http://localhost:6041"
+```

taos-ws-sys/src/lib.rs

@@ -413,7 +413,7 @@ impl WsResultSet {
     }
 
     fn stop_query(&mut self) {
-        futures::executor::block_on(self.rs.stop());
+        taos_query::block_in_place_or_global(self.rs.stop());
     }
 }
 
@@ -1089,4 +1089,49 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_stop_query() {
+        init_env();
+        unsafe {
+            let taos = ws_connect_with_dsn(b"http://localhost:6041\0" as *const u8 as _);
+            if taos.is_null() {
+                let code = ws_errno(taos);
+                assert!(code != 0);
+                let str = ws_errstr(taos);
+                dbg!(CStr::from_ptr(str));
+            }
+            assert!(!taos.is_null());
+
+            macro_rules! execute {
+                ($sql:expr) => {
+                    let sql = $sql as *const u8 as _;
+                    let rs = ws_query(taos, sql);
+                    let code = ws_errno(rs);
+                    assert!(code == 0, "{:?}", CStr::from_ptr(ws_errstr(rs)));
+                    ws_free_result(rs);
+                };
+            }
+
+            execute!(b"drop database if exists ws_stop_query\0");
+            execute!(b"create database ws_stop_query keep 36500\0");
+            execute!(b"create table ws_stop_query.s1 (ts timestamp, v int, b binary(100))\0");
+
+            let version = ws_get_server_info(taos);
+            dbg!(CStr::from_ptr(version as _));
+
+            let res = ws_query(taos, b"select count(*) from ws_stop_query.s1\0" as *const u8 as _);
+            let cols = ws_field_count(res);
+            dbg!(cols);
+            let fields = ws_fetch_fields(res);
+
+            for field in std::slice::from_raw_parts(fields, cols as usize) {
+                dbg!(field);
+            }
+
+            ws_stop_query(res);
+
+            execute!(b"drop database if exists ws_stop_query\0");
+        }
+    }
 }