resolve conflicts

Author: xudong963

datafusion/datasource/src/file_scan_config.rs

@@ -243,7 +243,6 @@ pub struct FileScanConfigBuilder {
     file_source: Arc<dyn FileSource>,
     limit: Option<usize>,
     preserve_order: bool,
-    projection_indices: Option<Vec<usize>>,
     constraints: Option<Constraints>,
     file_groups: Vec<FileGroup>,
     statistics: Option<Statistics>,
@@ -275,7 +274,6 @@ impl FileScanConfigBuilder {
             new_lines_in_values: None,
             limit: None,
             preserve_order: false,
-            projection_indices: None,
             constraints: None,
             batch_size: None,
             expr_adapter_factory: None,
@@ -459,7 +457,6 @@ impl FileScanConfigBuilder {
             file_source,
             limit,
             preserve_order,
-            projection_indices,
             constraints,
             file_groups,
             statistics,
@@ -483,7 +480,6 @@ impl FileScanConfigBuilder {
             file_source,
             limit,
             preserve_order,
-            projection_exprs,
             constraints,
             file_groups,
             output_ordering,
@@ -508,9 +504,6 @@ impl From<FileScanConfig> for FileScanConfigBuilder {
             new_lines_in_values: Some(config.new_lines_in_values),
             limit: config.limit,
             preserve_order: config.preserve_order,
-            projection_indices: config
-                .projection_exprs
-                .map(|p| p.ordered_column_indices()),
             constraints: Some(config.constraints),
             batch_size: config.batch_size,
             expr_adapter_factory: config.expr_adapter_factory,

datafusion/execution/src/config.rs

@@ -114,10 +114,10 @@ impl Default for SessionConfig {
 }
 
 /// A type map for storing extensions.
-/// 
+///
 /// Extensions are indexed by their type `T`. If multiple values of the same type are provided, only the last one
 /// will be kept.
-/// 
+///
 /// Extensions are opaque objects that are unknown to DataFusion itself but can be downcast by optimizer rules,
 /// execution plans, or other components that have access to the session config.
 /// They provide a flexible way to attach extra data or behavior to the session config.