Merge c6802b5 into f7d055e

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clickhouse-rs"
-version = "0.1.13"
+version = "0.1.14"
 authors = ["Mikhail Sukharev <suharev7@gmail.com>"]
 license = "MIT"
 homepage = "https://github.com/suharev7/clickhouse-rs"
@@ -29,7 +29,7 @@ clickhouse-rs-cityhash-sys = { path = "clickhouse-rs-cityhash-sys", version = "0
 byteorder = "1.3.1"
 failure = "0.1"
 failure_derive = "0.1"
-url="^1.7"
+url="^2"
 lazy_static = "1.3.0"
 
 [dev-dependencies]

src/types/column/array.rs

@@ -7,6 +7,7 @@ use crate::{
     },
 };
 use chrono_tz::Tz;
+use std::sync::Arc;
 
 pub(crate) struct ArrayColumnData {
     pub(crate) inner: Box<dyn ColumnData + Send + Sync>,
@@ -65,8 +66,8 @@ impl ColumnData for ArrayColumnData {
             };
 
             self.offsets.push((prev + vs.len()) as u64);
-            for v in vs {
-                self.inner.push(v);
+            for v in vs.iter() {
+                self.inner.push(v.clone());
             }
         } else {
             panic!("value should be an array")
@@ -87,7 +88,7 @@ impl ColumnData for ArrayColumnData {
             let v = self.inner.at(i);
             vs.push(v);
         }
-        ValueRef::Array(sql_type, vs)
+        ValueRef::Array(sql_type.into(), Arc::new(vs))
     }
 }
 

src/types/column/date.rs

@@ -1,4 +1,4 @@
-use std::{convert, fmt, mem};
+use std::{convert, fmt, sync::Arc};
 
 use chrono::{prelude::*, Date};
 use chrono_tz::Tz;
@@ -8,8 +8,8 @@ use crate::{
     errors::Error,
     types::{
         column::{
-            array::ArrayColumnData, nullable::NullableColumnData, BoxColumnWrapper, ColumnWrapper,
-            Either,
+            array::ArrayColumnData, nullable::NullableColumnData, numeric::save_data,
+            BoxColumnWrapper, ColumnWrapper, Either,
         },
         DateConverter, Marshal, SqlType, StatBuffer, Unmarshal, Value, ValueRef,
     },
@@ -97,10 +97,11 @@ impl ColumnFrom for Vec<Vec<Date<Tz>>> {
         for vs in source {
             let mut inner = Vec::with_capacity(vs.len());
             for v in vs {
-                let value: Value = Value::Date(v);
+                let days = u16::get_days(v);
+                let value: Value = Value::Date(days, v.timezone());
                 inner.push(value);
             }
-            data.push(Value::Array(sql_type, inner));
+            data.push(Value::Array(sql_type.into(), Arc::new(inner)));
         }
 
         W::wrap(data)
@@ -121,10 +122,10 @@ impl ColumnFrom for Vec<Vec<DateTime<Tz>>> {
         for vs in source {
             let mut inner = Vec::with_capacity(vs.len());
             for v in vs {
-                let value: Value = Value::DateTime(v);
+                let value: Value = Value::DateTime(v.timestamp() as u32, v.timezone());
                 inner.push(value);
             }
-            data.push(Value::Array(sql_type, inner));
+            data.push(Value::Array(sql_type.into(), Arc::new(inner)));
         }
 
         W::wrap(data)
@@ -143,9 +144,9 @@ impl ColumnFrom for Vec<Option<DateTime<Tz>>> {
 
         for value in source {
             match value {
-                None => data.push(Value::Nullable(Either::Left(SqlType::DateTime))),
+                None => data.push(Value::Nullable(Either::Left(SqlType::DateTime.into()))),
                 Some(d) => {
-                    let value = Value::DateTime(d);
+                    let value = Value::DateTime(d.timestamp() as u32, d.timezone());
                     data.push(Value::Nullable(Either::Right(Box::new(value))))
                 }
             }
@@ -167,9 +168,10 @@ impl ColumnFrom for Vec<Option<Date<Tz>>> {
 
         for value in source {
             match value {
-                None => data.push(Value::Nullable(Either::Left(SqlType::Date))),
+                None => data.push(Value::Nullable(Either::Left(SqlType::Date.into()))),
                 Some(d) => {
-                    let value = Value::Date(d);
+                    let days = u16::get_days(d);
+                    let value = Value::Date(days, d.timezone());
                     data.push(Value::Nullable(Either::Right(Box::new(value))))
                 }
             }
@@ -199,10 +201,7 @@ where
     }
 
     fn save(&self, encoder: &mut Encoder, start: usize, end: usize) {
-        let start_index = start * mem::size_of::<T>();
-        let end_index = end * mem::size_of::<T>();
-        let data = self.data.as_ref();
-        encoder.write_bytes(&data[start_index..end_index]);
+        save_data::<T>(self.data.as_ref(), encoder, start, end);
     }
 
     fn len(&self) -> usize {

src/types/column/decimal.rs

@@ -265,7 +265,7 @@ impl ColumnData for NullableDecimalAdapter {
     fn at(&self, index: usize) -> ValueRef {
         let value: Option<Decimal> = Option::from_sql(self.column.at(index)).unwrap();
         match value {
-            None => ValueRef::Nullable(Either::Left(self.sql_type())),
+            None => ValueRef::Nullable(Either::Left(self.sql_type().into())),
             Some(mut v) => {
                 v = v.set_scale(self.scale);
                 v.precision = self.precision;

src/types/column/fixed_string.rs

@@ -94,8 +94,8 @@ impl ColumnData for FixedStringAdapter {
                 }
                 ValueRef::Array(SqlType::UInt8, vs) => {
                     let mut string_val: Vec<u8> = Vec::with_capacity(vs.len());
-                    for v in vs {
-                        let byte: u8 = v.into();
+                    for v in vs.iter() {
+                        let byte: u8 = v.clone().into();
                         string_val.push(byte);
                     }
                     let string_ref: &[u8] = string_val.as_ref();

src/types/column/nullable.rs

@@ -51,7 +51,7 @@ impl ColumnData for NullableColumnData {
         if let Value::Nullable(e) = value {
             match e {
                 Either::Left(sql_type) => {
-                    let default_value = Value::default(sql_type);
+                    let default_value = Value::default(*sql_type);
                     self.inner.push(default_value);
                     self.nulls.push(true as u8);
                 }
@@ -69,7 +69,7 @@ impl ColumnData for NullableColumnData {
     fn at(&self, index: usize) -> ValueRef {
         if self.nulls[index] == 1 {
             let sql_type = self.inner.sql_type();
-            ValueRef::Nullable(Either::Left(sql_type))
+            ValueRef::Nullable(Either::Left(sql_type.into()))
         } else {
             let inner_value = self.inner.at(index);
             ValueRef::Nullable(Either::Right(Box::new(inner_value)))

src/types/column/numeric.rs

@@ -1,4 +1,4 @@
-use std::{convert, mem};
+use std::{convert, mem, sync::Arc};
 
 use crate::{
     binary::{Encoder, ReadEx},
@@ -132,7 +132,7 @@ where
         let value: Value = v.into();
         inner.push(value)
     }
-    Value::Array(sql_type, inner)
+    Value::Array(sql_type.into(), Arc::new(inner))
 }
 
 impl<T> VectorColumnData<T>
@@ -183,10 +183,7 @@ where
     }
 
     fn save(&self, encoder: &mut Encoder, start: usize, end: usize) {
-        let start_index = start * mem::size_of::<T>();
-        let end_index = end * mem::size_of::<T>();
-        let data = self.data.as_ref();
-        encoder.write_bytes(&data[start_index..end_index]);
+        save_data::<T>(self.data.as_ref(), encoder, start, end);
     }
 
     fn len(&self) -> usize {
@@ -217,3 +214,9 @@ where
         }
     }
 }
+
+pub(crate) fn save_data<T>(data: &[u8], encoder: &mut Encoder, start: usize, end: usize) {
+    let start_index = start * mem::size_of::<T>();
+    let end_index = end * mem::size_of::<T>();
+    encoder.write_bytes(&data[start_index..end_index]);
+}

src/types/column/string.rs

@@ -1,12 +1,12 @@
-use std::{io::Write, string::ToString};
+use std::{io::Write, string::ToString, sync::Arc};
 
 use crate::{
     binary::{Encoder, ReadEx},
     errors::Error,
     types::{
         column::{
             array::ArrayColumnData, list::List, nullable::NullableColumnData, BoxColumnWrapper,
-            ColumnWrapper, StringPool,
+            ColumnWrapper, Either, StringPool,
         },
         Column, FromSql, SqlType, Value, ValueRef,
     },
@@ -59,103 +59,101 @@ impl<'a> ColumnFrom for Vec<&'a [u8]> {
     }
 }
 
-impl ColumnFrom for Vec<Option<String>> {
-    fn column_from<W: ColumnWrapper>(source: Self) -> W::Wrapper {
-        let inner = Box::new(StringColumnData::with_capacity(source.len()));
+trait StringSource {
+    fn to_value(self) -> Value;
+}
 
-        let mut data = NullableColumnData {
-            inner,
-            nulls: Vec::with_capacity(source.len()),
-        };
+impl StringSource for String {
+    fn to_value(self) -> Value {
+        self.into()
+    }
+}
 
-        for value in source {
-            data.push(value.into());
-        }
+impl StringSource for &str {
+    fn to_value(self) -> Value {
+        self.into()
+    }
+}
 
-        W::wrap(data)
+impl StringSource for Vec<u8> {
+    fn to_value(self) -> Value {
+        Value::String(Arc::new(self))
     }
 }
 
 impl ColumnFrom for Vec<Vec<String>> {
     fn column_from<W: ColumnWrapper>(source: Self) -> <W as ColumnWrapper>::Wrapper {
-        let fake: Vec<String> = Vec::with_capacity(source.len());
-        let inner = Vec::column_from::<BoxColumnWrapper>(fake);
-        let sql_type = inner.sql_type();
-
-        let mut data = ArrayColumnData {
-            inner,
-            offsets: List::with_capacity(source.len()),
-        };
-
-        for vs in source {
-            let mut inner = Vec::with_capacity(vs.len());
-            for v in vs {
-                let value: Value = v.into();
-                inner.push(value)
-            }
-            data.push(Value::Array(sql_type, inner));
-        }
-
-        W::wrap(data)
+        make_array_of_array::<W, String>(source)
     }
 }
 
 impl ColumnFrom for Vec<Vec<&str>> {
     fn column_from<W: ColumnWrapper>(source: Self) -> <W as ColumnWrapper>::Wrapper {
-        let fake: Vec<&str> = Vec::with_capacity(source.len());
-        let inner = Vec::column_from::<BoxColumnWrapper>(fake);
-        let sql_type = inner.sql_type();
-
-        let mut data = ArrayColumnData {
-            inner,
-            offsets: List::with_capacity(source.len()),
-        };
+        make_array_of_array::<W, &str>(source)
+    }
+}
 
-        for vs in source {
-            let mut inner = Vec::with_capacity(vs.len());
-            for v in vs {
-                let value: Value = v.into();
-                inner.push(value)
-            }
-            data.push(Value::Array(sql_type, inner));
+fn make_array_of_array<W: ColumnWrapper, S: StringSource>(
+    source: Vec<Vec<S>>,
+) -> <W as ColumnWrapper>::Wrapper {
+    let fake: Vec<String> = Vec::with_capacity(source.len());
+    let inner = Vec::column_from::<BoxColumnWrapper>(fake);
+    let sql_type = inner.sql_type();
+
+    let mut data = ArrayColumnData {
+        inner,
+        offsets: List::with_capacity(source.len()),
+    };
+
+    for vs in source {
+        let mut inner = Vec::with_capacity(vs.len());
+        for v in vs {
+            let value: Value = v.to_value();
+            inner.push(value)
         }
-
-        W::wrap(data)
+        data.push(Value::Array(sql_type.into(), Arc::new(inner)));
     }
+
+    W::wrap(data)
 }
 
 impl ColumnFrom for Vec<Option<Vec<u8>>> {
     fn column_from<W: ColumnWrapper>(source: Self) -> W::Wrapper {
-        let inner = Box::new(StringColumnData::with_capacity(source.len()));
-
-        let mut data = NullableColumnData {
-            inner,
-            nulls: Vec::with_capacity(source.len()),
-        };
-
-        for value in source {
-            data.push(value.into());
-        }
-
-        W::wrap(data)
+        make_opt_column::<W, Vec<u8>>(source)
     }
 }
 
 impl ColumnFrom for Vec<Option<&str>> {
     fn column_from<W: ColumnWrapper>(source: Self) -> W::Wrapper {
-        let inner = Box::new(StringColumnData::with_capacity(source.len()));
+        make_opt_column::<W, &str>(source)
+    }
+}
+
+impl ColumnFrom for Vec<Option<String>> {
+    fn column_from<W: ColumnWrapper>(source: Self) -> W::Wrapper {
+        make_opt_column::<W, String>(source)
+    }
+}
 
-        let mut data = NullableColumnData {
-            inner,
-            nulls: Vec::with_capacity(source.len()),
-        };
+fn make_opt_column<W: ColumnWrapper, S: StringSource>(source: Vec<Option<S>>) -> W::Wrapper {
+    let inner = Box::new(StringColumnData::with_capacity(source.len()));
 
-        for value in source {
-            data.push(value.into());
-        }
+    let mut data = NullableColumnData {
+        inner,
+        nulls: Vec::with_capacity(source.len()),
+    };
 
-        W::wrap(data)
+    for value in source {
+        let item = if let Some(v) = value {
+            let inner = v.to_value();
+            Value::Nullable(Either::Right(Box::new(inner)))
+        } else {
+            Value::Nullable(Either::Left(SqlType::String.into()))
+        };
+        data.push(item);
     }
+
+    W::wrap(data)
 }
 
 impl ColumnData for StringColumnData {