Skip to content

[SPARK-27418][SQL] Migrate Parquet to File Data Source V2 #24327

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
gengliangwang wants to merge 4 commits into from
Closed

[SPARK-27418][SQL] Migrate Parquet to File Data Source V2 #24327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ada227
parquet V2
gengliangwang Jun 4, 2019
b530e5f
use pushedFilters in ParquetPartitionReaderFactory
gengliangwang Jun 7, 2019
7d3a568
address comments
gengliangwang Jun 7, 2019
f658e92
address comments
gengliangwang Jun 14, 2019
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
Prev Previous commit
address comments
  • Loading branch information
@gengliangwang
gengliangwang committed Jun 14, 2019
commit f658e9265ba741922fc96eec76038addcb6491a1
10 changes: 5 additions & 5 deletions ...org/apache/spark/sql/execution/datasources/v2/parquet/ParquetPartitionReaderFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ case class ParquetPartitionReaderFactory(
}

private def createRowBaseReader(file: PartitionedFile): RecordReader[Void, UnsafeRow] = {
buildReaderBase(file, createRowBaseReader0)
buildReaderBase(file, createRowBaseParquetReader)
}

private def createRowBaseReader0(
private def createRowBaseParquetReader(
split: ParquetInputSplit,
partitionValues: InternalRow,
hadoopAttemptContext: TaskAttemptContextImpl,
Expand All @@ -203,13 +203,13 @@ case class ParquetPartitionReaderFactory(
}

private def createVectorizedReader(file: PartitionedFile): VectorizedParquetRecordReader = {
val vectorizedReader =
buildReaderBase(file, createVectorizedReader0).asInstanceOf[VectorizedParquetRecordReader]
val vectorizedReader = buildReaderBase(file, createParquetVectorizedReader)
.asInstanceOf[VectorizedParquetRecordReader]
vectorizedReader.initBatch(partitionSchema, file.partitionValues)
vectorizedReader
}

private def createVectorizedReader0(
private def createParquetVectorizedReader(
split: ParquetInputSplit,
partitionValues: InternalRow,
hadoopAttemptContext: TaskAttemptContextImpl,
Expand Down
6 changes: 3 additions & 3 deletions ...main/scala/org/apache/spark/sql/execution/datasources/v2/parquet/ParquetScanBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ case class ParquetScanBuilder(
sparkSession.sessionState.newHadoopConfWithOptions(caseSensitiveMap)
}

lazy val _pushedFilters = {
lazy val pushedParquetFilters = {
val sqlConf = sparkSession.sessionState.conf
val pushDownDate = sqlConf.parquetFilterPushDownDate
val pushDownTimestamp = sqlConf.parquetFilterPushDownTimestamp
Expand All @@ -66,10 +66,10 @@ case class ParquetScanBuilder(
// Note: for Parquet, the actual filter push down happens in [[ParquetPartitionReaderFactory]].
// It requires the Parquet physical schema to determine whether a filter is convertible.
// All filters that can be converted to Parquet are pushed down.
override def pushedFilters(): Array[Filter] = _pushedFilters
override def pushedFilters(): Array[Filter] = pushedParquetFilters

override def build(): Scan = {
ParquetScan(sparkSession, hadoopConf, fileIndex, dataSchema, readDataSchema(),
readPartitionSchema(), _pushedFilters, options)
readPartitionSchema(), pushedParquetFilters, options)
}
}