-
Notifications
You must be signed in to change notification settings - Fork 28.4k
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.
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
[SPARK-2883] [SQL] ORC data source for Spark SQL #6194
Closed
Closed
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
305418c
orc data source support
zhzhan 4e61c16
minor change
zhzhan 7cc2c64
predicate fix
zhzhan f95abfd
reuse test suite
zhzhan 7b3c7c5
save mode fix
zhzhan 3c9038e
resolve review comments
zhzhan 2650a42
resolve review comments
zhzhan d734496
Polishes the ORC data source
liancheng 128bd3b
ORC filter bug fix
liancheng 21ada22
Adds @since and @Experimental annotations
liancheng d4afeed
Addresses comments
liancheng 55ecd96
Reorganizes ORC test suites
liancheng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
sql/core/src/main/scala/org/apache/spark/sql/test/SQLTestUtils.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.sql.test | ||
|
||
import java.io.File | ||
|
||
import scala.util.Try | ||
|
||
import org.apache.spark.sql.SQLContext | ||
import org.apache.spark.util.Utils | ||
|
||
trait SQLTestUtils { | ||
val sqlContext: SQLContext | ||
|
||
import sqlContext.{conf, sparkContext} | ||
|
||
protected def configuration = sparkContext.hadoopConfiguration | ||
|
||
/** | ||
* Sets all SQL configurations specified in `pairs`, calls `f`, and then restore all SQL | ||
* configurations. | ||
* | ||
* @todo Probably this method should be moved to a more general place | ||
*/ | ||
protected def withSQLConf(pairs: (String, String)*)(f: => Unit): Unit = { | ||
val (keys, values) = pairs.unzip | ||
val currentValues = keys.map(key => Try(conf.getConf(key)).toOption) | ||
(keys, values).zipped.foreach(conf.setConf) | ||
try f finally { | ||
keys.zip(currentValues).foreach { | ||
case (key, Some(value)) => conf.setConf(key, value) | ||
case (key, None) => conf.unsetConf(key) | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Generates a temporary path without creating the actual file/directory, then pass it to `f`. If | ||
* a file/directory is created there by `f`, it will be delete after `f` returns. | ||
* | ||
* @todo Probably this method should be moved to a more general place | ||
*/ | ||
protected def withTempPath(f: File => Unit): Unit = { | ||
val path = Utils.createTempDir() | ||
path.delete() | ||
try f(path) finally Utils.deleteRecursively(path) | ||
} | ||
|
||
/** | ||
* Creates a temporary directory, which is then passed to `f` and will be deleted after `f` | ||
* returns. | ||
* | ||
* @todo Probably this method should be moved to a more general place | ||
*/ | ||
protected def withTempDir(f: File => Unit): Unit = { | ||
val dir = Utils.createTempDir().getCanonicalFile | ||
try f(dir) finally Utils.deleteRecursively(dir) | ||
} | ||
|
||
/** | ||
* Drops temporary table `tableName` after calling `f`. | ||
*/ | ||
protected def withTempTable(tableName: String)(f: => Unit): Unit = { | ||
try f finally sqlContext.dropTempTable(tableName) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this is false by default?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filter push-down is a pretty error prone feature, 'cause it requires different components to interoperate seamlessly. We'd rather disable it by default until it's proven stable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How flaky is this? I'd maybe turn it on by default during QA, and then consider disabling it when we release if it is indeed flaky.