Bumped Prost and Tonic

Cargo.toml

@@ -17,7 +17,7 @@ bench = false
 [dependencies]
 num-traits = "0.2"
 chrono = { version = "0.4", default_features = false, features = ["std"] }
-chrono-tz = { version = "0.5", optional = true }
+chrono-tz = { version = "0.6", optional = true }
 # To efficiently cast numbers to strings
 lexical-core = { version = "0.8", optional = true }
 # We need to Hash values before sending them to an hasher. This
@@ -39,7 +39,8 @@ indexmap = { version = "^1.6", optional = true }
 # used to print columns in a nice columnar format
 comfy-table = { version = "4.0", optional = true, default-features = false }
 
-arrow-format = { version = "*", optional = true, features = ["ipc"] }
+arrow-format = { git = "https://github.com/PsiACE/arrow-format.git",  optional = true, features = ["ipc"] }
+flatbuffers = { version = "=2.0.0", optional = true }
 
 hex = { version = "^0.4", optional = true }
 
@@ -109,9 +110,9 @@ io_csv = ["io_csv_read", "io_csv_write"]
 io_csv_read = ["csv", "lexical-core"]
 io_csv_write = ["csv", "streaming-iterator", "lexical-core"]
 io_json = ["serde", "serde_json", "indexmap"]
-io_ipc = ["arrow-format"]
+io_ipc = ["arrow-format", "flatbuffers"]
 io_ipc_compression = ["lz4", "zstd"]
-io_flight = ["io_ipc", "arrow-format/flight-data"]
+io_flight = ["io_ipc", "arrow-format/flight"]
 io_parquet_compression = [
     "parquet2/zstd",
     "parquet2/snappy",

integration-testing/Cargo.toml

@@ -29,15 +29,15 @@ logging = ["tracing-subscriber"]
 
 [dependencies]
 arrow2 = { path = "../", features = ["io_ipc", "io_ipc_compression", "io_flight", "io_json_integration"] }
-arrow-format = { version = "*", features = ["ipc", "flight-service"] }
+arrow-format = { git = "https://github.com/PsiACE/arrow-format.git", features = ["ipc", "flight"] }
 async-trait = "0.1.41"
 clap = "2.33"
 futures = "0.3"
 hex = "0.4"
-prost = "0.8"
+prost = "0.9"
 serde = { version = "1.0", features = ["rc"] }
 serde_derive = "1.0"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread"] }
-tonic = "0.5.2"
-tracing-subscriber = { version = "0.2.15", optional = true }
+tonic = "0.6.0"
+tracing-subscriber = { version = "0.3.1", optional = true }

src/io/flight/mod.rs

@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 use std::sync::Arc;
 
-use arrow_format::flight::data::{FlightData, SchemaResult};
+use arrow_format::flight::{FlightData, SchemaResult};
 use arrow_format::ipc;
 
 use crate::{

src/io/ipc/convert.rs

@@ -17,9 +17,7 @@
 
 //! Utilities for converting between IPC types and native Arrow types
 
-use arrow_format::ipc::flatbuffers::{
-    FlatBufferBuilder, ForwardsUOffset, UnionWIPOffset, Vector, WIPOffset,
-};
+use flatbuffers::{FlatBufferBuilder, ForwardsUOffset, UnionWIPOffset, Vector, WIPOffset};
 use std::collections::{BTreeMap, HashMap};
 mod ipc {
     pub use arrow_format::ipc::File::*;

src/io/ipc/read/reader.rs

@@ -19,7 +19,7 @@ use std::io::{Read, Seek, SeekFrom};
 use std::sync::Arc;
 
 use arrow_format::ipc;
-use arrow_format::ipc::flatbuffers::VerifierOptions;
+use flatbuffers::VerifierOptions;
 
 use crate::array::*;
 use crate::datatypes::Schema;

src/io/ipc/write/common.rs

@@ -20,7 +20,7 @@ use std::io::Write;
 use std::{collections::HashMap, sync::Arc};
 
 use arrow_format::ipc;
-use arrow_format::ipc::flatbuffers::FlatBufferBuilder;
+use flatbuffers::FlatBufferBuilder;
 
 use crate::array::Array;
 use crate::error::{ArrowError, Result};

src/io/ipc/write/schema.rs

@@ -1,5 +1,5 @@
 use arrow_format::ipc;
-use arrow_format::ipc::flatbuffers::FlatBufferBuilder;
+use flatbuffers::FlatBufferBuilder;
 
 use crate::datatypes::*;
 

src/io/ipc/write/writer.rs

@@ -23,7 +23,7 @@
 use std::io::Write;
 
 use arrow_format::ipc;
-use arrow_format::ipc::flatbuffers::FlatBufferBuilder;
+use flatbuffers::FlatBufferBuilder;
 
 use super::super::ARROW_MAGIC;
 use super::{