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.

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

Jump to bottom

[query] fix #13998 #14057

Merged
merged 1 commit into from
Nov 30, 2023
Merged

[query] fix #13998 #14057

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
6 changes: 3 additions & 3 deletions hail/src/main/scala/is/hail/rvd/AbstractRVDSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ object AbstractRVDSpec {
indexSpecLeft, indexSpecRight,
specLeft.key, uidFieldName)

val absPathLeft = removeFileProtocol(pathLeft)
val absPathRight = removeFileProtocol(pathRight)
val absPathLeft = pathLeft
val absPathRight = pathRight
val partsAndIntervals: IndexedSeq[(String, Interval)] = if (specLeft.key.isEmpty) {
specLeft.partFiles.map { p => (p, null) }
} else {
Expand Down Expand Up @@ -438,7 +438,7 @@ case class IndexedRVDSpec2(
val rSpec = typedCodecSpec
val reader = ir.PartitionNativeReaderIndexed(rSpec, indexSpec, part.kType.fieldNames, uidFieldName)

val absPath = removeFileProtocol(path)
val absPath = path
val partPaths = tmpPartitioner.rangeBounds.map { b => partFiles(part.lowerBoundInterval(b)) }


Expand Down
9 changes: 0 additions & 9 deletions hail/src/main/scala/is/hail/utils/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,6 @@ package object utils extends Logging

def uriPath(uri: String): String = new URI(uri).getPath

def removeFileProtocol(uriString: String): String = {
val uri = new URI(uriString)
if (uri.getScheme == "file") {
uri.getPath
} else {
uri.toString
}
}

// NB: can't use Nothing here because it is not a super type of Null
private object flattenOrNullInstance extends FlattenOrNull[Array]

Expand Down