Skip to content

[SPARK-22712][SQL] Use buildReaderWithPartitionValues in native OrcFileFormat #19907

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
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-22712][SQL] Use buildReaderWithPartitionValues in native OrcFileFormat #19907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
199c835
[SPARK-22712][SQL] Use `buildReaderWithPartitionValues` in native Orc…
dongjoon-hyun Dec 6, 2017
f69fc4e
Use joinedRow.
dongjoon-hyun Dec 6, 2017
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: 12 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.codegen.GenerateUnsafeProjection
import org.apache.spark.sql.execution.datasources._
import org.apache.spark.sql.sources._
import org.apache.spark.sql.types._
Expand Down Expand Up @@ -124,7 +125,7 @@ class OrcFileFormat
true
}

override def buildReader(
override def buildReaderWithPartitionValues(
Copy link
Copy Markdown
Member Author

@dongjoon-hyun dongjoon-hyun Dec 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @cloud-fan . During the previous ORC PR, we left this behind.

sparkSession: SparkSession,
dataSchema: StructType,
partitionSchema: StructType,
Expand Down Expand Up @@ -167,9 +168,17 @@ class OrcFileFormat
val iter = new RecordReaderIterator[OrcStruct](orcRecordReader)
Option(TaskContext.get()).foreach(_.addTaskCompletionListener(_ => iter.close()))

val unsafeProjection = UnsafeProjection.create(requiredSchema)
val fullSchema = requiredSchema.toAttributes ++ partitionSchema.toAttributes
val unsafeProjection = GenerateUnsafeProjection.generate(fullSchema, fullSchema)
val deserializer = new OrcDeserializer(dataSchema, requiredSchema, requestedColIds)
iter.map(value => unsafeProjection(deserializer.deserialize(value)))

if (partitionSchema.length == 0) {
iter.map(value => unsafeProjection(deserializer.deserialize(value)))
} else {
val joinedRow = new JoinedRow()
iter.map(value =>
unsafeProjection(joinedRow(deserializer.deserialize(value), file.partitionValues)))
}
}
}
}
Expand Down