You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/06/03 23:20:35 UTC
spark git commit: Update documentation for [SPARK-7980] [SQL] Support
SQLContext.range(end)
Repository: spark
Updated Branches:
refs/heads/master 939e4f3d8 -> 2c5a06caf
Update documentation for [SPARK-7980] [SQL] Support SQLContext.range(end)
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2c5a06ca
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2c5a06ca
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2c5a06ca
Branch: refs/heads/master
Commit: 2c5a06cafd2885ff5431fa96485db2564ae1cce3
Parents: 939e4f3
Author: Reynold Xin <rx...@databricks.com>
Authored: Wed Jun 3 14:19:10 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed Jun 3 14:20:27 2015 -0700
----------------------------------------------------------------------
python/pyspark/sql/context.py | 2 ++
.../scala/org/apache/spark/sql/SQLContext.scala | 20 ++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2c5a06ca/python/pyspark/sql/context.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/context.py b/python/pyspark/sql/context.py
index 1bebfc4..599c9ac 100644
--- a/python/pyspark/sql/context.py
+++ b/python/pyspark/sql/context.py
@@ -146,6 +146,8 @@ class SQLContext(object):
>>> sqlContext.range(1, 7, 2).collect()
[Row(id=1), Row(id=3), Row(id=5)]
+ If only one argument is specified, it will be used as the end value.
+
>>> sqlContext.range(3).collect()
[Row(id=0), Row(id=1), Row(id=2)]
"""
http://git-wip-us.apache.org/repos/asf/spark/blob/2c5a06ca/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
index f08fb4f..0aab7fa 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -705,33 +705,33 @@ class SQLContext(@transient val sparkContext: SparkContext)
/**
* :: Experimental ::
* Creates a [[DataFrame]] with a single [[LongType]] column named `id`, containing elements
- * in an range from `start` to `end`(exclusive) with step value 1.
+ * in an range from 0 to `end` (exclusive) with step value 1.
*
- * @since 1.4.0
+ * @since 1.4.1
* @group dataframe
*/
@Experimental
- def range(start: Long, end: Long): DataFrame = {
- createDataFrame(
- sparkContext.range(start, end).map(Row(_)),
- StructType(StructField("id", LongType, nullable = false) :: Nil))
- }
+ def range(end: Long): DataFrame = range(0, end)
/**
* :: Experimental ::
* Creates a [[DataFrame]] with a single [[LongType]] column named `id`, containing elements
- * in an range from 0 to `end`(exclusive) with step value 1.
+ * in an range from `start` to `end` (exclusive) with step value 1.
*
* @since 1.4.0
* @group dataframe
*/
@Experimental
- def range(end: Long): DataFrame = range(0, end)
+ def range(start: Long, end: Long): DataFrame = {
+ createDataFrame(
+ sparkContext.range(start, end).map(Row(_)),
+ StructType(StructField("id", LongType, nullable = false) :: Nil))
+ }
/**
* :: Experimental ::
* Creates a [[DataFrame]] with a single [[LongType]] column named `id`, containing elements
- * in an range from `start` to `end`(exclusive) with an step value, with partition number
+ * in an range from `start` to `end` (exclusive) with an step value, with partition number
* specified.
*
* @since 1.4.0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org