aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorYin Huai <yhuai@databricks.com>2015-11-14 21:04:18 -0800
committerReynold Xin <rxin@databricks.com>2015-11-14 21:04:18 -0800
commitd83c2f9f0b08d6d5d369d9fae04cdb15448e7f0d (patch)
tree62138f40fbba7bbf8bc7612c5feaeb225d8b3565 /sql
parent22e96b87fb0a0eb4f2f1a8fc29a742ceabff952a (diff)
downloadspark-d83c2f9f0b08d6d5d369d9fae04cdb15448e7f0d.tar.gz
spark-d83c2f9f0b08d6d5d369d9fae04cdb15448e7f0d.tar.bz2
spark-d83c2f9f0b08d6d5d369d9fae04cdb15448e7f0d.zip
[SPARK-11736][SQL] Add monotonically_increasing_id to function registry.
https://issues.apache.org/jira/browse/SPARK-11736 Author: Yin Huai <yhuai@databricks.com> Closes #9703 from yhuai/MonotonicallyIncreasingID.
Diffstat (limited to 'sql')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala3
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala4
2 files changed, 6 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
index 870808aa56..a8f4d257ac 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala
@@ -281,7 +281,8 @@ object FunctionRegistry {
expression[Sha1]("sha1"),
expression[Sha2]("sha2"),
expression[SparkPartitionID]("spark_partition_id"),
- expression[InputFileName]("input_file_name")
+ expression[InputFileName]("input_file_name"),
+ expression[MonotonicallyIncreasingID]("monotonically_increasing_id")
)
val builtin: SimpleFunctionRegistry = {
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
index 010df2a341..8674da7a79 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
@@ -563,6 +563,10 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
df.select(monotonicallyIncreasingId()),
Row(0L) :: Row(1L) :: Row((1L << 33) + 0L) :: Row((1L << 33) + 1L) :: Nil
)
+ checkAnswer(
+ df.select(expr("monotonically_increasing_id()")),
+ Row(0L) :: Row(1L) :: Row((1L << 33) + 0L) :: Row((1L << 33) + 1L) :: Nil
+ )
}
test("sparkPartitionId") {