You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/05/18 23:04:07 UTC
spark git commit: [HOTFIX] Fix ORC build break
Repository: spark
Updated Branches:
refs/heads/master 0b6f503d5 -> fcf90b75c
[HOTFIX] Fix ORC build break
Fix break caused by merging #6225 and #6194.
Author: Michael Armbrust <mi...@databricks.com>
Closes #6244 from marmbrus/fixOrcBuildBreak and squashes the following commits:
b10e47b [Michael Armbrust] [HOTFIX] Fix ORC Build break
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fcf90b75
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fcf90b75
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fcf90b75
Branch: refs/heads/master
Commit: fcf90b75ccf222bd2f1939addc3f8f052d2bd3ff
Parents: 0b6f503
Author: Michael Armbrust <mi...@databricks.com>
Authored: Mon May 18 14:04:04 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Mon May 18 14:04:04 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/hive/orc/OrcRelation.scala | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/fcf90b75/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
index 9708199..e10d3a0 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
@@ -20,7 +20,7 @@ package org.apache.spark.sql.hive.orc
import java.util.{Objects, Properties}
import org.apache.hadoop.conf.Configuration
-import org.apache.hadoop.fs.Path
+import org.apache.hadoop.fs.{FileStatus, Path}
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hadoop.hive.ql.io.orc.{OrcInputFormat, OrcOutputFormat, OrcSerde, OrcSplit}
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector
@@ -171,9 +171,10 @@ private[sql] case class OrcRelation(
maybePartitionSpec)
}
- override def buildScan(requiredColumns: Array[String],
+ override def buildScan(
+ requiredColumns: Array[String],
filters: Array[Filter],
- inputPaths: Array[String]): RDD[Row] = {
+ inputPaths: Array[FileStatus]): RDD[Row] = {
val output = StructType(requiredColumns.map(dataSchema(_))).toAttributes
OrcTableScan(output, this, filters, inputPaths).execute()
}
@@ -194,7 +195,7 @@ private[orc] case class OrcTableScan(
attributes: Seq[Attribute],
@transient relation: OrcRelation,
filters: Array[Filter],
- inputPaths: Array[String])
+ inputPaths: Array[FileStatus])
extends Logging
with HiveInspectors {
@@ -256,7 +257,7 @@ private[orc] case class OrcTableScan(
addColumnIds(attributes, relation, conf)
if (inputPaths.nonEmpty) {
- FileInputFormat.setInputPaths(job, inputPaths.map(new Path(_)): _*)
+ FileInputFormat.setInputPaths(job, inputPaths.map(_.getPath): _*)
}
val inputFormatClass =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org