ARROW-8124: [Rust] Update library dependencies

- Update rust dependencies to latest I tried to update sqlparser but it was quite a substantial change so I left it at the current version for now Closes #6626 from bryantbiggs/chore/update-dependencies Authored-by: Bryant Biggs <bryantbiggs@gmail.com> Signed-off-by: Andy Grove <andygrove73@gmail.com>
apache · Mar 16, 2020 · 368037f · 368037f
1 parent ab21f0e
commit 368037f
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 47 deletions.
diff --git a/rust/arrow-flight/Cargo.toml b/rust/arrow-flight/Cargo.toml
@@ -26,15 +26,15 @@ repository = "https://github.com/apache/arrow"
 license = "Apache-2.0"
 
 [dependencies]
-tonic = "0.1.0"
-bytes = "0.4"
+tonic = "0.1"
+bytes = "0.5"
 prost = "0.6"
 prost-derive = "0.6"
 tokio = {version = "0.2", features = ["macros"]}
 futures = { version = "0.3", default-features = false, features = ["alloc"]}
 
 [build-dependencies]
-tonic-build = "0.1.0"
+tonic-build = "0.1"
 
 [lib]
 name = "flight"

diff --git a/rust/arrow/Cargo.toml b/rust/arrow/Cargo.toml
@@ -37,18 +37,18 @@ path = "src/lib.rs"
 
 [dependencies]
 libc = "0.2"
-serde = { version = "1.0.80", features = ["rc"] }
-serde_derive = "1.0.80"
-serde_json = { version = "1.0.13", features = ["preserve_order"] }
-indexmap = "1.0"
-rand = "0.6"
-csv = "1.0"
+serde = { version = "1.0", features = ["rc"] }
+serde_derive = "1.0"
+serde_json = { version = "1.0", features = ["preserve_order"] }
+indexmap = "1.3"
+rand = "0.7"
+csv = "1.1"
 num = "0.2"
-regex = "1.1"
-lazy_static = "1.2"
-packed_simd = { version = "0.3.1", optional = true }
+regex = "1.3"
+lazy_static = "1.4"
+packed_simd = { version = "0.3", optional = true }
 chrono = "0.4"
-flatbuffers = "0.6.0"
+flatbuffers = "0.6"
 hex = "0.4"
 arrow-flight = { path = "../arrow-flight", optional = true }
 
@@ -58,7 +58,7 @@ flight = ["arrow-flight"]
 default = ["simd", "flight"]
 
 [dev-dependencies]
-criterion = "0.2"
+criterion = "0.3"
 lazy_static = "1"
 flate2 = "1"
 

diff --git a/rust/arrow/benches/builder.rs b/rust/arrow/benches/builder.rs
@@ -45,7 +45,7 @@ fn bench_primitive(c: &mut Criterion) {
             })
         })
         .throughput(Throughput::Bytes(
-            (data.len() * NUM_BATCHES * size_of::<i64>()) as u32,
+            ((data.len() * NUM_BATCHES * size_of::<i64>()) as u32).into(),
         )),
     );
 }
@@ -68,7 +68,7 @@ fn bench_bool(c: &mut Criterion) {
             })
         })
         .throughput(Throughput::Bytes(
-            (data_len * NUM_BATCHES * size_of::<bool>()) as u32,
+            ((data_len * NUM_BATCHES * size_of::<bool>()) as u32).into(),
         )),
     );
 }

diff --git a/rust/datafusion/Cargo.toml b/rust/datafusion/Cargo.toml
@@ -44,24 +44,24 @@ default = ["cli"]
 cli = ["rustyline"]
 
 [dependencies]
-fnv = "1.0.3"
+fnv = "1.0"
 arrow = { path = "../arrow", version = "1.0.0-SNAPSHOT" }
 parquet = { path = "../parquet", version = "1.0.0-SNAPSHOT" }
-sqlparser = "0.2.0"
-clap = "2.33.0"
+sqlparser = "0.2"
+clap = "2.33"
 prettytable-rs = "0.8.0"
-rustyline = {version = "4.1.0", optional = true}
-crossbeam = "0.7.1"
-paste = "0.1.6"
+rustyline = {version = "6.0", optional = true}
+crossbeam = "0.7"
+paste = "0.1"
 
 [dev-dependencies]
-criterion = "0.2.0"
-tempdir = "0.3.7"
+criterion = "0.3"
+tempdir = "0.3"
 futures = "0.3"
 prost = "0.6"
 tokio = { version = "0.2", features = ["macros"] }
 tonic = "0.1"
-flatbuffers = "0.6.0"
+flatbuffers = "0.6"
 arrow-flight = { path = "../arrow-flight", version = "1.0.0-SNAPSHOT" }
 
 [[bench]]

diff --git a/rust/parquet/Cargo.toml b/rust/parquet/Cargo.toml
@@ -33,16 +33,16 @@ parquet-format = "~2.6"
 quick-error = "1.2"
 byteorder = "1"
 thrift = "0.12"
-snap = "0.2"
-brotli = "2.5"
-flate2 = "1.0.2"
+snap = "1.0"
+brotli = "3.3"
+flate2 = "1.0"
 lz4 = "1.23"
-zstd = "0.4"
+zstd = "0.5"
 chrono = "0.4"
 num-bigint = "0.2"
 arrow = { path = "../arrow", version = "1.0.0-SNAPSHOT" }
-serde_json = { version = "1.0.13", features = ["preserve_order"] }
+serde_json = { version = "1.0", features = ["preserve_order"] }
 
 [dev-dependencies]
 lazy_static = "1"
-rand = "0.5"
+rand = "0.6"
diff --git a/rust/parquet/src/arrow/array_reader.rs b/rust/parquet/src/arrow/array_reader.rs
@@ -964,7 +964,7 @@ mod tests {
         DataType as ArrowType, Field, Int32Type as ArrowInt32, UInt32Type as ArrowUInt32,
         UInt64Type as ArrowUInt64,
     };
-    use rand::distributions::range::SampleRange;
+    use rand::distributions::uniform::SampleUniform;
     use std::any::Any;
     use std::collections::VecDeque;
     use std::rc::Rc;
@@ -983,7 +983,7 @@ mod tests {
         use_v2: bool,
         num_chuncks: usize,
     ) where
-        T::T: PartialOrd + SampleRange + Copy,
+        T::T: PartialOrd + SampleUniform + Copy,
     {
         for _i in 0..num_chuncks {
             let mut pages = VecDeque::new();

diff --git a/rust/parquet/src/column/reader.rs b/rust/parquet/src/column/reader.rs
@@ -506,7 +506,7 @@ impl<T: DataType> ColumnReaderImpl<T> {
 mod tests {
     use super::*;
 
-    use rand::distributions::range::SampleRange;
+    use rand::distributions::uniform::SampleUniform;
     use std::{collections::VecDeque, rc::Rc, vec::IntoIter};
 
     use crate::basic::Type as PhysicalType;
@@ -1102,7 +1102,7 @@ mod tests {
 
     struct ColumnReaderTester<T: DataType>
     where
-        T::T: PartialOrd + SampleRange + Copy,
+        T::T: PartialOrd + SampleUniform + Copy,
     {
         rep_levels: Vec<i16>,
         def_levels: Vec<i16>,
@@ -1111,7 +1111,7 @@ mod tests {
 
     impl<T: DataType> ColumnReaderTester<T>
     where
-        T::T: PartialOrd + SampleRange + Copy,
+        T::T: PartialOrd + SampleUniform + Copy,
     {
         pub fn new() -> Self {
             Self {

diff --git a/rust/parquet/src/column/writer.rs b/rust/parquet/src/column/writer.rs
@@ -848,7 +848,7 @@ impl EncodingWriteSupport for ColumnWriterImpl<FixedLenByteArrayType> {
 mod tests {
     use super::*;
 
-    use rand::distributions::range::SampleRange;
+    use rand::distributions::uniform::SampleUniform;
 
     use crate::column::{
         page::PageReader,
@@ -1464,7 +1464,7 @@ mod tests {
         max_def_level: i16,
         max_rep_level: i16,
     ) where
-        T::T: PartialOrd + SampleRange + Copy,
+        T::T: PartialOrd + SampleUniform + Copy,
     {
         let mut num_values: usize = 0;
 

diff --git a/rust/parquet/src/compression.rs b/rust/parquet/src/compression.rs
@@ -45,7 +45,7 @@ use std::io::{self, Read, Write};
 use brotli;
 use flate2::{read, write, Compression};
 use lz4;
-use snap::{decompress_len, max_compress_len, Decoder, Encoder};
+use snap::raw::{decompress_len, max_compress_len, Decoder, Encoder};
 use zstd;
 
 use crate::basic::Compression as CodecType;

diff --git a/rust/parquet/src/encodings/rle.rs b/rust/parquet/src/encodings/rle.rs
@@ -836,11 +836,11 @@ mod tests {
                 Standard.sample_iter(&mut rng).take(seed_len).collect();
             let mut seed = [0u8; 32];
             seed.copy_from_slice(&seed_vec[0..seed_len]);
-            let mut gen = rand::StdRng::from_seed(seed);
+            let mut gen = rand::rngs::StdRng::from_seed(seed);
 
             let mut parity = false;
             for _ in 0..ngroups {
-                let mut group_size = gen.gen_range::<u32>(1, 20);
+                let mut group_size = gen.gen_range(1, 20);
                 if group_size > max_group_size {
                     group_size = 1;
                 }

diff --git a/rust/parquet/src/util/test_common/page_util.rs b/rust/parquet/src/util/test_common/page_util.rs
@@ -28,7 +28,7 @@ use crate::util::memory::ByteBufferPtr;
 use crate::util::memory::MemTracker;
 use crate::util::memory::MemTrackerPtr;
 use crate::util::test_common::random_numbers_range;
-use rand::distributions::range::SampleRange;
+use rand::distributions::uniform::SampleUniform;
 use std::collections::VecDeque;
 use std::mem;
 use std::rc::Rc;
@@ -239,7 +239,7 @@ pub fn make_pages<T: DataType>(
     pages: &mut VecDeque<Page>,
     use_v2: bool,
 ) where
-    T::T: PartialOrd + SampleRange + Copy,
+    T::T: PartialOrd + SampleUniform + Copy,
 {
     let mut num_values = 0;
     let max_def_level = desc.max_def_level();

diff --git a/rust/parquet/src/util/test_common/rand_gen.rs b/rust/parquet/src/util/test_common/rand_gen.rs
@@ -16,7 +16,7 @@
 // under the License.
 
 use rand::{
-    distributions::{range::SampleRange, Distribution, Standard},
+    distributions::{uniform::SampleUniform, Distribution, Standard},
     thread_rng, Rng,
 };
 
@@ -86,7 +86,7 @@ impl RandGen<ByteArrayType> for ByteArrayType {
         let mut rng = thread_rng();
         let mut result = ByteArray::new();
         let mut value = vec![];
-        let len = rng.gen_range::<usize>(0, 128);
+        let len = rng.gen_range(0, 128);
         for _ in 0..len {
             value.push(rng.gen_range(0, 255) & 0xFF);
         }
@@ -99,7 +99,7 @@ impl RandGen<FixedLenByteArrayType> for FixedLenByteArrayType {
     fn gen(len: i32) -> ByteArray {
         let mut rng = thread_rng();
         let value_len = if len < 0 {
-            rng.gen_range::<usize>(0, 128)
+            rng.gen_range(0, 128)
         } else {
             len as usize
         };
@@ -136,7 +136,7 @@ where
 
 pub fn random_numbers_range<T>(n: usize, low: T, high: T, result: &mut Vec<T>)
 where
-    T: PartialOrd + SampleRange + Copy,
+    T: PartialOrd + SampleUniform + Copy,
 {
     let mut rng = thread_rng();
     for _ in 0..n {