Merge remote-tracking branch 'upstream/main' into feature/9466

# Conflicts:
#	datafusion/expr/src/built_in_function.rs
#	datafusion/expr/src/expr_fn.rs
#	datafusion/proto/proto/datafusion.proto
#	datafusion/proto/src/generated/pbjson.rs
#	datafusion/proto/src/generated/prost.rs
#	datafusion/proto/src/logical_plan/from_proto.rs
#	datafusion/proto/src/logical_plan/to_proto.rs

.github/workflows/docs.yaml

@@ -61,4 +61,4 @@ jobs:
             git add --all
             git commit -m 'Publish built docs triggered by ${{ github.sha }}'
             git push || git push --force
-          fi
+          fi

benchmarks/src/parquet_filter.rs

@@ -15,8 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::AccessLogOpt;
-use crate::{BenchmarkRun, CommonOpt};
+use std::path::PathBuf;
+
+use crate::{AccessLogOpt, BenchmarkRun, CommonOpt};
+
 use arrow::util::pretty;
 use datafusion::common::Result;
 use datafusion::logical_expr::utils::disjunction;
@@ -25,7 +27,7 @@ use datafusion::physical_plan::collect;
 use datafusion::prelude::{col, SessionContext};
 use datafusion::test_util::parquet::{ParquetScanOptions, TestParquetFile};
 use datafusion_common::instant::Instant;
-use std::path::PathBuf;
+
 use structopt::StructOpt;
 
 /// Test performance of parquet filter pushdown
@@ -179,7 +181,7 @@ async fn exec_scan(
     debug: bool,
 ) -> Result<(usize, std::time::Duration)> {
     let start = Instant::now();
-    let exec = test_file.create_scan(Some(filter)).await?;
+    let exec = test_file.create_scan(ctx, Some(filter)).await?;
 
     let task_ctx = ctx.task_ctx();
     let result = collect(exec, task_ctx).await?;

benchmarks/src/sort.rs

@@ -15,9 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::AccessLogOpt;
-use crate::BenchmarkRun;
-use crate::CommonOpt;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::{AccessLogOpt, BenchmarkRun, CommonOpt};
+
 use arrow::util::pretty;
 use datafusion::common::Result;
 use datafusion::physical_expr::PhysicalSortExpr;
@@ -26,8 +28,7 @@ use datafusion::physical_plan::sorts::sort::SortExec;
 use datafusion::prelude::{SessionConfig, SessionContext};
 use datafusion::test_util::parquet::TestParquetFile;
 use datafusion_common::instant::Instant;
-use std::path::PathBuf;
-use std::sync::Arc;
+
 use structopt::StructOpt;
 
 /// Test performance of sorting large datasets
@@ -174,7 +175,7 @@ async fn exec_sort(
     debug: bool,
 ) -> Result<(usize, std::time::Duration)> {
     let start = Instant::now();
-    let scan = test_file.create_scan(None).await?;
+    let scan = test_file.create_scan(ctx, None).await?;
     let exec = Arc::new(SortExec::new(expr.to_owned(), scan));
     let task_ctx = ctx.task_ctx();
     let result = collect(exec, task_ctx).await?;

benchmarks/src/tpch/run.rs

@@ -15,8 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use super::get_query_sql;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use super::{
+    get_query_sql, get_tbl_tpch_table_schema, get_tpch_table_schema, TPCH_TABLES,
+};
 use crate::{BenchmarkRun, CommonOpt};
+
 use arrow::record_batch::RecordBatch;
 use arrow::util::pretty::{self, pretty_format_batches};
 use datafusion::datasource::file_format::csv::CsvFormat;
@@ -26,21 +32,16 @@ use datafusion::datasource::listing::{
     ListingOptions, ListingTable, ListingTableConfig, ListingTableUrl,
 };
 use datafusion::datasource::{MemTable, TableProvider};
+use datafusion::error::Result;
 use datafusion::physical_plan::display::DisplayableExecutionPlan;
 use datafusion::physical_plan::{collect, displayable};
-use datafusion_common::{DEFAULT_CSV_EXTENSION, DEFAULT_PARQUET_EXTENSION};
-use log::info;
-
+use datafusion::prelude::*;
 use datafusion_common::instant::Instant;
-use std::path::PathBuf;
-use std::sync::Arc;
+use datafusion_common::{DEFAULT_CSV_EXTENSION, DEFAULT_PARQUET_EXTENSION};
 
-use datafusion::error::Result;
-use datafusion::prelude::*;
+use log::info;
 use structopt::StructOpt;
 
-use super::{get_tbl_tpch_table_schema, get_tpch_table_schema, TPCH_TABLES};
-
 /// Run the tpch benchmark.
 ///
 /// This benchmarks is derived from the [TPC-H][1] version
@@ -253,7 +254,7 @@ impl RunOpt {
                 }
                 "parquet" => {
                     let path = format!("{path}/{table}");
-                    let format = ParquetFormat::default().with_enable_pruning(Some(true));
+                    let format = ParquetFormat::default().with_enable_pruning(true);
 
                     (Arc::new(format), path, DEFAULT_PARQUET_EXTENSION)
                 }
@@ -298,11 +299,12 @@ struct QueryResult {
 // Only run with "ci" mode when we have the data
 #[cfg(feature = "ci")]
 mod tests {
+    use std::path::Path;
+
     use super::*;
+
     use datafusion::common::exec_err;
     use datafusion::error::{DataFusionError, Result};
-    use std::path::Path;
-
     use datafusion_proto::bytes::{
         logical_plan_from_bytes, logical_plan_to_bytes, physical_plan_from_bytes,
         physical_plan_to_bytes,

datafusion-cli/src/catalog.rs

@@ -15,8 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::object_storage::get_object_store;
-use async_trait::async_trait;
+use std::any::Any;
+use std::sync::{Arc, Weak};
+
+use crate::object_storage::{get_object_store, AwsOptions, GcpOptions};
+
 use datafusion::catalog::schema::SchemaProvider;
 use datafusion::catalog::{CatalogProvider, CatalogProviderList};
 use datafusion::common::plan_datafusion_err;
@@ -26,12 +29,10 @@ use datafusion::datasource::listing::{
 use datafusion::datasource::TableProvider;
 use datafusion::error::Result;
 use datafusion::execution::context::SessionState;
+
+use async_trait::async_trait;
 use dirs::home_dir;
 use parking_lot::RwLock;
-use std::any::Any;
-use std::collections::HashMap;
-use std::sync::{Arc, Weak};
-use url::Url;
 
 /// Wraps another catalog, automatically creating table providers
 /// for local files if needed
@@ -155,15 +156,16 @@ impl SchemaProvider for DynamicFileSchemaProvider {
 
         // if the inner schema provider didn't have a table by
         // that name, try to treat it as a listing table
-        let state = self
+        let mut state = self
             .state
             .upgrade()
             .ok_or_else(|| plan_datafusion_err!("locking error"))?
             .read()
             .clone();
         let optimized_name = substitute_tilde(name.to_owned());
         let table_url = ListingTableUrl::parse(optimized_name.as_str())?;
-        let url: &Url = table_url.as_ref();
+        let scheme = table_url.scheme();
+        let url = table_url.as_ref();
 
         // If the store is already registered for this URL then `get_store`
         // will return `Ok` which means we don't need to register it again. However,
@@ -174,10 +176,22 @@ impl SchemaProvider for DynamicFileSchemaProvider {
             Err(_) => {
                 // Register the store for this URL. Here we don't have access
                 // to any command options so the only choice is to use an empty collection
-                let mut options = HashMap::new();
-                let store =
-                    get_object_store(&state, &mut options, table_url.scheme(), url)
-                        .await?;
+                match scheme {
+                    "s3" | "oss" => {
+                        state = state.add_table_options_extension(AwsOptions::default());
+                    }
+                    "gs" | "gcs" => {
+                        state = state.add_table_options_extension(GcpOptions::default())
+                    }
+                    _ => {}
+                };
+                let store = get_object_store(
+                    &state,
+                    table_url.scheme(),
+                    url,
+                    state.default_table_options(),
+                )
+                .await?;
                 state.runtime_env().register_object_store(url, store);
             }
         }
@@ -215,6 +229,7 @@ fn substitute_tilde(cur: String) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
+
     use datafusion::catalog::schema::SchemaProvider;
     use datafusion::prelude::SessionContext;