[arrow-datafusion] branch main updated: Move file format config.rs to live with the rest of the datasource code (#5406)

[alamb]

This is an automated email from the ASF dual-hosted git repository.

alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git


The following commit(s) were added to refs/heads/main by this push:
     new 58cd1bf0b Move file format config.rs to live with the rest of the 
datasource code (#5406)
58cd1bf0b is described below

commit 58cd1bf0b877905903a20df633ed4f72d4b4b2ac
Author: Andrew Lamb <and...@nerdnetworks.org>
AuthorDate: Mon Feb 27 13:13:24 2023 +0100

    Move file format config.rs to live with the rest of the datasource code 
(#5406)
---
 datafusion/core/src/datasource/file_format/mod.rs                    | 1 +
 datafusion/core/src/{execution => datasource/file_format}/options.rs | 2 +-
 datafusion/core/src/execution/mod.rs                                 | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/datafusion/core/src/datasource/file_format/mod.rs 
b/datafusion/core/src/datasource/file_format/mod.rs
index e753364a5..947327630 100644
--- a/datafusion/core/src/datasource/file_format/mod.rs
+++ b/datafusion/core/src/datasource/file_format/mod.rs
@@ -24,6 +24,7 @@ pub mod avro;
 pub mod csv;
 pub mod file_type;
 pub mod json;
+pub mod options;
 pub mod parquet;
 
 use std::any::Any;
diff --git a/datafusion/core/src/execution/options.rs 
b/datafusion/core/src/datasource/file_format/options.rs
similarity index 99%
rename from datafusion/core/src/execution/options.rs
rename to datafusion/core/src/datasource/file_format/options.rs
index c7a5dea7e..e51edf829 100644
--- a/datafusion/core/src/execution/options.rs
+++ b/datafusion/core/src/datasource/file_format/options.rs
@@ -23,7 +23,6 @@ use arrow::datatypes::{DataType, Schema, SchemaRef};
 use async_trait::async_trait;
 use datafusion_common::DataFusionError;
 
-use super::context::{SessionConfig, SessionState};
 use crate::datasource::file_format::avro::DEFAULT_AVRO_EXTENSION;
 use crate::datasource::file_format::csv::DEFAULT_CSV_EXTENSION;
 use crate::datasource::file_format::file_type::FileCompressionType;
@@ -38,6 +37,7 @@ use crate::datasource::{
     listing::ListingOptions,
 };
 use crate::error::Result;
+use crate::execution::context::{SessionConfig, SessionState};
 
 /// Options that control the reading of CSV files.
 ///
diff --git a/datafusion/core/src/execution/mod.rs 
b/datafusion/core/src/execution/mod.rs
index 5eb859df9..8761237bd 100644
--- a/datafusion/core/src/execution/mod.rs
+++ b/datafusion/core/src/execution/mod.rs
@@ -43,7 +43,8 @@
 pub mod context;
 pub mod disk_manager;
 pub mod memory_pool;
-pub mod options;
+// backwards compatibility
+pub use crate::datasource::file_format::options;
 pub mod registry;
 pub mod runtime_env;