optional timeouts

suharev7 · Oct 6, 2019 · 2ad2a8b · 2ad2a8b
1 parent 922dca7
commit 2ad2a8b
Show file tree

Hide file tree

Showing 21 changed files with 228 additions and 169 deletions.
diff --git a/src/binary/read_ex.rs b/src/binary/read_ex.rs
@@ -62,8 +62,11 @@ where
 
         if str_len <= MAX_STACK_BUFFER_LEN {
             unsafe {
-                let mut buffer: [MaybeUninit<u8>; MAX_STACK_BUFFER_LEN] = MaybeUninit::uninit().assume_init();
-                self.read_bytes(&mut *(&mut buffer[..str_len] as *mut [MaybeUninit<u8>] as *mut [u8]))?;
+                let mut buffer: [MaybeUninit<u8>; MAX_STACK_BUFFER_LEN] =
+                    MaybeUninit::uninit().assume_init();
+                self.read_bytes(
+                    &mut *(&mut buffer[..str_len] as *mut [MaybeUninit<u8>] as *mut [u8]),
+                )?;
             }
         } else {
             let mut buffer = vec![0_u8; str_len];

diff --git a/src/io/transport.rs b/src/io/transport.rs
@@ -134,9 +134,7 @@ impl ClickhouseTransport {
                 // Data is consumed
                 let new_len = self.rd.len() - pos;
                 unsafe {
-                    ptr::copy(self.rd.as_ptr().add(pos),
-                              self.rd.as_mut_ptr(),
-                              new_len);
+                    ptr::copy(self.rd.as_ptr().add(pos), self.rd.as_mut_ptr(), new_len);
                     self.rd.set_len(new_len);
                 }
             }

diff --git a/src/lib.rs b/src/lib.rs
@@ -208,7 +208,6 @@ macro_rules! row {
     };
 }
 
-#[macro_export]
 macro_rules! try_opt {
     ($expr:expr) => {
         match $expr {
@@ -526,17 +525,19 @@ impl ClientHandle {
     }
 }
 
-fn with_timeout<F>(f: F, timeout: Option<Duration>, release_pool: PoolBinding) -> BoxFuture<F::Item>
+pub(crate) fn with_timeout<F>(
+    f: F,
+    timeout: Option<Duration>,
+    release_pool: PoolBinding,
+) -> BoxFuture<F::Item>
 where
     F: Future<Error = Error> + Send + 'static,
 {
     if let Some(timeout) = timeout {
-        Box::new(f
-            .timeout(timeout)
-            .map_err(move |err| {
-                release_pool.release_conn();
-                err.into()
-            }))
+        Box::new(f.timeout(timeout).map_err(move |err| {
+            release_pool.release_conn();
+            err.into()
+        }))
     } else {
         Box::new(f.map_err(move |err| {
             release_pool.release_conn();

diff --git a/src/pool/mod.rs b/src/pool/mod.rs
@@ -300,7 +300,13 @@ mod test {
 
     use tokio::prelude::*;
 
-    use crate::{ClientHandle, errors::Error, io::BoxFuture, test_misc::DATABASE_URL, types::{Block, Options}};
+    use crate::{
+        errors::Error,
+        io::BoxFuture,
+        test_misc::DATABASE_URL,
+        types::{Block, Options},
+        ClientHandle,
+    };
 
     use super::Pool;
 
@@ -472,7 +478,8 @@ mod test {
         let test_db_url = format!("{}{}", DATABASE_URL.as_str(), "&query_timeout=10ms");
         let pool = Pool::new(test_db_url.to_string());
 
-        let done = pool.get_handle()
+        let done = pool
+            .get_handle()
             .and_then(|c| c.query("SELECT sleep(10)").fetch_all());
 
         run(done).unwrap_err();
@@ -487,12 +494,10 @@ mod test {
     fn test_wrong_insert() {
         let pool = Pool::new(DATABASE_URL.as_str());
 
-        let done = pool
-            .get_handle()
-            .and_then(|c| {
-                let block = Block::new();
-                c.insert("unexisting", block)
-            });
+        let done = pool.get_handle().and_then(|c| {
+            let block = Block::new();
+            c.insert("unexisting", block)
+        });
 
         run(done).unwrap_err();
 
@@ -508,9 +513,7 @@ mod test {
 
         let done = pool
             .get_handle()
-            .and_then(|c| {
-                c.execute("DROP TABLE unexisting")
-            });
+            .and_then(|c| c.execute("DROP TABLE unexisting"));
 
         run(done).unwrap_err();
 

diff --git a/src/types/block/builder.rs b/src/types/block/builder.rs
@@ -3,14 +3,13 @@ use std::borrow::Cow;
 use chrono_tz::Tz;
 
 use crate::{
-    Block,
     errors::{Error, FromSqlError},
     types::{
         block::ColumnIdx,
         column::{ArcColumnWrapper, ColumnData, Either},
-        Column,
-        Value
+        Column, Value,
     },
+    Block,
 };
 
 pub trait RowBuilder {
@@ -89,7 +88,11 @@ fn put_param(key: Cow<'static, str>, value: Value, block: &mut Block) -> Result<
 
                 let column = Column {
                     name: key.clone().into(),
-                    data: ColumnData::from_type::<ArcColumnWrapper>(sql_type, timezone, block.capacity)?,
+                    data: ColumnData::from_type::<ArcColumnWrapper>(
+                        sql_type,
+                        timezone,
+                        block.capacity,
+                    )?,
                 };
 
                 block.columns.push(column);
@@ -109,17 +112,15 @@ fn extract_timezone(value: &Value) -> Tz {
     match value {
         Value::Date(_, tz) => *tz,
         Value::DateTime(_, tz) => *tz,
-        Value::Nullable(Either::Right(d)) => {
-            extract_timezone(&&d)
-        }
+        Value::Nullable(Either::Right(d)) => extract_timezone(&&d),
         Value::Array(_, data) => {
             if let Some(v) = data.first() {
                 extract_timezone(v)
             } else {
                 Tz::Zulu
             }
         }
-        _ => Tz::Zulu
+        _ => Tz::Zulu,
     }
 }
 
@@ -128,7 +129,10 @@ mod test {
     use chrono::prelude::*;
     use chrono_tz::Tz::{self, UTC};
 
-    use crate::{row, types::{Decimal, SqlType}};
+    use crate::{
+        row,
+        types::{Decimal, SqlType},
+    };
 
     use super::*;
 
@@ -140,29 +144,31 @@ mod test {
         let decimal = Decimal::of(2.0_f64, 4);
 
         let mut block = Block::new();
-        block.push(row!{
-            i8_field: 1_i8,
-            i16_field: 1_i16,
-            i32_field: 1_i32,
-            i64_field: 1_i64,
+        block
+            .push(row! {
+                i8_field: 1_i8,
+                i16_field: 1_i16,
+                i32_field: 1_i32,
+                i64_field: 1_i64,
 
-            u8_field: 1_u8,
-            u16_field: 1_u16,
-            u32_field: 1_u32,
-            u64_field: 1_u64,
+                u8_field: 1_u8,
+                u16_field: 1_u16,
+                u32_field: 1_u32,
+                u64_field: 1_u64,
 
-            f32_field: 4.66_f32,
-            f64_field: 2.71_f64,
+                f32_field: 4.66_f32,
+                f64_field: 2.71_f64,
 
-            str_field: "text",
-            opt_filed: Some("text"),
-            nil_filed: Option::<&str>::None,
+                str_field: "text",
+                opt_filed: Some("text"),
+                nil_filed: Option::<&str>::None,
 
-            date_field: date_value,
-            date_time_field: date_time_value,
+                date_field: date_value,
+                date_time_field: date_time_value,
 
-            decimal_field: decimal
-        }).unwrap();
+                decimal_field: decimal
+            })
+            .unwrap();
 
         assert_eq!(block.row_count(), 1);
 
@@ -180,11 +186,17 @@ mod test {
         assert_eq!(block.columns[9].sql_type(), SqlType::Float64);
 
         assert_eq!(block.columns[10].sql_type(), SqlType::String);
-        assert_eq!(block.columns[11].sql_type(), SqlType::Nullable(SqlType::String.into()));
-        assert_eq!(block.columns[12].sql_type(), SqlType::Nullable(SqlType::String.into()));
+        assert_eq!(
+            block.columns[11].sql_type(),
+            SqlType::Nullable(SqlType::String.into())
+        );
+        assert_eq!(
+            block.columns[12].sql_type(),
+            SqlType::Nullable(SqlType::String.into())
+        );
 
         assert_eq!(block.columns[13].sql_type(), SqlType::Date);
         assert_eq!(block.columns[14].sql_type(), SqlType::DateTime);
         assert_eq!(block.columns[15].sql_type(), SqlType::Decimal(18, 4));
     }
-}
+}
diff --git a/src/types/block/mod.rs b/src/types/block/mod.rs
@@ -21,15 +21,15 @@ use self::chunk_iterator::ChunkIterator;
 pub(crate) use self::row::BlockRef;
 pub use self::{
     block_info::BlockInfo,
+    builder::{RCons, RNil, RowBuilder},
     row::{Row, Rows},
-    builder::{RowBuilder, RCons, RNil},
 };
 
 mod block_info;
+mod builder;
 mod chunk_iterator;
 mod compressed;
 mod row;
-mod builder;
 
 const INSERT_BLOCK_SIZE: usize = 1_048_576;
 
@@ -116,7 +116,7 @@ impl Block {
         Self {
             info: Default::default(),
             columns: vec![],
-            capacity
+            capacity,
         }
     }
 
@@ -315,7 +315,7 @@ impl Block {
         Self {
             info: first.info,
             columns,
-            capacity: blocks.iter().map(|b| b.capacity).sum()
+            capacity: blocks.iter().map(|b| b.capacity).sum(),
         }
     }
 

diff --git a/src/types/cmd.rs b/src/types/cmd.rs
@@ -1,5 +1,5 @@
 use crate::{
-    binary::{Encoder, protocol},
+    binary::{protocol, Encoder},
     client_info,
     types::{Block, ClickhouseResult, Context, Query},
 };

diff --git a/src/types/column/array.rs b/src/types/column/array.rs
@@ -2,7 +2,7 @@ use crate::{
     binary::{Encoder, ReadEx},
     errors::Error,
     types::{
-        column::{list::List, BoxColumnWrapper, ColumnData, column_data::BoxColumnData},
+        column::{column_data::BoxColumnData, list::List, BoxColumnWrapper, ColumnData},
         SqlType, Value, ValueRef,
     },
 };

diff --git a/src/types/column/chunk.rs b/src/types/column/chunk.rs
@@ -2,7 +2,10 @@ use std::{cmp, ops};
 
 use crate::{
     binary::Encoder,
-    types::{SqlType, Value, ValueRef, column::column_data::{ArcColumnData, BoxColumnData}},
+    types::{
+        column::column_data::{ArcColumnData, BoxColumnData},
+        SqlType, Value, ValueRef,
+    },
 };
 
 use super::ColumnData;

diff --git a/src/types/column/concat.rs b/src/types/column/concat.rs
@@ -5,7 +5,7 @@ use crate::{
     types::{SqlType, Value, ValueRef},
 };
 
-use super::column_data::{ColumnData, ArcColumnData, BoxColumnData};
+use super::column_data::{ArcColumnData, BoxColumnData, ColumnData};
 
 pub struct ConcatColumnData {
     data: Vec<ArcColumnData>,

diff --git a/src/types/column/date.rs b/src/types/column/date.rs
@@ -1,23 +1,20 @@
 use std::{convert, fmt, sync::Arc};
 
-use chrono::{Date, prelude::*};
+use chrono::{prelude::*, Date};
 use chrono_tz::Tz;
 
 use crate::{
     binary::{Encoder, ReadEx},
     errors::Error,
-    types::{DateConverter, Marshal, SqlType, StatBuffer, Unmarshal, Value, ValueRef},
     types::column::{
         array::ArrayColumnData,
-        BoxColumnWrapper,
         column_data::{BoxColumnData, ColumnData},
-        ColumnFrom,
-        ColumnWrapper,
-        Either,
         list::List,
         nullable::NullableColumnData,
-        numeric::save_data
+        numeric::save_data,
+        BoxColumnWrapper, ColumnFrom, ColumnWrapper, Either,
     },
+    types::{DateConverter, Marshal, SqlType, StatBuffer, Unmarshal, Value, ValueRef},
 };
 
 pub struct DateColumnData<T>
@@ -63,7 +60,9 @@ where
         tz: Tz,
     ) -> Result<DateColumnData<T>, Error> {
         let mut data = List::with_capacity(size);
-        unsafe { data.set_len(size); }
+        unsafe {
+            data.set_len(size);
+        }
         reader.read_bytes(data.as_mut())?;
         Ok(DateColumnData { data, tz })
     }
@@ -227,7 +226,7 @@ where
     }
 
     fn clone_instance(&self) -> BoxColumnData {
-        Box::new(Self{
+        Box::new(Self {
             data: self.data.clone(),
             tz: self.tz,
         })

diff --git a/src/types/column/decimal.rs b/src/types/column/decimal.rs
@@ -5,12 +5,13 @@ use crate::{
     errors::Error,
     types::{
         column::{
-            BoxColumnWrapper, column_data::BoxColumnData, ColumnFrom, ColumnWrapper, Either,
-            list::List, nullable::NullableColumnData, VectorColumnData, column_data::ColumnData
+            column_data::BoxColumnData, column_data::ColumnData, list::List,
+            nullable::NullableColumnData, BoxColumnWrapper, ColumnFrom, ColumnWrapper, Either,
+            VectorColumnData,
         },
-        Column,
         decimal::{Decimal, NoBits},
-        from_sql::FromSql, SqlType, Value, ValueRef,
+        from_sql::FromSql,
+        Column, SqlType, Value, ValueRef,
     },
 };
 
@@ -180,7 +181,7 @@ impl ColumnData for DecimalColumnData {
             inner: self.inner.clone_instance(),
             precision: self.precision,
             scale: self.scale,
-            nobits: self.nobits
+            nobits: self.nobits,
         })
     }
 }