rebase master

Author: Kikkon

datafusion/proto/proto/datafusion.proto

@@ -1128,6 +1128,7 @@ message AvroScanExecNode {
 enum PartitionMode {
   COLLECT_LEFT = 0;
   PARTITIONED = 1;
+  AUTO = 2;
 }
 
 message HashJoinExecNode {

datafusion/proto/src/generated/pbjson.rs

@@ -521,6 +521,7 @@ impl AsExecutionPlan for PhysicalPlanNode {
                 let partition_mode = match partition_mode {
                     protobuf::PartitionMode::CollectLeft => PartitionMode::CollectLeft,
                     protobuf::PartitionMode::Partitioned => PartitionMode::Partitioned,
+                    protobuf::PartitionMode::Auto => PartitionMode::Auto,
                 };
                 Ok(Arc::new(HashJoinExec::try_new(
                     left,
@@ -810,6 +811,7 @@ impl AsExecutionPlan for PhysicalPlanNode {
             let partition_mode = match exec.partition_mode() {
                 PartitionMode::CollectLeft => protobuf::PartitionMode::CollectLeft,
                 PartitionMode::Partitioned => protobuf::PartitionMode::Partitioned,
+                PartitionMode::Auto => protobuf::PartitionMode::Auto,
             };
 
             Ok(protobuf::PhysicalPlanNode {

datafusion/proto/src/generated/prost.rs

@@ -452,7 +452,11 @@ impl TryFrom<&FileScanConfig> for protobuf::FileScanExecConf {
                 .map(|n| *n as u32)
                 .collect(),
             schema: Some(conf.file_schema.as_ref().try_into()?),
-            table_partition_cols: conf.table_partition_cols.to_vec(),
+            table_partition_cols: conf
+                .table_partition_cols
+                .iter()
+                .map(|x| x.0.clone())
+                .collect::<Vec<_>>(),
             object_store_url: conf.object_store_url.to_string(),
         })
     }