Skip to content

Fix file not found for path with url encoded character #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richox merged 1 commit into from
Dec 6, 2024
Merged

Fix file not found for path with url encoded character #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions spark-extension-shims-spark3/src/test/scala/org/apache/spark/sql/blaze/BlazeQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.apache.spark.sql.blaze

import org.apache.spark.sql.Row

class BlazeQuerySuite extends org.apache.spark.sql.QueryTest with BaseBlazeSQLSuite {

test("test partition path has url encoded character") {
withTable("t1") {
sql("create table t1 using parquet PARTITIONED BY (part) as select 1 as c1, 2 as c2, 'test test' as part")
val df = sql("select * from t1")
checkAnswer(df, Seq(Row(1, 2, "test test")))
}
}

}
6 changes: 4 additions & 2 deletions spark-extension/src/main/java/org/apache/spark/sql/blaze/JniBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import java.lang.management.BufferPoolMXBean;
import java.lang.management.ManagementFactory;
import java.net.URI;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.hadoop.fs.FileSystem;
Expand Down Expand Up @@ -85,11 +86,12 @@ public static boolean isDriverSide() {
}

public static FSDataInputWrapper openFileAsDataInputWrapper(FileSystem fs, String path) throws Exception {
return FSDataInputWrapper$.MODULE$.wrap(fs.open(new Path(path)));
// the path is a URI string, so we need to convert it to a URI object, ref: org.apache.spark.paths.SparkPath.toPath
return FSDataInputWrapper$.MODULE$.wrap(fs.open(new Path(new URI(path))));
}

public static FSDataOutputWrapper createFileAsDataOutputWrapper(FileSystem fs, String path) throws Exception {
return FSDataOutputWrapper$.MODULE$.wrap(fs.create(new Path(path)));
return FSDataOutputWrapper$.MODULE$.wrap(fs.create(new Path(new URI(path))));
}

private static final List<BufferPoolMXBean> directMXBeans =
Expand Down