Prepare object_store 0.9.0

apache · Jan 5, 2024 · 1be2b9a · 1be2b9a
1 parent 561d941
commit 1be2b9a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -92,3 +92,6 @@ opt-level = 3
 overflow-checks = false
 panic = 'unwind'
 rpath = false
+
+[patch.crates-io]
+object_store = { git = "https://github.com/apache/arrow-rs.git", rev = "f7101ec3a2b37c436f4554c28fa2d0a05de533ff" }
diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
@@ -53,3 +53,6 @@ assert_cmd = "2.0"
 ctor = "0.2.0"
 predicates = "3.0"
 rstest = "0.17"
+
+[patch.crates-io]
+object_store = { git = "https://github.com/apache/arrow-rs.git", rev = "f7101ec3a2b37c436f4554c28fa2d0a05de533ff" }
diff --git a/datafusion/core/src/datasource/physical_plan/csv.rs b/datafusion/core/src/datasource/physical_plan/csv.rs
@@ -375,7 +375,7 @@ impl FileOpener for CsvOpener {
 
             let range = match calculated_range {
                 RangeCalculation::Range(None) => None,
-                RangeCalculation::Range(Some(range)) => Some(range),
+                RangeCalculation::Range(Some(range)) => Some(range.into()),
                 RangeCalculation::TerminateEarly => {
                     return Ok(
                         futures::stream::poll_fn(move |_| Poll::Ready(None)).boxed()

diff --git a/datafusion/core/src/datasource/physical_plan/json.rs b/datafusion/core/src/datasource/physical_plan/json.rs
@@ -239,7 +239,7 @@ impl FileOpener for JsonOpener {
 
             let range = match calculated_range {
                 RangeCalculation::Range(None) => None,
-                RangeCalculation::Range(Some(range)) => Some(range),
+                RangeCalculation::Range(Some(range)) => Some(range.into()),
                 RangeCalculation::TerminateEarly => {
                     return Ok(
                         futures::stream::poll_fn(move |_| Poll::Ready(None)).boxed()

diff --git a/datafusion/core/src/datasource/physical_plan/mod.rs b/datafusion/core/src/datasource/physical_plan/mod.rs
@@ -75,7 +75,7 @@ use datafusion_physical_plan::ExecutionPlan;
 
 use log::debug;
 use object_store::ObjectMeta;
-use object_store::{path::Path, GetOptions, ObjectStore};
+use object_store::{path::Path, GetOptions, ObjectStore, GetRange};
 
 /// The base configurations to provide when creating a physical plan for
 /// writing to any given file format.
@@ -604,10 +604,8 @@ async fn find_first_newline(
     start: usize,
     end: usize,
 ) -> Result<usize> {
-    let range = Some(Range { start, end });
-
     let options = GetOptions {
-        range,
+        range: Some(GetRange::Bounded(start..end)),
         ..Default::default()
     };