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

[SPARK-14557][SQL] Reading textfile (created though CTAS) doesn't work #12356

Closed
wants to merge 4 commits into from
Closed

[SPARK-14557][SQL] Reading textfile (created though CTAS) doesn't work #12356

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48a598e
[SPARK-14557][SQL] Reading textfile (created though CTAS) doesn't wor…
kasjain Apr 13, 2016
6bd529c
[SPARK-14557][SQL] Removing unused method
kasjain Apr 14, 2016
ca9a160
[SPARK-14557][SQL]: Resolving merge conflicts
kasjain Apr 22, 2016
5ba453b
[SPARK-14557][SQL]: [2]Resolving merge conflicts
kasjain May 2, 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
18 changes: 2 additions & 16 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/TableReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class HadoopTableReader(
val broadcastedHadoopConf = _broadcastedHadoopConf

val tablePath = hiveTable.getPath
val inputPathStr = applyFilterIfNeeded(tablePath, filterOpt)
val inputPathStr = tablePath.toString

// logDebug("Table input: %s".format(tablePath))
val ifc = hiveTable.getInputFormatClass
Expand Down Expand Up @@ -190,7 +190,7 @@ class HadoopTableReader(
.map { case (partition, partDeserializer) =>
val partDesc = Utilities.getPartitionDesc(partition)
val partPath = partition.getDataLocation
val inputPathStr = applyFilterIfNeeded(partPath, filterOpt)
val inputPathStr = partPath.toString
val ifc = partDesc.getInputFileFormatClass
.asInstanceOf[java.lang.Class[InputFormat[Writable, Writable]]]
// Get partition field info
Expand Down Expand Up @@ -252,20 +252,6 @@ class HadoopTableReader(
}
}

/**
* If `filterOpt` is defined, then it will be used to filter files from `path`. These files are
* returned in a single, comma-separated string.
*/
private def applyFilterIfNeeded(path: Path, filterOpt: Option[PathFilter]): String = {
filterOpt match {
case Some(filter) =>
val fs = path.getFileSystem(hadoopConf)
val filteredFiles = fs.listStatus(path, filter).map(_.getPath.toString)
filteredFiles.mkString(",")
case None => path.toString
}
}

/**
* Creates a HadoopRDD based on the broadcasted HiveConf and other job properties that will be
* applied locally on each slave.
Expand Down