Skip to content

Commit 5a3fa78

Browse files
adriangbadriangb
committed
fix
1 parent f2aa11b commit 5a3fa78

File tree

2 files changed

+37
-39
lines changed

2 files changed

+37
-39
lines changed

‎datafusion/proto/src/bytes/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ pub fn physical_plan_from_json(
313313
let back: protobuf::PhysicalPlanNode = serde_json::from_str(json)
314314
.map_err(|e| plan_datafusion_err!("Error serializing plan: {e}"))?;
315315
let extension_codec = DefaultPhysicalExtensionCodec {};
316-
back.try_into_physical_plan(&ctx, &extension_codec)
316+
let decode_ctx = DecodeContext::new(ctx);
317+
back.try_into_physical_plan(&decode_ctx, &extension_codec)
317318
}
318319

319320
/// Deserialize a PhysicalPlan from bytes

‎datafusion/proto/src/physical_plan/mod.rs‎

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -180,133 +180,130 @@ impl AsExecutionPlan for protobuf::PhysicalPlanNode {
180180
})?;
181181
match plan {
182182
PhysicalPlanType::Explain(explain) => {
183-
self.try_into_explain_physical_plan(explain, &decode_ctx, extension_codec)
183+
self.try_into_explain_physical_plan(explain, decode_ctx, extension_codec)
184184
}
185185
PhysicalPlanType::Projection(projection) => self
186186
.try_into_projection_physical_plan(
187187
projection,
188-
&decode_ctx,
188+
decode_ctx,
189189
extension_codec,
190190
),
191191
PhysicalPlanType::Filter(filter) => {
192-
self.try_into_filter_physical_plan(filter, &decode_ctx, extension_codec)
192+
self.try_into_filter_physical_plan(filter, decode_ctx, extension_codec)
193193
}
194194
PhysicalPlanType::CsvScan(scan) => {
195-
self.try_into_csv_scan_physical_plan(scan, &decode_ctx, extension_codec)
195+
self.try_into_csv_scan_physical_plan(scan, decode_ctx, extension_codec)
196196
}
197197
PhysicalPlanType::JsonScan(scan) => {
198-
self.try_into_json_scan_physical_plan(scan, &decode_ctx, extension_codec)
198+
self.try_into_json_scan_physical_plan(scan, decode_ctx, extension_codec)
199199
}
200200
#[cfg_attr(not(feature = "parquet"), allow(unused_variables))]
201201
PhysicalPlanType::ParquetScan(scan) => self
202-
.try_into_parquet_scan_physical_plan(scan, &decode_ctx, extension_codec),
202+
.try_into_parquet_scan_physical_plan(scan, decode_ctx, extension_codec),
203203
#[cfg_attr(not(feature = "avro"), allow(unused_variables))]
204204
PhysicalPlanType::AvroScan(scan) => {
205-
self.try_into_avro_scan_physical_plan(scan, &decode_ctx, extension_codec)
205+
self.try_into_avro_scan_physical_plan(scan, decode_ctx, extension_codec)
206+
}
207+
PhysicalPlanType::MemoryScan(scan) => {
208+
self.try_into_memory_scan_physical_plan(scan, decode_ctx, extension_codec)
206209
}
207-
PhysicalPlanType::MemoryScan(scan) => self
208-
.try_into_memory_scan_physical_plan(scan, &decode_ctx, extension_codec),
209210
PhysicalPlanType::CoalesceBatches(coalesce_batches) => self
210211
.try_into_coalesce_batches_physical_plan(
211212
coalesce_batches,
212-
&decode_ctx,
213+
decode_ctx,
213214
extension_codec,
214215
),
215216
PhysicalPlanType::Merge(merge) => {
216-
self.try_into_merge_physical_plan(merge, &decode_ctx, extension_codec)
217+
self.try_into_merge_physical_plan(merge, decode_ctx, extension_codec)
217218
}
218219
PhysicalPlanType::Repartition(repart) => self
219-
.try_into_repartition_physical_plan(repart, &decode_ctx, extension_codec),
220+
.try_into_repartition_physical_plan(repart, decode_ctx, extension_codec),
220221
PhysicalPlanType::GlobalLimit(limit) => self
221-
.try_into_global_limit_physical_plan(limit, &decode_ctx, extension_codec),
222+
.try_into_global_limit_physical_plan(limit, decode_ctx, extension_codec),
222223
PhysicalPlanType::LocalLimit(limit) => self
223-
.try_into_local_limit_physical_plan(limit, &decode_ctx, extension_codec),
224+
.try_into_local_limit_physical_plan(limit, decode_ctx, extension_codec),
224225
PhysicalPlanType::Window(window_agg) => self.try_into_window_physical_plan(
225226
window_agg,
226-
&decode_ctx,
227+
decode_ctx,
227228
extension_codec,
228229
),
229230
PhysicalPlanType::Aggregate(hash_agg) => self
230-
.try_into_aggregate_physical_plan(hash_agg, &decode_ctx, extension_codec),
231+
.try_into_aggregate_physical_plan(hash_agg, decode_ctx, extension_codec),
231232
PhysicalPlanType::HashJoin(hashjoin) => self
232-
.try_into_hash_join_physical_plan(hashjoin, &decode_ctx, extension_codec),
233+
.try_into_hash_join_physical_plan(hashjoin, decode_ctx, extension_codec),
233234
PhysicalPlanType::SymmetricHashJoin(sym_join) => self
234235
.try_into_symmetric_hash_join_physical_plan(
235236
sym_join,
236-
&decode_ctx,
237+
decode_ctx,
237238
extension_codec,
238239
),
239240
PhysicalPlanType::Union(union) => {
240-
self.try_into_union_physical_plan(union, &decode_ctx, extension_codec)
241+
self.try_into_union_physical_plan(union, decode_ctx, extension_codec)
241242
}
242243
PhysicalPlanType::Interleave(interleave) => self
243244
.try_into_interleave_physical_plan(
244245
interleave,
245-
&decode_ctx,
246+
decode_ctx,
246247
extension_codec,
247248
),
248249
PhysicalPlanType::CrossJoin(crossjoin) => self
249250
.try_into_cross_join_physical_plan(
250251
crossjoin,
251-
&decode_ctx,
252+
decode_ctx,
252253
extension_codec,
253254
),
254255
PhysicalPlanType::Empty(empty) => {
255-
self.try_into_empty_physical_plan(empty, &decode_ctx, extension_codec)
256+
self.try_into_empty_physical_plan(empty, decode_ctx, extension_codec)
256257
}
257258
PhysicalPlanType::PlaceholderRow(placeholder) => self
258259
.try_into_placeholder_row_physical_plan(
259260
placeholder,
260-
&decode_ctx,
261+
decode_ctx,
261262
extension_codec,
262263
),
263264
PhysicalPlanType::Sort(sort) => {
264-
self.try_into_sort_physical_plan(sort, &decode_ctx, extension_codec)
265+
self.try_into_sort_physical_plan(sort, decode_ctx, extension_codec)
265266
}
266267
PhysicalPlanType::SortPreservingMerge(sort) => self
267268
.try_into_sort_preserving_merge_physical_plan(
268269
sort,
269-
&decode_ctx,
270+
decode_ctx,
270271
extension_codec,
271272
),
272273
PhysicalPlanType::Extension(extension) => self
273-
.try_into_extension_physical_plan(
274-
extension,
275-
&decode_ctx,
276-
extension_codec,
277-
),
274+
.try_into_extension_physical_plan(extension, decode_ctx, extension_codec),
278275
PhysicalPlanType::NestedLoopJoin(join) => self
279276
.try_into_nested_loop_join_physical_plan(
280277
join,
281-
&decode_ctx,
278+
decode_ctx,
282279
extension_codec,
283280
),
284281
PhysicalPlanType::Analyze(analyze) => {
285-
self.try_into_analyze_physical_plan(analyze, &decode_ctx, extension_codec)
282+
self.try_into_analyze_physical_plan(analyze, decode_ctx, extension_codec)
286283
}
287284
PhysicalPlanType::JsonSink(sink) => {
288-
self.try_into_json_sink_physical_plan(sink, &decode_ctx, extension_codec)
285+
self.try_into_json_sink_physical_plan(sink, decode_ctx, extension_codec)
289286
}
290287
PhysicalPlanType::CsvSink(sink) => {
291-
self.try_into_csv_sink_physical_plan(sink, &decode_ctx, extension_codec)
288+
self.try_into_csv_sink_physical_plan(sink, decode_ctx, extension_codec)
292289
}
293290
#[cfg_attr(not(feature = "parquet"), allow(unused_variables))]
294291
PhysicalPlanType::ParquetSink(sink) => self
295-
.try_into_parquet_sink_physical_plan(sink, &decode_ctx, extension_codec),
292+
.try_into_parquet_sink_physical_plan(sink, decode_ctx, extension_codec),
296293
PhysicalPlanType::Unnest(unnest) => {
297-
self.try_into_unnest_physical_plan(unnest, &decode_ctx, extension_codec)
294+
self.try_into_unnest_physical_plan(unnest, decode_ctx, extension_codec)
298295
}
299296
PhysicalPlanType::Cooperative(cooperative) => self
300297
.try_into_cooperative_physical_plan(
301298
cooperative,
302-
&decode_ctx,
299+
decode_ctx,
303300
extension_codec,
304301
),
305302
PhysicalPlanType::GenerateSeries(generate_series) => {
306303
self.try_into_generate_series_physical_plan(generate_series)
307304
}
308305
PhysicalPlanType::SortMergeJoin(sort_join) => {
309-
self.try_into_sort_join(sort_join, &decode_ctx, extension_codec)
306+
self.try_into_sort_join(sort_join, decode_ctx, extension_codec)
310307
}
311308
}
312309
}

0 commit comments

Comments
 (0)