Skip to content

[SPARK-23426][SQL] Use hive ORC impl and disable PPD for Spark 2.3.0 #20610

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 7 commits into from
Closed

[SPARK-23426][SQL] Use hive ORC impl and disable PPD for Spark 2.3.0 #20610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d74b20
Use 'hive' for ORC
dongjoon-hyun Feb 14, 2018
93e6c7d
Disable PPD back.
dongjoon-hyun Feb 14, 2018
7ff4ccf
Add ORC section.
dongjoon-hyun Feb 14, 2018
46c8697
fix test case.
dongjoon-hyun Feb 14, 2018
2769633
Address comment.
dongjoon-hyun Feb 15, 2018
183ec21
Add `also`.
dongjoon-hyun Feb 15, 2018
19b50b1
Remove.
dongjoon-hyun Feb 15, 2018
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
Next Next commit
fix test case.
  • Loading branch information
@dongjoon-hyun
dongjoon-hyun committed Feb 14, 2018
commit 46c8697b1981f57eeacb48bea31dec1e89f4e66a
14 changes: 13 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,26 @@ package org.apache.spark.sql
import java.io.FileNotFoundException

import org.apache.hadoop.fs.Path
import org.scalatest.BeforeAndAfterAll

import org.apache.spark.SparkException
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSQLContext

class FileBasedDataSourceSuite extends QueryTest with SharedSQLContext {

class FileBasedDataSourceSuite extends QueryTest with SharedSQLContext with BeforeAndAfterAll {
import testImplicits._

override def beforeAll(): Unit = {
super.beforeAll()
spark.sessionState.conf.setConf(SQLConf.ORC_IMPLEMENTATION, "native")
}

override def afterAll(): Unit = {
spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
super.afterAll()
}
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Feb 14, 2018

Choose a reason for hiding this comment

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

The test coverage is the same.


private val allFileBasedDataSources = Seq("orc", "parquet", "csv", "json", "text")
private val nameWithSpecialChars = "sp&cial%c hars"

Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSinkSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ import org.apache.spark.util.Utils
class FileStreamSinkSuite extends StreamTest {
import testImplicits._

override def beforeAll(): Unit = {
Copy link
Contributor

@cloud-fan cloud-fan Feb 15, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

nit: a simpler way to fix this

override val conf = super.conf.copy(SQLConf.ORC_IMPLEMENTATION -> "native")

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Feb 15, 2018

Choose a reason for hiding this comment

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

Hi, @cloud-fan .
I tested it, but that doesn't work in this FileStreamSinkSuite.

super.beforeAll()
spark.sessionState.conf.setConf(SQLConf.ORC_IMPLEMENTATION, "native")
}

override def afterAll(): Unit = {
spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
super.afterAll()
}

test("unpartitioned writing and batch reading") {
val inputData = MemoryStream[Int]
val df = inputData.toDF()
Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,16 @@ class FileStreamSourceSuite extends FileStreamSourceTest {
.collect { case s @ StreamingRelation(dataSource, _, _) => s.schema }.head
}

override def beforeAll(): Unit = {
super.beforeAll()
spark.sessionState.conf.setConf(SQLConf.ORC_IMPLEMENTATION, "native")
}

override def afterAll(): Unit = {
spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
super.afterAll()
Copy link
Member

@gatorsmile gatorsmile Feb 14, 2018

Choose a reason for hiding this comment

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

    try {
      spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
    } finally {
      super.afterAll()
    }

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Feb 15, 2018

Choose a reason for hiding this comment

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

Thanks. Yep. It's done.

}

// ============= Basic parameter exists tests ================

test("FileStreamSource schema: no path") {
Expand Down