release 0.3.9

Author: manlge

Cargo.toml

@@ -23,8 +23,8 @@ keywords = ["iotdb", "iotdb-client-rust", "apache-iotdb"]
 license = "Apache-2.0"
 name = "iotdb-client-rs"
 readme = "README.md"
-repository = "https://github.com/manlge/iotdb-client-rs.git"
-version = "0.3.8"
+repository = "https://github.com/iotdb-lab/iotdb-client-rs.git"
+version = "0.3.9"
 
 [lib]
 name = "iotdb"

README.md

@@ -61,7 +61,7 @@ Put this in your `Cargo.toml`:
 
 ```toml
 [dependencies]
-iotdb-client-rs="^0.3.8"
+iotdb-client-rs="^0.3.9"
 ```
 
 ## Example
@@ -70,7 +70,7 @@ Put this in your example's `Cargo.toml`:
 
 ```toml
 [dependencies]
-iotdb-client-rs="^0.3.8"
+iotdb-client-rs="^0.3.9"
 chrono="0.4.19"
 prettytable-rs="0.8.0"
 structopt = "0.3.25"

src/client/mod.rs

@@ -362,7 +362,7 @@ pub trait Session<'a> {
 
     fn insert_records(
         &mut self,
-        device_ids: Vec<&str>,
+        prefix_path: Vec<&str>,
         measurements: Vec<Vec<&str>>,
         values: Vec<Vec<Value>>,
         timestamps: Vec<i64>,

src/client/remote.rs

@@ -18,6 +18,7 @@
 //
 
 use std::collections::{BTreeMap, HashMap};
+use std::error::Error;
 use std::vec;
 use thrift::transport::TIoChannel;
 
@@ -94,38 +95,38 @@ impl<'a> RpcSession {
     pub fn new(config: &Config) -> Result<Self> {
         let mut tcp_channel = TTcpChannel::new();
         let endpint = format!("{}:{}", config.host, config.port);
-        match tcp_channel.open(&endpint) {
-            Ok(_) => {
-                let (i_chan, o_chan) = tcp_channel.split()?;
-
-                let (i_prot, o_prot) = (
-                    TFramedReadTransport::new(i_chan),
-                    TFramedWriteTransport::new(o_chan),
-                );
-
-                let (input_protocol, output_protocol): (
-                    Box<dyn TInputProtocol>,
-                    Box<dyn TOutputProtocol>,
-                ) = match config.enable_compression {
-                    false => (
-                        Box::new(TBinaryInputProtocol::new(i_prot, true)),
-                        Box::new(TBinaryOutputProtocol::new(o_prot, true)),
-                    ),
-                    true => (
-                        Box::new(TCompactInputProtocol::new(i_prot)),
-                        Box::new(TCompactOutputProtocol::new(o_prot)),
-                    ),
-                };
 
-                Ok(Self {
-                    config: config.clone(),
-                    session_id: None,
-                    statement_id: -1,
-                    client: TSIServiceSyncClient::new(input_protocol, output_protocol),
-                })
-            }
-            Err(err) => Err(format!("failed to connect to {}, {:?}", endpint, err).into()),
-        }
+        tcp_channel.open(&endpint).map_err(|err| {
+            Box::<dyn Error>::from(
+                format!("failed to connect to {}, {:?}", endpint, err).to_string(),
+            )
+        })?;
+
+        let (i_chan, o_chan) = tcp_channel.split()?;
+
+        let (i_prot, o_prot) = (
+            TFramedReadTransport::new(i_chan),
+            TFramedWriteTransport::new(o_chan),
+        );
+
+        let (input_protocol, output_protocol): (Box<dyn TInputProtocol>, Box<dyn TOutputProtocol>) =
+            match config.enable_compression {
+                false => (
+                    Box::new(TBinaryInputProtocol::new(i_prot, true)),
+                    Box::new(TBinaryOutputProtocol::new(o_prot, true)),
+                ),
+                true => (
+                    Box::new(TCompactInputProtocol::new(i_prot)),
+                    Box::new(TCompactOutputProtocol::new(o_prot)),
+                ),
+            };
+
+        Ok(Self {
+            config: config.clone(),
+            session_id: None,
+            statement_id: -1,
+            client: TSIServiceSyncClient::new(input_protocol, output_protocol),
+        })
     }
 }
 
@@ -237,6 +238,7 @@ pub struct RpcDataSet<'a> {
 }
 
 impl<'a> RpcDataSet<'a> {
+    #[allow(dead_code)]
     fn is_null(&self, column_index: usize, row_index: usize) -> bool {
         let bitmap = self.bitmaps[column_index];
         let shift = row_index % 8;
@@ -838,7 +840,7 @@ impl<'a> Session<'a> for RpcSession {
 
     fn insert_records(
         &mut self,
-        device_ids: Vec<&str>,
+        prefix_path: Vec<&str>,
         measurements: Vec<Vec<&str>>,
         values: Vec<Vec<super::Value>>,
         timestamps: Vec<i64>,
@@ -857,7 +859,7 @@ impl<'a> Session<'a> for RpcSession {
                 .collect();
             let status = self.client.insert_records(TSInsertRecordsReq {
                 session_id: session_id,
-                prefix_paths: device_ids.iter().map(ToString::to_string).collect(),
+                prefix_paths: prefix_path.iter().map(ToString::to_string).collect(),
                 measurements_list: measurements
                     .iter()
                     .map(|ms| ms.iter().map(ToString::to_string).collect())
@@ -919,13 +921,7 @@ impl<'a> Session<'a> for RpcSession {
                             .collect()
                     })
                     .collect(),
-                values_list: tablets
-                    .iter()
-                    .map(|tablet| {
-                        let values: Vec<u8> = (*tablet).into();
-                        values
-                    })
-                    .collect(),
+                values_list: tablets.iter().map(|tablet| Into::into(*tablet)).collect(),
                 timestamps_list: tablets
                     .iter()
                     .map(|tablet| {

src/client/rpc.rs

@@ -24,6 +24,7 @@
 #![allow(unused_extern_crates)]
 #![allow(clippy::too_many_arguments, clippy::type_complexity, clippy::vec_box)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(dead_code)]
 
 use std::cell::RefCell;
 use std::collections::{BTreeMap, BTreeSet};

src/lib.rs

@@ -21,9 +21,70 @@ pub mod protocal;
 
 #[cfg(test)]
 mod tests {
+    use crate::client::Value;
+    use std::vec::Vec;
+
+    #[test]
+    fn test_value_to_string() {
+        let values = vec![
+            Value::Bool(true),
+            Value::Int32(1),
+            Value::Int64(2),
+            Value::Float(3.1),
+            Value::Double(4.1),
+            Value::Text(String::from("iotdb")),
+            Value::Null,
+        ];
+
+        let strings = vec!["true", "1", "2", "3.1", "4.1", "iotdb", "null"];
+
+        for (v, s) in values.into_iter().zip(strings.into_iter()) {
+            assert_eq!(v.to_string(), s);
+        }
+    }
+
     #[test]
-    fn it_works() {
-        let result = 2 + 2;
-        assert_eq!(result, 4);
+    fn test_value_into() {
+        let values = vec![
+            Value::Bool(true),
+            Value::Int32(1),
+            Value::Int64(2),
+            Value::Float(3.1),
+            Value::Double(4.1),
+            Value::Text(String::from("iotdb")),
+        ];
+
+        let bytes = vec![
+            vec![0u8, 1u8],
+            vec![vec![1u8], 1_i32.to_be_bytes().to_vec()]
+                .into_iter()
+                .flatten()
+                .collect(),
+            vec![vec![2u8], 2_i64.to_be_bytes().to_vec()]
+                .into_iter()
+                .flatten()
+                .collect(),
+            vec![vec![3u8], 3.1_f32.to_be_bytes().to_vec()]
+                .into_iter()
+                .flatten()
+                .collect(),
+            vec![vec![4u8], 4.1_f64.to_be_bytes().to_vec()]
+                .into_iter()
+                .flatten()
+                .collect(),
+            vec![
+                vec![5u8],                    //datatype text
+                5_i32.to_be_bytes().to_vec(), //len of iotdb
+                "iotdb".to_string().as_bytes().to_vec(),
+            ]
+            .into_iter()
+            .flatten()
+            .collect(),
+        ];
+
+        for (v, bys) in values.into_iter().zip(bytes.into_iter()) {
+            let value_bys: Vec<u8> = (&v).into();
+            assert_eq!(value_bys, bys);
+        }
     }
 }