diff --git a/Cargo.toml b/Cargo.toml index 840cd44..2e6a69e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -145,7 +145,7 @@ required-features = ["arrow"] # Backup, restore and statement analysis first appeared one release earlier, in # v26.7.2-rc.2, which is still the oldest engine the durable features build # against. -engine = "v26.7.3" +engine = "v26.9.0" [package.metadata.docs.rs] # docs.rs cannot download libchdb or link native libraries. diff --git a/build.rs b/build.rs index 5520b9a..a8599a0 100644 --- a/build.rs +++ b/build.rs @@ -6,7 +6,7 @@ use std::process::Command; /// The engine this crate is developed against, used when no libchdb is already /// present. Keep it on its own line and in step with CHDB_ENGINE_PIN in /// update_libchdb.sh: the release check greps for both when it proposes a bump. -const CHDB_ENGINE_PIN: &str = "v26.7.3"; +const CHDB_ENGINE_PIN: &str = "v26.9.0"; fn main() { println!("cargo::rustc-check-cfg=cfg(direct_arrow_insert)"); diff --git a/src/arrow_insert.rs b/src/arrow_insert.rs index bf277c9..7881604 100644 --- a/src/arrow_insert.rs +++ b/src/arrow_insert.rs @@ -4,6 +4,7 @@ //! [`Connection::register_arrow_array`](crate::connection::Connection::register_arrow_array), //! and `INSERT INTO … SELECT * FROM ArrowStream('name')`. +#[cfg(not(direct_arrow_insert))] use std::sync::atomic::{AtomicU64, Ordering}; use arrow::array::RecordBatchReader; @@ -18,6 +19,7 @@ use crate::connection::Connection; use crate::error::Result; use crate::format::OutputFormat; +#[cfg(not(direct_arrow_insert))] static FALLBACK_STREAM_SEQ: AtomicU64 = AtomicU64::new(0); /// Owns Arrow C Data Interface structs for the lifetime of a registration or insert. @@ -201,7 +203,7 @@ pub fn insert_record_batch_direct( #[cfg(direct_arrow_insert)] { let _ = &columns; - return conn.insert_arrow_array(dest_table, &handles.schema(), &handles.array(), &options); + conn.insert_arrow_array(dest_table, &handles.schema(), &handles.array(), &options) } #[cfg(not(direct_arrow_insert))] @@ -330,7 +332,7 @@ pub fn insert_record_batch_reader( #[cfg(direct_arrow_insert)] { let _ = (stream_name, &columns); - return conn.insert_arrow_stream(dest_table, &arrow_stream, &options); + conn.insert_arrow_stream(dest_table, &arrow_stream, &options) } #[cfg(not(direct_arrow_insert))] diff --git a/update_libchdb.sh b/update_libchdb.sh index 71782b0..37e0475 100755 --- a/update_libchdb.sh +++ b/update_libchdb.sh @@ -31,7 +31,7 @@ download_and_extract() { # The engine this crate is developed against. Keep it on its own line and # literal, and in step with CHDB_ENGINE_PIN in build.rs: the release check greps # for both when it proposes a bump. -CHDB_ENGINE_PIN=v26.7.3 +CHDB_ENGINE_PIN=v26.9.0 # CHDB_ENGINE_VERSION overrides the pin, which is how the release check runs the # suite against an engine this repository has not adopted yet.