You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by gi...@apache.org on 2026/05/26 06:39:22 UTC

(datafusion) 01/01: minor: Make `union_with_mix_of_presorted_and_explicitly_resorted_inputs_impl` cross platform (#22478)

This is an automated email from the ASF dual-hosted git repository.

github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-22478-528ca7412bf86076d865fc90689abcda3e1b6770
in repository https://gitbox.apache.org/repos/asf/datafusion.git

commit e275715060c609496dbb757eaa994a347a66fe2e
Author: Nuno Faria <nu...@gmail.com>
AuthorDate: Tue May 26 07:38:20 2026 +0100

    minor: Make `union_with_mix_of_presorted_and_explicitly_resorted_inputs_impl` cross platform (#22478)
    
    ## Which issue does this PR close?
    
    - N/A.
    
    ## Rationale for this change
    
    Fix two tests in `core` due to path issues.
    
    ## What changes are included in this PR?
    
    - Updated
    `union_with_mix_of_presorted_and_explicitly_resorted_inputs_impl` to
    handle the path in a cross platform way.
    
    ## Are these changes tested?
    
    Yes.
    
    ## Are there any user-facing changes?
    
    No.
---
 datafusion/core/tests/dataframe/mod.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/datafusion/core/tests/dataframe/mod.rs b/datafusion/core/tests/dataframe/mod.rs
index e55a373ada..19d5ecb842 100644
--- a/datafusion/core/tests/dataframe/mod.rs
+++ b/datafusion/core/tests/dataframe/mod.rs
@@ -3345,7 +3345,11 @@ async fn union_with_mix_of_presorted_and_explicitly_resorted_inputs_impl(
 
     // To be able to remove user specific paths from the plan, for stable assertions
     let testdata_clean = Path::new(&testdata).canonicalize()?.display().to_string();
-    let testdata_clean = testdata_clean.strip_prefix("/").unwrap_or(&testdata_clean);
+    let testdata_clean = testdata_clean.replace("\\", "/");
+    let testdata_clean = testdata_clean
+        .strip_prefix("//?/")
+        .or_else(|| testdata_clean.strip_prefix("/"))
+        .unwrap_or(&testdata_clean);
 
     // Use displayable() rather than explain().collect() to avoid table formatting issues. We need
     // to replace machine-specific paths with variable lengths, which breaks table alignment and


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org