Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to DataFusion 34.0.0-rc1 #927

Merged
merged 10 commits into from
Dec 12, 2023
Merged

Upgrade to DataFusion 34.0.0-rc1 #927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
95eddb1
Use latest DF
andygrove Dec 10, 2023
e6ce96d
update deps
andygrove Dec 10, 2023
b3cb1b2
Set max encoding size
andygrove Dec 11, 2023
b1e250c
tests compile now
andygrove Dec 11, 2023
c9f821d
upmerge
andygrove Dec 11, 2023
6d17c70
fix some todo comments
andygrove Dec 11, 2023
ba9f792
address another todo item
andygrove Dec 11, 2023
bdfa313
specify message sizes in gRPC clients as well
andygrove Dec 12, 2023
64d1a30
fix typo and use 34 rc1
andygrove Dec 12, 2023
afc9746
Merge remote-tracking branch 'apache/main' into df-34
andygrove Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ballista/client/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ impl BallistaContext {
let connection = create_grpc_client_connection(scheduler_url.clone())
.await
.map_err(|e| DataFusionError::Execution(format!("{e:?}")))?;
let mut scheduler = SchedulerGrpcClient::new(connection);
let mut scheduler = SchedulerGrpcClient::new(connection)
.max_encoding_message_size(16 * 1024 * 1024)
.max_decoding_message_size(16 * 1024 * 1024);

let remote_session_id = scheduler
.create_session(CreateSessionParams {
Expand Down
4 changes: 3 additions & 1 deletion ballista/core/src/execution_plans/distributed_query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,9 @@ async fn execute_query(
.await
.map_err(|e| DataFusionError::Execution(format!("{e:?}")))?;

let mut scheduler = SchedulerGrpcClient::new(connection);
let mut scheduler = SchedulerGrpcClient::new(connection)
.max_encoding_message_size(16 * 1024 * 1024)
.max_decoding_message_size(16 * 1024 * 1024);

let query_result = scheduler
.execute_query(query)
Expand Down
4 changes: 2 additions & 2 deletions ballista/core/src/serde/generated/ballista.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ pub mod scheduler_grpc_client {
);
self.inner.unary(req, path, codec).await
}
/// Push-based task scheduler will only leverage this interface
/// Push-based task schedSchuler will only leverage this interface
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to have gone wrong here

/// rather than the PollWork interface to report executor states
pub async fn heart_beat_from_executor(
&mut self,
Expand Down Expand Up @@ -1854,7 +1854,7 @@ pub mod scheduler_grpc_server {
tonic::Response<super::RegisterExecutorResult>,
tonic::Status,
>;
/// Push-based task scheduler will only leverage this interface
/// Push-based task schedSchuler will only leverage this interface
/// rather than the PollWork interface to report executor states
async fn heart_beat_from_executor(
&self,
Expand Down
4 changes: 3 additions & 1 deletion ballista/executor/src/executor_process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ pub async fn start_executor_process(opt: Arc<ExecutorProcessConfig>) -> Result<(
}
}?;

let mut scheduler = SchedulerGrpcClient::new(connection);
let mut scheduler = SchedulerGrpcClient::new(connection)
.max_encoding_message_size(16 * 1024 * 1024)
.max_decoding_message_size(16 * 1024 * 1024);

let default_codec: BallistaCodec<LogicalPlanNode, PhysicalPlanNode> =
BallistaCodec::default();
Expand Down
4 changes: 3 additions & 1 deletion ballista/executor/src/executor_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,9 @@ impl<T: 'static + AsLogicalPlan, U: 'static + AsExecutionPlan> ExecutorServer<T,
} else {
let scheduler_url = format!("http://{scheduler_id}");
let connection = create_grpc_client_connection(scheduler_url).await?;
let scheduler = SchedulerGrpcClient::new(connection);
let scheduler = SchedulerGrpcClient::new(connection)
.max_encoding_message_size(16 * 1024 * 1024)
.max_decoding_message_size(16 * 1024 * 1024);

{
self.schedulers
Expand Down
Loading