-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-20590][SQL] Use Spark internal datasource if multiples are found for the same shorten name #17916
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
Closed
Closed
[SPARK-20590][SQL] Use Spark internal datasource if multiples are found for the same shorten name #17916
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
03dc0f6
Different approach for SPARK-20590
HyukjinKwon 2dce84c
Fix the tests too
HyukjinKwon 741c913
Add tests for the detection for external datasources, external/intern…
HyukjinKwon 8c40eab
Pretty name
HyukjinKwon 4450da7
Address the comment
HyukjinKwon 7a464ad
Improve warning message
HyukjinKwon 96cf1a9
Thrwos an analysis exception instead
HyukjinKwon 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 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
4 changes: 4 additions & 0 deletions
4
...core/src/test/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| org.apache.spark.sql.sources.FakeSourceOne | ||
| org.apache.spark.sql.sources.FakeSourceTwo | ||
| org.apache.spark.sql.sources.FakeSourceThree | ||
| org.apache.spark.sql.sources.FakeSourceFour | ||
| org.apache.fakesource.FakeExternalSourceOne | ||
| org.apache.fakesource.FakeExternalSourceTwo | ||
| org.apache.fakesource.FakeExternalSourceThree |
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
64 changes: 64 additions & 0 deletions
64
sql/core/src/test/scala/org/apache/spark/sql/sources/fakeExternalSources.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * 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.fakesource | ||
|
|
||
| import org.apache.spark.sql.SQLContext | ||
| import org.apache.spark.sql.sources.{BaseRelation, DataSourceRegister, RelationProvider} | ||
| import org.apache.spark.sql.types._ | ||
|
|
||
|
|
||
| // Note that the package name is intendedly mismatched in order to resemble external data sources | ||
| // and test the detection for them. | ||
| class FakeExternalSourceOne extends RelationProvider with DataSourceRegister { | ||
|
|
||
| def shortName(): String = "Fake external source" | ||
|
|
||
| override def createRelation(cont: SQLContext, param: Map[String, String]): BaseRelation = | ||
| new BaseRelation { | ||
| override def sqlContext: SQLContext = cont | ||
|
|
||
| override def schema: StructType = | ||
| StructType(Seq(StructField("stringType", StringType, nullable = false))) | ||
| } | ||
| } | ||
|
|
||
| class FakeExternalSourceTwo extends RelationProvider with DataSourceRegister { | ||
|
|
||
| def shortName(): String = "Fake external source" | ||
|
|
||
| override def createRelation(cont: SQLContext, param: Map[String, String]): BaseRelation = | ||
| new BaseRelation { | ||
| override def sqlContext: SQLContext = cont | ||
|
|
||
| override def schema: StructType = | ||
| StructType(Seq(StructField("integerType", IntegerType, nullable = false))) | ||
| } | ||
| } | ||
|
|
||
| class FakeExternalSourceThree extends RelationProvider with DataSourceRegister { | ||
|
|
||
| def shortName(): String = "datasource" | ||
|
|
||
| override def createRelation(cont: SQLContext, param: Map[String, String]): BaseRelation = | ||
| new BaseRelation { | ||
| override def sqlContext: SQLContext = cont | ||
|
|
||
| override def schema: StructType = | ||
| StructType(Seq(StructField("byteType", ByteType, nullable = false))) | ||
| } | ||
| } |
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.
So, we will only allow this case.