Skip to content

[SPARK-18422][CORE] Fix wholeTextFiles test to pass on Windows in JavaAPISuite #15866

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

Closed
wants to merge 2 commits into from
Closed

[SPARK-18422][CORE] Fix wholeTextFiles test to pass on Windows in JavaAPISuite #15866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c258a5
Fix wholeTextFile tests in JavaAPISuite
HyukjinKwon Nov 12, 2016
e6b2a03
Clean up a bit and leave a comment to note the path format
HyukjinKwon Nov 14, 2016
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
17 changes: 11 additions & 6 deletions core/src/test/java/org/apache/spark/JavaAPISuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.io.*;
import java.nio.channels.FileChannel;
import java.nio.ByteBuffer;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -46,6 +45,7 @@
import com.google.common.collect.Lists;
import com.google.common.base.Throwables;
import com.google.common.io.Files;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.compress.DefaultCodec;
Expand Down Expand Up @@ -1075,18 +1075,23 @@ public void wholeTextFiles() throws Exception {
byte[] content2 = "spark is also easy to use.\n".getBytes(StandardCharsets.UTF_8);

String tempDirName = tempDir.getAbsolutePath();
Files.write(content1, new File(tempDirName + "/part-00000"));
Files.write(content2, new File(tempDirName + "/part-00001"));
String path1 = new Path(tempDirName, "part-00000").toUri().getPath();
String path2 = new Path(tempDirName, "part-00001").toUri().getPath();

Files.write(content1, new File(path1));
Files.write(content2, new File(path2));

Map<String, String> container = new HashMap<>();
container.put(tempDirName+"/part-00000", new Text(content1).toString());
container.put(tempDirName+"/part-00001", new Text(content2).toString());
container.put(path1, new Text(content1).toString());
container.put(path2, new Text(content2).toString());

JavaPairRDD<String, String> readRDD = sc.wholeTextFiles(tempDirName, 3);
List<Tuple2<String, String>> result = readRDD.collect();

for (Tuple2<String, String> res : result) {
assertEquals(res._2(), container.get(new URI(res._1()).getPath()));
// Note that the paths from `wholeTextFiles` are in URI format on Windows,
// for example, file:/C:/a/b/c.
assertEquals(res._2(), container.get(new Path(res._1()).toUri().getPath()));
}
}

Expand Down