Merge branch 'apache:main' into 7181/cascading-loser-tree-merges

Cargo.toml

@@ -29,7 +29,7 @@ license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/apache/arrow-datafusion"
 rust-version = "1.70"
-version = "29.0.0"
+version = "30.0.0"
 
 [workspace.dependencies]
 arrow = { version = "45.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
@@ -38,7 +38,7 @@ arrow-buffer = { version = "45.0.0", default-features = false }
 arrow-flight = { version = "45.0.0", features = ["flight-sql-experimental"] }
 arrow-schema = { version = "45.0.0", default-features = false }
 parquet = { version = "45.0.0", features = ["arrow", "async", "object_store"] }
-sqlparser = { version = "0.36.1", features = ["visitor"] }
+sqlparser = { version = "0.37.0", features = ["visitor"] }
 
 [profile.release]
 codegen-units = 1

benchmarks/Cargo.toml

@@ -18,7 +18,7 @@
 [package]
 name = "datafusion-benchmarks"
 description = "DataFusion Benchmarks"
-version = "29.0.0"
+version = "30.0.0"
 edition = { workspace = true }
 authors = ["Apache Arrow <[email protected]>"]
 homepage = "https://github.com/apache/arrow-datafusion"
@@ -34,7 +34,8 @@ snmalloc = ["snmalloc-rs"]
 
 [dependencies]
 arrow = { workspace = true }
-datafusion = { path = "../datafusion/core", version = "29.0.0" }
+datafusion = { path = "../datafusion/core", version = "30.0.0" }
+datafusion-common = { path = "../datafusion/common", version = "30.0.0" }
 env_logger = "0.10"
 futures = "0.3"
 log = "^0.4"
@@ -49,4 +50,4 @@ test-utils = { path = "../test-utils/", version = "0.1.0" }
 tokio = { version = "^1.0", features = ["macros", "rt", "rt-multi-thread", "parking_lot"] }
 
 [dev-dependencies]
-datafusion-proto = { path = "../datafusion/proto", version = "29.0.0" }
+datafusion-proto = { path = "../datafusion/proto", version = "30.0.0" }

benchmarks/src/clickbench.rs

@@ -18,6 +18,7 @@
 use std::{path::PathBuf, time::Instant};
 
 use datafusion::{
+    common::exec_err,
     error::{DataFusionError, Result},
     prelude::SessionContext,
 };
@@ -123,9 +124,9 @@ impl RunOpt {
     /// Returns the text of query `query_id`
     fn get_query(&self, query_id: usize) -> Result<String> {
         if query_id > CLICKBENCH_QUERY_END_ID {
-            return Err(DataFusionError::Execution(format!(
+            return exec_err!(
                 "Invalid query id {query_id}. Must be between {CLICKBENCH_QUERY_START_ID} and {CLICKBENCH_QUERY_END_ID}"
-            )));
+            );
         }
 
         let path = self.queries_path.as_path();

benchmarks/src/tpch/run.rs

@@ -19,17 +19,16 @@ use super::get_query_sql;
 use crate::{BenchmarkRun, CommonOpt};
 use arrow::record_batch::RecordBatch;
 use arrow::util::pretty::{self, pretty_format_batches};
-use datafusion::datasource::file_format::csv::{CsvFormat, DEFAULT_CSV_EXTENSION};
-use datafusion::datasource::file_format::parquet::{
-    ParquetFormat, DEFAULT_PARQUET_EXTENSION,
-};
+use datafusion::datasource::file_format::csv::CsvFormat;
+use datafusion::datasource::file_format::parquet::ParquetFormat;
 use datafusion::datasource::file_format::FileFormat;
 use datafusion::datasource::listing::{
     ListingOptions, ListingTable, ListingTableConfig, ListingTableUrl,
 };
 use datafusion::datasource::{MemTable, TableProvider};
 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 std::path::PathBuf;
@@ -300,6 +299,7 @@ struct QueryResult {
 #[cfg(feature = "ci")]
 mod tests {
     use super::*;
+    use datafusion::common::exec_err;
     use datafusion::error::{DataFusionError, Result};
     use std::path::Path;
 
@@ -312,10 +312,10 @@ mod tests {
         let path =
             std::env::var("TPCH_DATA").unwrap_or_else(|_| "benchmarks/data".to_string());
         if !Path::new(&path).exists() {
-            return Err(DataFusionError::Execution(format!(
+            return exec_err!(
                 "Benchmark data not found (set TPCH_DATA env var to override): {}",
                 path
-            )));
+            );
         }
         Ok(path)
     }