fix: resolve proto conflicts

Author: jcsherin

datafusion/proto-common/src/generated/pbjson.rs

@@ -2007,12 +2007,7 @@ impl<'de> serde::Deserialize<'de> for CsvOptions {
                             if truncated_rows__.is_some() {
                                 return Err(serde::de::Error::duplicate_field("truncatedRows"));
                             }
-<<<<<<< HEAD
-                            
-                            truncated_rows__ =
-=======
                             truncated_rows__ = 
->>>>>>> upstream/branch-51
                                 Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
                             ;
                         }

datafusion/proto/src/lib.rs

@@ -97,8 +97,6 @@
 //!  assert_eq!(format!("{:?}", plan), format!("{:?}", logical_round_trip));
 //! # Ok(())
 //! # }
-<<<<<<< HEAD
-=======
 //! ```
 //! # Example: Serializing [`ExecutionPlan`]s
 //!
@@ -122,7 +120,6 @@
 //! # Ok(())
 //! # }
 //! ```
->>>>>>> upstream/branch-51
 pub mod bytes;
 pub mod common;
 pub mod generated;

datafusion/proto/tests/cases/roundtrip_physical_plan.rs

@@ -32,13 +32,10 @@ use arrow::csv::WriterBuilder;
 use arrow::datatypes::{Fields, TimeUnit};
 use datafusion::physical_expr::aggregate::AggregateExprBuilder;
 use datafusion::physical_plan::coalesce_batches::CoalesceBatchesExec;
-<<<<<<< HEAD
 use datafusion::physical_plan::node_id::{
     annotate_node_id_for_execution_plan, NodeIdAnnotator,
 };
-=======
 use datafusion::physical_plan::metrics::MetricType;
->>>>>>> upstream/branch-51
 use datafusion_expr::dml::InsertOp;
 use datafusion_functions_aggregate::approx_percentile_cont::approx_percentile_cont_udaf;
 use datafusion_functions_aggregate::array_agg::array_agg_udaf;
@@ -150,14 +147,8 @@ fn roundtrip_test_and_return(
     let proto: protobuf::PhysicalPlanNode =
         protobuf::PhysicalPlanNode::try_from_physical_plan(exec_plan.clone(), codec)
             .expect("to proto");
-<<<<<<< HEAD
-    let runtime = ctx.runtime_env();
     let mut result_exec_plan: Arc<dyn ExecutionPlan> = proto
-        .try_into_physical_plan(ctx, runtime.deref(), codec)
-=======
-    let result_exec_plan: Arc<dyn ExecutionPlan> = proto
         .try_into_physical_plan(&ctx.task_ctx(), codec)
->>>>>>> upstream/branch-51
         .expect("from proto");
 
     // Qi: workaround for NodeId not being serialized/deserialized,