From ec4582ba4529089239dbd5554cfaeedc09ac5264 Mon Sep 17 00:00:00 2001 From: suzumiya Date: Thu, 30 Nov 2023 16:32:17 +0800 Subject: [PATCH] enh: stmt use /ws endpoints --- taos-ws/src/stmt/mod.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/taos-ws/src/stmt/mod.rs b/taos-ws/src/stmt/mod.rs index 5b1564de..6d14fcc0 100644 --- a/taos-ws/src/stmt/mod.rs +++ b/taos-ws/src/stmt/mod.rs @@ -14,7 +14,6 @@ use taos_query::{block_in_place_or_global, IntoDsn, RawBlock}; use taos_query::prelude::tokio; use tokio::sync::{oneshot, watch}; -use tokio_tungstenite::connect_async; use tokio_tungstenite::tungstenite::protocol::Message; use crate::query::infra::ToMessage; @@ -258,9 +257,7 @@ impl Drop for Stmt { impl Stmt { pub(crate) async fn from_wsinfo(info: &TaosBuilder) -> RawResult { - let (ws, _) = connect_async(info.to_stmt_url()) - .await - .map_err(Error::from)?; + let ws = info.build_stream(info.to_stmt_url()).await?; let req_id = 0; let (mut sender, mut reader) = ws.split(); @@ -735,15 +732,19 @@ mod tests { taos.exec("create table ws_stmt_sj2.stb (ts timestamp, v int) tags(tj json)") .await?; - std::env::set_var("RUST_LOG", "debug"); + std::env::set_var("RUST_LOG", "trace"); // pretty_env_logger::init(); let mut client = Stmt::from_dsn("taos+ws://localhost:6041/ws_stmt_sj2").await?; let stmt = client .s_stmt("insert into ? using stb tags(?) values(?, ?)") .await?; - // let tag_fields = stmt.stmt_get_tag_fields().await; - // dbg!(tag_fields); + let tag_fields = stmt.stmt_get_tag_fields().await; + if let Err(err) = tag_fields { + log::error!("tag fields error: {:?}", err); + } else { + log::debug!("tag fields: {:?}", tag_fields); + } stmt.stmt_set_tbname("tb1").await?;