[SPARK-19905][SQL] Bring back Dataset.inputFiles for Hive SerDe tables #17247
Conversation
This file contains hidden or 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
|
cc @cloud-fan |
liancheng
commented
Mar 10, 2017
| case fr: FileRelation => | ||
| fr.inputFiles | ||
| case r: CatalogRelation if DDLUtils.isHiveTable(r.tableMeta) => | ||
| r.tableMeta.storage.locationUri.map { _.toString }.toArray |
There was a problem hiding this comment.
Didn't use r.tableMeta.location here intentionally for safty.
cloud-fan
reviewed
Mar 10, 2017
|
|
||
| test("SPARK-19905: Hive SerDe table input paths") { | ||
| withTable("spark_19905") { | ||
| spark.range(10).createOrReplaceTempView("spark_19905_view") |
cloud-fan
reviewed
Mar 10, 2017
| case fr: FileRelation => | ||
| fr.inputFiles | ||
| case r: CatalogRelation if DDLUtils.isHiveTable(r.tableMeta) => | ||
| r.tableMeta.storage.locationUri.map { _.toString }.toArray |
|
LGTM |
gatorsmile
reviewed
Mar 10, 2017
| withTable("spark_19905") { | ||
| spark.range(10).createOrReplaceTempView("spark_19905_view") | ||
| sql("CREATE TABLE spark_19905 STORED AS RCFILE AS SELECT * FROM spark_19905_view") | ||
| assert(spark.table("spark_19905").inputFiles.nonEmpty) |
There was a problem hiding this comment.
Also try sql("SELECT input_file_name() FROM spark_19905")?
There was a problem hiding this comment.
input_file_name and Dataset.inputFiles are different code paths.
|
LGTM |
|
Test build #74332 has finished for PR 17247 at commit
|
|
Test build #74336 has finished for PR 17247 at commit
|
|
thanks, merging to master! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What changes were proposed in this pull request?
Dataset.inputFilesworks by matchingFileRelations in the query plan. In Spark 2.1, Hive SerDe tables are represented byMetastoreRelation, which inherits fromFileRelation. However, in Spark 2.2, Hive SerDe tables are now represented byCatalogRelation, which doesn't inherit fromFileRelationanymore, due to the unification of Hive SerDe tables and data source tables. This change breaksDataset.inputFilesfor Hive SerDe tables.This PR tries to fix this issue by explicitly matching
CatalogRelations that are Hive SerDe tables inDataset.inputFiles. Note that we can't makeCatalogRelationinherit fromFileRelationsince not allCatalogRelations are file based (e.g., JDBC data source tables).How was this patch tested?
New test case added in
HiveDDLSuite.