Skip to content

[SPARK-21354] [SQL] INPUT FILE related functions do not support more than one sources #18580

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
gatorsmile wants to merge 4 commits into from
Closed

[SPARK-21354] [SQL] INPUT FILE related functions do not support more than one sources #18580

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04ff406
fix.
gatorsmile Jul 9, 2017
596ea17
fix.
gatorsmile Jul 9, 2017
6b48a9e
fix.
gatorsmile Jul 11, 2017
c4de2b8
fix.
gatorsmile Jul 17, 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
8 changes: 8 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ trait CheckAnalysis extends PredicateHelper {
}
}

private def getNumLeafNodes(operator: LogicalPlan): Int = {
operator.collect { case _: LeafNode => 1 }.sum
}

def checkAnalysis(plan: LogicalPlan): Unit = {
// We transform up and order the rules so as to catch the first possible failure instead
// of the result of cascading resolution failures.
Expand All @@ -100,6 +104,10 @@ trait CheckAnalysis extends PredicateHelper {
failAnalysis(
s"invalid cast from ${c.child.dataType.simpleString} to ${c.dataType.simpleString}")

case e @ (_: InputFileName | _: InputFileBlockLength | _: InputFileBlockStart)
if getNumLeafNodes(operator) > 1 =>
e.failAnalysis(s"'${e.prettyName}' does not support more than one sources")

@dongjoon-hyun dongjoon-hyun Jul 10, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit: one sources -> one source.


case g: Grouping =>
failAnalysis("grouping() can only be used with GroupingSets/Cube/Rollup")
case g: GroupingID =>
Expand Down
14 changes: 14 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,20 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
)
}

test("input_file_name, input_file_block_start, input_file_block_length - more than one sources") {
withTable("tab1", "tab2") {
val data = sparkContext.parallelize(0 to 10).toDF("id")
data.write.saveAsTable("tab1")
data.write.saveAsTable("tab2")
Seq("input_file_name", "input_file_block_start", "input_file_block_length").foreach { func =>
val e = intercept[AnalysisException] {
sql(s"SELECT *, $func() FROM tab1 JOIN tab2 ON tab1.id = tab2.id")
}.getMessage
assert(e.contains(s"'$func' does not support more than one sources"))

@dongjoon-hyun dongjoon-hyun Jul 10, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ditto.

}
}
}

test("input_file_name, input_file_block_start, input_file_block_length - FileScanRDD") {
withTempPath { dir =>
val data = sparkContext.parallelize(0 to 10).toDF("id")
Expand Down