Skip to content

[SPARK-28218][SQL] Migrate Avro to File Data Source V2 - #25017

Closed
gengliangwang wants to merge 3 commits into
apache:masterfrom
gengliangwang:avroV2
Closed

[SPARK-28218][SQL] Migrate Avro to File Data Source V2#25017
gengliangwang wants to merge 3 commits into
apache:masterfrom
gengliangwang:avroV2

Conversation

@gengliangwang

@gengliangwanggengliangwang commented Jun 30, 2019

Copy link
Copy Markdown
Member

What changes were proposed in this pull request?

Migrate Avro to File source V2.

How was this patch tested?

Unit test

@gengliangwang

gengliangwang commented Jun 30, 2019

Copy link
Copy Markdown
MemberAuthor

This is the last migration for file source V2. It is a relatively simple one. Please help review it.
@cloud-fan@dongjoon-hyun

@SparkQA

SparkQA commented Jun 30, 2019

Copy link
Copy Markdown

Test build #107051 has finished for PR 25017 at commit 747eeb5.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds the following public classes (experimental):
  • class AvroDataSourceV2 extends FileDataSourceV2
  • case class AvroPartitionReaderFactory(
  • case class AvroScan(
  • class AvroScanBuilder (
  • case class AvroTable(
  • class AvroWriteBuilder(

@dongjoon-hyun

dongjoon-hyun commented Jul 1, 2019

Copy link
Copy Markdown
Member

Thank you for pinging me, @gengliangwang .
cc @dbtsai , too.

@dongjoon-hyun

dongjoon-hyun commented Jul 3, 2019

Copy link
Copy Markdown
Member

Retest this please.

dongjoon-hyun
dongjoon-hyun reviewed Jul 3, 2019
View reviewed changes
Comment threadexternal/avro/src/test/scala/org/apache/spark/sql/avro/AvroLogicalTypeSuite.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 3, 2019
View reviewed changes
Comment threadexternal/avro/src/test/scala/org/apache/spark/sql/avro/AvroLogicalTypeSuite.scala Outdated
@SparkQA

SparkQA commented Jul 3, 2019

Copy link
Copy Markdown

Test build #107144 has finished for PR 25017 at commit 747eeb5.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds the following public classes (experimental):
  • class AvroDataSourceV2 extends FileDataSourceV2
  • case class AvroPartitionReaderFactory(
  • case class AvroScan(
  • class AvroScanBuilder (
  • case class AvroTable(
  • class AvroWriteBuilder(

@SparkQA

SparkQA commented Jul 4, 2019

Copy link
Copy Markdown

Test build #107217 has finished for PR 25017 at commit 92d2f47.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds the following public classes (experimental):
  • class AvroV1LogicalTypeSuite extends AvroLogicalTypeSuite
  • class AvroV2LogicalTypeSuite extends AvroLogicalTypeSuite

dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/avro/AvroUtils.scala
job: Job,
options: Map[String, String],
dataSchema: StructType): OutputWriterFactory = {
val parsedOptions = new AvroOptions(options, job.getConfiguration)

@dongjoon-hyundongjoon-hyunJul 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Previously, this was the following (sharedState.sparkContext.hadoopConfiguration + SQLConf). Is job.getConfiguration enough for Avro?

valparsedOptions=newAvroOptions(options, spark.sessionState.newHadoopConf())

@gengliangwanggengliangwangJul 5, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Yes, it is enough. Orc/Parquet also use the configuration from job.

dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroDataSourceV2.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroPartitionReaderFactory.scala
val parsedOptions = new AvroOptions(options, conf)
val userProvidedSchema = parsedOptions.schema.map(new Schema.Parser().parse)

if (parsedOptions.ignoreExtension || partitionedFile.filePath.endsWith(".avro")) {

@dongjoon-hyundongjoon-hyunJul 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Shall we have the same comment above this line in order not to forget that?

// TODO Removes this check once `FileFormat` gets a general file filtering interface method.// Doing input file filtering is improper because we may generate empty tasks that process no// input files but stress the scheduler. We should probably add a more general input file// filtering mechanism for `FileFormat` data sources. See SPARK-16317.

@gengliangwanggengliangwangJul 5, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Actually, there is an option pathGlobFilter for it. I have marked it as deprecated in #24518.
I think we can still support it in 3.0. So I am not sure what to comment here.

dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroWriteBuilder.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroScan.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroTable.scala Outdated
paths: Seq[String],
userSpecifiedSchema: Option[StructType],
fallbackFileFormat: Class[_ <: FileFormat])
extends FileTable(sparkSession, options, paths, userSpecifiedSchema) with Logging {

@dongjoon-hyundongjoon-hyunJul 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Let's remove with Logging and line 23.

dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroTable.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes

@dongjoon-hyundongjoon-hyun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I left a few comments. Could you update the PR, @gengliangwang ?

@dongjoon-hyundongjoon-hyun changed the title [SPARK-28218][SQL] Migrate Avro to File source V2[SPARK-28218][SQL] Migrate Avro to File Data Source V2Jul 5, 2019
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroDataSourceV2.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroPartitionReaderFactory.scala Outdated
import org.apache.spark.sql.avro.{AvroDeserializer, AvroOptions}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.execution.datasources.PartitionedFile
import org.apache.spark.sql.execution.datasources.v2._

@dongjoon-hyundongjoon-hyunJul 5, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

-import org.apache.spark.sql.execution.datasources.v2._
+import org.apache.spark.sql.execution.datasources.v2.{EmptyPartitionReader, FilePartitionReaderFactory, PartitionReaderWithPartitionValues}

dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroTable.scala Outdated
dongjoon-hyun
dongjoon-hyun reviewed Jul 5, 2019
View reviewed changes
Comment threadexternal/avro/src/main/scala/org/apache/spark/sql/v2/avro/AvroWriteBuilder.scala Outdated
@gengliangwang

gengliangwang commented Jul 5, 2019

Copy link
Copy Markdown
MemberAuthor

@dongjoon-hyun I have updated the code. Thanks for reviewing this in your vacation!

@SparkQA

SparkQA commented Jul 5, 2019

Copy link
Copy Markdown

Test build #107263 has finished for PR 25017 at commit fc98bd5.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

dongjoon-hyun
dongjoon-hyun approved these changes Jul 5, 2019
View reviewed changes

@dongjoon-hyundongjoon-hyun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

+1, LGTM. Merged to master.
Thank you, @gengliangwang !

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dongjoon-hyundongjoon-hyundongjoon-hyun approved these changes

Assignees

No one assigned

Labels

SQL

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@gengliangwang@SparkQA@dongjoon-hyun