Bump arrow-format to v0.3.0

Signed-off-by: Chojan Shang <[email protected]>
jorgecarleitao · Oct 28, 2021 · 9e1f42f · 9e1f42f
1 parent b7e107f
commit 9e1f42f
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 30 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,8 +39,7 @@ 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 = { git = "https://github.com/DataEngineeringLabs/arrow-format.git",  optional = true, features = ["ipc"] }
-flatbuffers = { version = "=2.0.0", optional = true }
+arrow-format = { version = "0.3.0",  optional = true, features = ["ipc"] }
 
 hex = { version = "^0.4", optional = true }
 
@@ -110,9 +109,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", "flatbuffers"]
+io_ipc = ["arrow-format"]
 io_ipc_compression = ["lz4", "zstd"]
-io_flight = ["io_ipc", "arrow-format/flight"]
+io_flight = ["io_ipc", "arrow-format/flight-data"]
 io_parquet_compression = [
     "parquet2/zstd",
     "parquet2/snappy",

diff --git a/integration-testing/Cargo.toml b/integration-testing/Cargo.toml
@@ -29,7 +29,7 @@ logging = ["tracing-subscriber"]
 
 [dependencies]
 arrow2 = { path = "../", features = ["io_ipc", "io_ipc_compression", "io_flight", "io_json_integration"] }
-arrow-format = { git = "https://github.com/DataEngineeringLabs/arrow-format.git", features = ["ipc", "flight"] }
+arrow-format = { version = "0.3.0", features = ["full"] }
 async-trait = "0.1.41"
 clap = "2.33"
 futures = "0.3"

diff --git a/integration-testing/src/flight_client_scenarios/auth_basic_proto.rs b/integration-testing/src/flight_client_scenarios/auth_basic_proto.rs
@@ -17,8 +17,8 @@
 
 use crate::{AUTH_PASSWORD, AUTH_USERNAME};
 
-use arrow_format::flight::flight_service_client::FlightServiceClient;
-use arrow_format::flight::{Action, BasicAuth, HandshakeRequest};
+use arrow_format::flight::data::{Action, BasicAuth, HandshakeRequest};
+use arrow_format::flight::service::flight_service_client::FlightServiceClient;
 use futures::{stream, StreamExt};
 use prost::Message;
 use tonic::{metadata::MetadataValue, Request, Status};

diff --git a/integration-testing/src/flight_client_scenarios/integration_test.rs b/integration-testing/src/flight_client_scenarios/integration_test.rs
@@ -24,10 +24,10 @@ use arrow2::{
     io::ipc::{read, write},
     record_batch::RecordBatch,
 };
-use arrow_format::flight::flight_service_client::FlightServiceClient;
-use arrow_format::flight::{
+use arrow_format::flight::data::{
     flight_descriptor::DescriptorType, FlightData, FlightDescriptor, Location, Ticket,
 };
+use arrow_format::flight::service::flight_service_client::FlightServiceClient;
 use arrow_format::ipc;
 use arrow_format::ipc::Message::MessageHeader;
 use futures::{channel::mpsc, sink::SinkExt, stream, StreamExt};

diff --git a/integration-testing/src/flight_client_scenarios/middleware.rs b/integration-testing/src/flight_client_scenarios/middleware.rs
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use arrow_format::flight::flight_service_client::FlightServiceClient;
-use arrow_format::flight::{flight_descriptor::DescriptorType, FlightDescriptor};
+use arrow_format::flight::data::{flight_descriptor::DescriptorType, FlightDescriptor};
+use arrow_format::flight::service::flight_service_client::FlightServiceClient;
 use tonic::{Request, Status};
 
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;

diff --git a/integration-testing/src/flight_server_scenarios.rs b/integration-testing/src/flight_server_scenarios.rs
@@ -17,7 +17,7 @@
 
 use std::net::SocketAddr;
 
-use arrow_format::flight::{FlightEndpoint, Location, Ticket};
+use arrow_format::flight::data::{FlightEndpoint, Location, Ticket};
 use tokio::net::TcpListener;
 
 pub mod auth_basic_proto;

diff --git a/integration-testing/src/flight_server_scenarios/auth_basic_proto.rs b/integration-testing/src/flight_server_scenarios/auth_basic_proto.rs
@@ -18,8 +18,8 @@
 use std::pin::Pin;
 use std::sync::Arc;
 
-use arrow_format::flight::flight_service_server::{FlightService, FlightServiceServer};
-use arrow_format::flight::*;
+use arrow_format::flight::data::*;
+use arrow_format::flight::service::flight_service_server::{FlightService, FlightServiceServer};
 use futures::{channel::mpsc, sink::SinkExt, Stream, StreamExt};
 use tokio::sync::Mutex;
 use tonic::{metadata::MetadataMap, transport::Server, Request, Response, Status, Streaming};
@@ -92,7 +92,7 @@ impl FlightService for AuthBasicProtoScenarioImpl {
     type ListFlightsStream = TonicStream<Result<FlightInfo, Status>>;
     type DoGetStream = TonicStream<Result<FlightData, Status>>;
     type DoPutStream = TonicStream<Result<PutResult, Status>>;
-    type DoActionStream = TonicStream<Result<arrow_format::flight::Result, Status>>;
+    type DoActionStream = TonicStream<Result<arrow_format::flight::data::Result, Status>>;
     type ListActionsStream = TonicStream<Result<ActionType, Status>>;
     type DoExchangeStream = TonicStream<Result<FlightData, Status>>;
 
@@ -191,7 +191,7 @@ impl FlightService for AuthBasicProtoScenarioImpl {
         let flight_context = self.check_auth(request.metadata()).await?;
         // Respond with the authenticated username.
         let buf = flight_context.peer_identity().as_bytes().to_vec();
-        let result = arrow_format::flight::Result { body: buf };
+        let result = arrow_format::flight::data::Result { body: buf };
         let output = futures::stream::once(async { Ok(result) });
         Ok(Response::new(Box::pin(output) as Self::DoActionStream))
     }

diff --git a/integration-testing/src/flight_server_scenarios/integration_test.rs b/integration-testing/src/flight_server_scenarios/integration_test.rs
@@ -21,9 +21,9 @@ use std::pin::Pin;
 use std::sync::Arc;
 
 use arrow2::io::flight::{serialize_batch, serialize_schema};
-use arrow_format::flight::flight_descriptor::*;
-use arrow_format::flight::flight_service_server::*;
-use arrow_format::flight::*;
+use arrow_format::flight::data::*;
+use arrow_format::flight::data::flight_descriptor::*;
+use arrow_format::flight::service::flight_service_server::*;
 use arrow_format::ipc::Message::{root_as_message, Message, MessageHeader};
 use arrow_format::ipc::Schema as ArrowSchema;
 
@@ -82,7 +82,7 @@ impl FlightService for FlightServiceImpl {
     type ListFlightsStream = TonicStream<Result<FlightInfo, Status>>;
     type DoGetStream = TonicStream<Result<FlightData, Status>>;
     type DoPutStream = TonicStream<Result<PutResult, Status>>;
-    type DoActionStream = TonicStream<Result<arrow_format::flight::Result, Status>>;
+    type DoActionStream = TonicStream<Result<arrow_format::flight::data::Result, Status>>;
     type ListActionsStream = TonicStream<Result<ActionType, Status>>;
     type DoExchangeStream = TonicStream<Result<FlightData, Status>>;
 

diff --git a/integration-testing/src/flight_server_scenarios/middleware.rs b/integration-testing/src/flight_server_scenarios/middleware.rs
@@ -17,9 +17,9 @@
 
 use std::pin::Pin;
 
-use arrow_format::flight::flight_descriptor::DescriptorType;
-use arrow_format::flight::flight_service_server::{FlightService, FlightServiceServer};
-use arrow_format::flight::*;
+use arrow_format::flight::data::*;
+use arrow_format::flight::data::flight_descriptor::DescriptorType;
+use arrow_format::flight::service::flight_service_server::{FlightService, FlightServiceServer};
 use futures::Stream;
 use tonic::{transport::Server, Request, Response, Status, Streaming};
 
@@ -50,7 +50,7 @@ impl FlightService for MiddlewareScenarioImpl {
     type ListFlightsStream = TonicStream<Result<FlightInfo, Status>>;
     type DoGetStream = TonicStream<Result<FlightData, Status>>;
     type DoPutStream = TonicStream<Result<PutResult, Status>>;
-    type DoActionStream = TonicStream<Result<arrow_format::flight::Result, Status>>;
+    type DoActionStream = TonicStream<Result<arrow_format::flight::data::Result, Status>>;
     type ListActionsStream = TonicStream<Result<ActionType, Status>>;
     type DoExchangeStream = TonicStream<Result<FlightData, Status>>;
 

diff --git a/src/io/flight/mod.rs b/src/io/flight/mod.rs
@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 use std::sync::Arc;
 
-use arrow_format::flight::{FlightData, SchemaResult};
+use arrow_format::flight::data::{FlightData, SchemaResult};
 use arrow_format::ipc;
 
 use crate::{

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

diff --git a/src/io/ipc/read/reader.rs b/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 flatbuffers::VerifierOptions;
+use arrow_format::ipc::flatbuffers::VerifierOptions;
 
 use crate::array::*;
 use crate::datatypes::Schema;

diff --git a/src/io/ipc/write/common.rs b/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 flatbuffers::FlatBufferBuilder;
+use arrow_format::ipc::flatbuffers::FlatBufferBuilder;
 
 use crate::array::Array;
 use crate::error::{ArrowError, Result};

diff --git a/src/io/ipc/write/schema.rs b/src/io/ipc/write/schema.rs
@@ -1,5 +1,5 @@
 use arrow_format::ipc;
-use flatbuffers::FlatBufferBuilder;
+use arrow_format::ipc::flatbuffers::FlatBufferBuilder;
 
 use crate::datatypes::*;
 

diff --git a/src/io/ipc/write/writer.rs b/src/io/ipc/write/writer.rs
@@ -23,7 +23,7 @@
 use std::io::Write;
 
 use arrow_format::ipc;
-use flatbuffers::FlatBufferBuilder;
+use arrow_format::ipc::flatbuffers::FlatBufferBuilder;
 
 use super::super::ARROW_MAGIC;
 use super::{