debug windows

Signed-off-by: Adam Gutglick <[email protected]>

Author: AdamGS

Cargo.lock

@@ -43,6 +43,7 @@ vortex-utils = { workspace = true, features = ["dashmap"] }
 anyhow = { workspace = true }
 datafusion = { workspace = true }
 insta = { workspace = true }
+regex = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["test-util", "rt-multi-thread", "fs"] }

vortex-datafusion/Cargo.toml

@@ -37,6 +37,7 @@ fn register_vortex_format_factory(
 
 #[cfg(test)]
 mod tests {
+    use std::path::Path;
     use std::sync::Arc;
 
     use arrow_schema::DataType;
@@ -55,6 +56,7 @@ mod tests {
     use datafusion_expr::LogicalPlanBuilder;
     use datafusion_physical_plan::display::DisplayableExecutionPlan;
     use insta::assert_snapshot;
+    use regex::Regex;
     use rstest::rstest;
     use tempfile::TempDir;
     use tempfile::tempdir;
@@ -66,7 +68,6 @@ mod tests {
     use vortex::array::arrays::VarBinArray;
     use vortex::array::validity::Validity;
     use vortex::buffer::buffer;
-    use vortex::error::vortex_err;
     use vortex::file::WriteOptionsSessionExt;
     use vortex::session::VortexSession;
 
@@ -100,8 +101,25 @@ mod tests {
             Validity::NonNullable,
         )?;
 
+        let regex = Regex::new(r".:\\")?;
+
+        // Windows paths like C:\ currently do not get handled correctly by
+        // Path::parse (https://github.com/apache/arrow-rs-object-store/issues/499)
+        // and we need to change the first \ into a /
+        let fix_path = |path: &Path| -> String {
+            let path = path.to_str().unwrap();
+            if regex.is_match(path) {
+                path.to_string().replacen("\\", "/", 1)
+            } else {
+                path.to_string()
+            }
+        };
+
         let filepath = temp_dir.path().join("data.vortex");
 
+        let table_url = fix_path(temp_dir.path());
+        let filepath = fix_path(filepath.as_path());
+
         let mut f = OpenOptions::new()
             .write(true)
             .create(true)
@@ -116,12 +134,8 @@ mod tests {
 
         let ctx = SessionContext::default();
         let format = Arc::new(VortexFormat::new(session));
-        let table_url = ListingTableUrl::parse(
-            temp_dir
-                .path()
-                .to_str()
-                .ok_or_else(|| vortex_err!("Path is not valid UTF-8"))?,
-        )?;
+
+        let table_url = ListingTableUrl::parse(table_url)?;
         assert!(table_url.is_collection());
 
         let config = ListingTableConfig::new(table_url)

vortex-datafusion/src/persistent/mod.rs

@@ -335,7 +335,7 @@ impl FileOpener for VortexOpener {
                 })
                 .try_flatten()
                 .map(move |batch| {
-                    if projector.projection().column_indices().is_empty() {
+                    if projector.projection().as_ref().is_empty() {
                         batch
                     } else {
                         batch.and_then(|b| projector.project_batch(&b))