Merge branch 'main' of github.com:apache/datafusion into dev/xinli/co…

…ncat_string_view

.github/workflows/rust.yml

@@ -233,11 +233,7 @@ jobs:
         with:
           rust-version: stable
       - name: Run cargo doc
-        run: |
-          export RUSTDOCFLAGS="-D warnings"
-          cargo doc --document-private-items --no-deps --workspace
-          cd datafusion-cli
-          cargo doc --document-private-items --no-deps
+        run: ci/scripts/rust_docs.sh
 
   linux-wasm-pack:
     name: build with wasm-pack

Cargo.toml

@@ -55,7 +55,7 @@ license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/apache/datafusion"
 rust-version = "1.76"
-version = "40.0.0"
+version = "41.0.0"
 
 [workspace.dependencies]
 # We turn off default-features for some dependencies here so the workspaces which inherit them can
@@ -88,25 +88,25 @@ bytes = "1.4"
 chrono = { version = "0.4.34", default-features = false }
 ctor = "0.2.0"
 dashmap = "6.0.1"
-datafusion = { path = "datafusion/core", version = "40.0.0", default-features = false }
-datafusion-catalog = { path = "datafusion/catalog", version = "40.0.0" }
-datafusion-common = { path = "datafusion/common", version = "40.0.0", default-features = false }
-datafusion-common-runtime = { path = "datafusion/common-runtime", version = "40.0.0" }
-datafusion-execution = { path = "datafusion/execution", version = "40.0.0" }
-datafusion-expr = { path = "datafusion/expr", version = "40.0.0" }
-datafusion-functions = { path = "datafusion/functions", version = "40.0.0" }
-datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "40.0.0" }
-datafusion-functions-nested = { path = "datafusion/functions-nested", version = "40.0.0" }
-datafusion-optimizer = { path = "datafusion/optimizer", version = "40.0.0", default-features = false }
-datafusion-physical-expr = { path = "datafusion/physical-expr", version = "40.0.0", default-features = false }
-datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "40.0.0", default-features = false }
-datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "40.0.0" }
-datafusion-physical-plan = { path = "datafusion/physical-plan", version = "40.0.0" }
-datafusion-proto = { path = "datafusion/proto", version = "40.0.0" }
-datafusion-proto-common = { path = "datafusion/proto-common", version = "40.0.0" }
-datafusion-sql = { path = "datafusion/sql", version = "40.0.0" }
-datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "40.0.0" }
-datafusion-substrait = { path = "datafusion/substrait", version = "40.0.0" }
+datafusion = { path = "datafusion/core", version = "41.0.0", default-features = false }
+datafusion-catalog = { path = "datafusion/catalog", version = "41.0.0" }
+datafusion-common = { path = "datafusion/common", version = "41.0.0", default-features = false }
+datafusion-common-runtime = { path = "datafusion/common-runtime", version = "41.0.0" }
+datafusion-execution = { path = "datafusion/execution", version = "41.0.0" }
+datafusion-expr = { path = "datafusion/expr", version = "41.0.0" }
+datafusion-functions = { path = "datafusion/functions", version = "41.0.0" }
+datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "41.0.0" }
+datafusion-functions-nested = { path = "datafusion/functions-nested", version = "41.0.0" }
+datafusion-optimizer = { path = "datafusion/optimizer", version = "41.0.0", default-features = false }
+datafusion-physical-expr = { path = "datafusion/physical-expr", version = "41.0.0", default-features = false }
+datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "41.0.0", default-features = false }
+datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "41.0.0" }
+datafusion-physical-plan = { path = "datafusion/physical-plan", version = "41.0.0" }
+datafusion-proto = { path = "datafusion/proto", version = "41.0.0" }
+datafusion-proto-common = { path = "datafusion/proto-common", version = "41.0.0" }
+datafusion-sql = { path = "datafusion/sql", version = "41.0.0" }
+datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "41.0.0" }
+datafusion-substrait = { path = "datafusion/substrait", version = "41.0.0" }
 doc-comment = "0.3"
 env_logger = "0.11"
 futures = "0.3"

benchmarks/src/bin/dfbench.rs

@@ -20,6 +20,11 @@ use datafusion::error::Result;
 
 use structopt::StructOpt;
 
+#[cfg(all(feature = "snmalloc", feature = "mimalloc"))]
+compile_error!(
+    "feature \"snmalloc\" and feature \"mimalloc\" cannot be enabled at the same time"
+);
+
 #[cfg(feature = "snmalloc")]
 #[global_allocator]
 static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;

benchmarks/src/bin/tpch.rs

@@ -21,6 +21,11 @@ use datafusion::error::Result;
 use datafusion_benchmarks::tpch;
 use structopt::StructOpt;
 
+#[cfg(all(feature = "snmalloc", feature = "mimalloc"))]
+compile_error!(
+    "feature \"snmalloc\" and feature \"mimalloc\" cannot be enabled at the same time"
+);
+
 #[cfg(feature = "snmalloc")]
 #[global_allocator]
 static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;

ci/scripts/rust_docs.sh

@@ -18,7 +18,7 @@
 # under the License.
 
 set -ex
-export RUSTDOCFLAGS="-D warnings -A rustdoc::private-intra-doc-links"
+export RUSTDOCFLAGS="-D warnings"
 cargo doc --document-private-items --no-deps --workspace
 cd datafusion-cli
 cargo doc --document-private-items --no-deps

datafusion-cli/Cargo.toml

@@ -18,7 +18,7 @@
 [package]
 name = "datafusion-cli"
 description = "Command Line Client for DataFusion query engine."
-version = "40.0.0"
+version = "41.0.0"
 authors = ["Apache DataFusion <[email protected]>"]
 edition = "2021"
 keywords = ["arrow", "datafusion", "query", "sql"]
@@ -35,7 +35,7 @@ async-trait = "0.1.41"
 aws-config = "0.55"
 aws-credential-types = "0.55"
 clap = { version = "3", features = ["derive", "cargo"] }
-datafusion = { path = "../datafusion/core", version = "40.0.0", features = [
+datafusion = { path = "../datafusion/core", version = "41.0.0", features = [
     "avro",
     "crypto_expressions",
     "datetime_expressions",

datafusion/core/src/dataframe/mod.rs

@@ -717,7 +717,10 @@ impl DataFrame {
                             {
                                 let column =
                                     batchs[0].column_by_name(field.name()).unwrap();
-                                if field.data_type().is_numeric() {
+
+                                if column.data_type().is_null() {
+                                    Arc::new(StringArray::from(vec!["null"]))
+                                } else if field.data_type().is_numeric() {
                                     cast(column, &DataType::Float64)?
                                 } else {
                                     cast(column, &DataType::Utf8)?

datafusion/core/src/datasource/listing/helpers.rs

@@ -21,11 +21,11 @@ use std::collections::HashMap;
 use std::mem;
 use std::sync::Arc;
 
+use super::ListingTableUrl;
 use super::PartitionedFile;
-use crate::datasource::listing::ListingTableUrl;
 use crate::execution::context::SessionState;
-use crate::logical_expr::{BinaryExpr, Operator};
-use crate::{error::Result, scalar::ScalarValue};
+use datafusion_common::{Result, ScalarValue};
+use datafusion_expr::{BinaryExpr, Operator};
 
 use arrow::{
     array::{Array, ArrayRef, AsArray, StringBuilder},
@@ -518,8 +518,8 @@ mod tests {
 
     use futures::StreamExt;
 
-    use crate::logical_expr::{case, col, lit, Expr};
     use crate::test::object_store::make_test_store_and_state;
+    use datafusion_expr::{case, col, lit, Expr};
 
     use super::*;