Skip to content
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.

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

Added Filter error when file loaded does not match schema #1805

Merged
merged 1 commit into from
Nov 18, 2017
Merged
Changes from all commits
Commits
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: 13 additions & 2 deletions adam-core/src/main/scala/org/bdgenomics/adam/rdd/ADAMContext.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1344,15 +1344,26 @@ class ADAMContext(@transient val sc: SparkContext) extends Serializable with Log

// elaborate out the path; this returns FileStatuses
val paths = if (fs.isDirectory(path)) {
val paths = fs.listStatus(path)

if (paths == null || paths.isEmpty) {
s"Couldn't find any files matching ${path.toUri}"
}
fs.listStatus(path, filter)
} else {
val paths = fs.globStatus(path)
if (paths == null || paths.isEmpty) {
throw new FileNotFoundException(
s"Couldn't find any files matching ${path.toUri}"
)
}
fs.globStatus(path, filter)
}

// the path must match at least one file
// the path must match PathFilter
if (paths == null || paths.isEmpty) {
throw new FileNotFoundException(
s"Couldn't find any files matching ${path.toUri}"
s"Couldn't find any files matching ${path.toUri} for the requested PathFilter"
)
}

Expand Down