Skip to content

[SPARK-22416][SQL] Move OrcOptions from sql/hive to sql/core #19636

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

[SPARK-22416][SQL] Move OrcOptions from sql/hive to sql/core #19636

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ca3b6
[SPARK-22416][SQL] Move OrcOptions from `sql/hive` to `sql/core`
dongjoon-hyun Nov 1, 2017
a2ae1ad
Fix OrcOptions object, too.
dongjoon-hyun Nov 1, 2017
f157cfd
Remove `private[sql]`.
dongjoon-hyun Nov 2, 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
6 changes: 3 additions & 3 deletions ...pache/spark/sql/hive/orc/OrcOptions.scala → ...xecution/datasources/orc/OrcOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.spark.sql.hive.orc
package org.apache.spark.sql.execution.datasources.orc

import java.util.Locale

Expand All @@ -27,7 +27,7 @@ import org.apache.spark.sql.internal.SQLConf
/**
* Options for the ORC data source.
*/
private[orc] class OrcOptions(
private[sql] class OrcOptions(
Copy link
Member

@HyukjinKwon HyukjinKwon Nov 2, 2017

Choose a reason for hiding this comment

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

I believe private[sql] can be removed per SPARK-16964.

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Nov 2, 2017

Choose a reason for hiding this comment

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

Thank you, @HyukjinKwon !

@transient private val parameters: CaseInsensitiveMap[String],
@transient private val sqlConf: SQLConf)
extends Serializable {
Expand Down Expand Up @@ -59,7 +59,7 @@ private[orc] class OrcOptions(
}
}

private[orc] object OrcOptions {
private[sql] object OrcOptions {
// The ORC compression short names
private val shortOrcCompressionCodecNames = Map(
"none" -> "NONE",
Expand Down
1 change: 1 addition & 0 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcFileFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ 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.execution.datasources._
import org.apache.spark.sql.execution.datasources.orc.OrcOptions
import org.apache.spark.sql.hive.{HiveInspectors, HiveShim}
import org.apache.spark.sql.sources.{Filter, _}
import org.apache.spark.sql.types.StructType
Expand Down
1 change: 1 addition & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.apache.orc.OrcConf.COMPRESS
import org.scalatest.BeforeAndAfterAll

import org.apache.spark.sql.{QueryTest, Row}
import org.apache.spark.sql.execution.datasources.orc.OrcOptions
import org.apache.spark.sql.hive.test.TestHiveSingleton
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.sources._
Expand Down