Skip to content

Commit bdae93b

Browse files
Improved usage of use arrow in ballista. (#447)
1 parent 321fda4 commit bdae93b

File tree

21 files changed

+157
-213
lines changed

21 files changed

+157
-213
lines changed

ballista/rust/client/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ futures = "0.3"
3131
log = "0.4"
3232
tokio = "1.0"
3333

34-
arrow = { version = "4.0" }
3534
datafusion = { path = "../../../datafusion" }

ballista/rust/client/src/columnar_batch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::{collections::HashMap, sync::Arc};
1919

2020
use ballista_core::error::{ballista_error, Result};
2121

22-
use arrow::{
22+
use datafusion::arrow::{
2323
array::ArrayRef,
2424
datatypes::{DataType, Schema},
2525
record_batch::RecordBatch,

ballista/rust/client/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use ballista_core::{
3333
utils::create_datafusion_context,
3434
};
3535

36-
use arrow::datatypes::Schema;
36+
use datafusion::arrow::datatypes::Schema;
3737
use datafusion::catalog::TableReference;
3838
use datafusion::error::{DataFusionError, Result};
3939
use datafusion::logical_plan::LogicalPlan;

ballista/rust/core/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ tokio = "1.0"
4040
tonic = "0.4"
4141
uuid = { version = "0.8", features = ["v4"] }
4242

43-
arrow = { version = "4.0" }
4443
arrow-flight = { version = "4.0" }
4544

4645
datafusion = { path = "../../../datafusion" }

ballista/rust/core/src/client.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ use crate::serde::scheduler::{
3131
Action, ExecutePartition, ExecutePartitionResult, PartitionId, PartitionStats,
3232
};
3333

34-
use arrow::record_batch::RecordBatch;
35-
use arrow::{
36-
array::{StringArray, StructArray},
37-
error::{ArrowError, Result as ArrowResult},
38-
};
39-
use arrow::{datatypes::Schema, datatypes::SchemaRef};
4034
use arrow_flight::utils::flight_data_to_arrow_batch;
4135
use arrow_flight::Ticket;
4236
use arrow_flight::{flight_service_client::FlightServiceClient, FlightData};
37+
use datafusion::arrow::{
38+
array::{StringArray, StructArray},
39+
datatypes::{Schema, SchemaRef},
40+
error::{ArrowError, Result as ArrowResult},
41+
record_batch::RecordBatch,
42+
};
4343
use datafusion::physical_plan::common::collect;
4444
use datafusion::physical_plan::{ExecutionPlan, SendableRecordBatchStream};
4545
use datafusion::{logical_plan::LogicalPlan, physical_plan::RecordBatchStream};

ballista/rust/core/src/datasource.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
use std::{any::Any, sync::Arc};
1919

20-
use arrow::datatypes::SchemaRef;
20+
use datafusion::arrow::datatypes::SchemaRef;
2121
use datafusion::error::Result as DFResult;
2222
use datafusion::{
2323
datasource::{datasource::Statistics, TableProvider},

ballista/rust/core/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use std::{
2323
io, result,
2424
};
2525

26-
use arrow::error::ArrowError;
26+
use datafusion::arrow::error::ArrowError;
2727
use datafusion::error::DataFusionError;
2828
use sqlparser::parser;
2929

ballista/rust/core/src/execution_plans/query_stage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use std::sync::Arc;
1919
use std::{any::Any, pin::Pin};
2020

21-
use arrow::datatypes::SchemaRef;
2221
use async_trait::async_trait;
22+
use datafusion::arrow::datatypes::SchemaRef;
2323
use datafusion::physical_plan::{ExecutionPlan, Partitioning};
2424
use datafusion::{error::Result, physical_plan::RecordBatchStream};
2525
use uuid::Uuid;

ballista/rust/core/src/execution_plans/shuffle_reader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::client::BallistaClient;
2222
use crate::memory_stream::MemoryStream;
2323
use crate::serde::scheduler::PartitionLocation;
2424

25-
use arrow::datatypes::SchemaRef;
2625
use async_trait::async_trait;
26+
use datafusion::arrow::datatypes::SchemaRef;
2727
use datafusion::physical_plan::{DisplayFormatType, ExecutionPlan, Partitioning};
2828
use datafusion::{
2929
error::{DataFusionError, Result},

ballista/rust/core/src/execution_plans/unresolved_shuffle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use std::{any::Any, pin::Pin};
2121
use crate::memory_stream::MemoryStream;
2222
use crate::serde::scheduler::PartitionLocation;
2323

24-
use arrow::datatypes::SchemaRef;
2524
use async_trait::async_trait;
25+
use datafusion::arrow::datatypes::SchemaRef;
2626
use datafusion::physical_plan::{ExecutionPlan, Partitioning};
2727
use datafusion::{
2828
error::{DataFusionError, Result},

0 commit comments

Comments
 (0)