Skip to content

[SPARK-20281][SQL] Print the identical Range parameters of SparkContext APIs and SQL in explain #17670

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

[SPARK-20281][SQL] Print the identical Range parameters of SparkContext APIs and SQL in explain #17670

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18360ff
Print the identical range parameters of SparkContext and SQL in EXPLAIN
maropu Apr 18, 2017
95e1f0d
Remove the test
maropu Apr 20, 2017
a65d5c6
Drop code to set the default value of numSlice for range in SparkSession
maropu Apr 20, 2017
e940c6f
Revert code
maropu Apr 20, 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
4 changes: 2 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ class SparkSession private(
@Experimental
@InterfaceStability.Evolving
def range(start: Long, end: Long): Dataset[java.lang.Long] = {
range(start, end, step = 1, numPartitions = sparkContext.defaultParallelism)
range(start, end, step = 1)
}

/**
Expand All @@ -527,7 +527,7 @@ class SparkSession private(
@Experimental
@InterfaceStability.Evolving
def range(start: Long, end: Long, step: Long): Dataset[java.lang.Long] = {
range(start, end, step, numPartitions = sparkContext.defaultParallelism)
Copy link
Member

@gatorsmile gatorsmile Apr 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

How about reverting the changes in this file? We can make the PR small enough. We can backport it to 2.2

Copy link
Member Author

@maropu maropu Apr 20, 2017

Choose a reason for hiding this comment

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

ya, good to me. I'll revert

new Dataset(self, Range(start, end, step, None), Encoders.LONG)
}

/**
Expand Down
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/basicPhysicalOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ case class RangeExec(range: org.apache.spark.sql.catalyst.plans.logical.Range)
extends LeafExecNode with CodegenSupport {

def start: Long = range.start
def end: Long = range.end
def step: Long = range.step
def numSlices: Int = range.numSlices.getOrElse(sparkContext.defaultParallelism)
def numElements: BigInt = range.numElements
Expand Down Expand Up @@ -540,7 +541,7 @@ case class RangeExec(range: org.apache.spark.sql.catalyst.plans.logical.Range)
}
}

override def simpleString: String = range.simpleString
override def simpleString: String = s"Range ($start, $end, step=$step, splits=$numSlices)"
}

/**
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/resources/sql-tests/results/sql-compatibility-functions.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Project [coalesce(cast(id#xL as string), x) AS ifnull(`id`, 'x')#x, id#xL AS nul

== Physical Plan ==
*Project [coalesce(cast(id#xL as string), x) AS ifnull(`id`, 'x')#x, id#xL AS nullif(`id`, 'x')#xL, coalesce(cast(id#xL as string), x) AS nvl(`id`, 'x')#x, x AS nvl2(`id`, 'x', 'y')#x]
+- *Range (0, 2, step=1, splits=None)
+- *Range (0, 2, step=1, splits=2)


-- !query 9
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/resources/sql-tests/results/table-valued-functions.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ EXPLAIN select * from RaNgE(2)
struct<plan:string>
-- !query 8 output
== Physical Plan ==
*Range (0, 2, step=1, splits=None)
*Range (0, 2, step=1, splits=2)