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/05/12 19:37:59 UTC
spark git commit: [DataFrame][minor] support column in field accessor
Repository: spark
Updated Branches:
refs/heads/master 0595b6de8 -> bfcaf8adc
[DataFrame][minor] support column in field accessor
Minor improvement, now we can use `Column` as extraction expression.
Author: Wenchen Fan <cl...@outlook.com>
Closes #6080 from cloud-fan/tmp and squashes the following commits:
0fdefb7 [Wenchen Fan] support column in field accessor
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bfcaf8ad
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bfcaf8ad
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bfcaf8ad
Branch: refs/heads/master
Commit: bfcaf8adcdc20dec203e2e9d5a72b52dd6f226a9
Parents: 0595b6d
Author: Wenchen Fan <cl...@outlook.com>
Authored: Tue May 12 10:37:57 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Tue May 12 10:37:57 2015 -0700
----------------------------------------------------------------------
sql/core/src/main/scala/org/apache/spark/sql/Column.scala | 2 +-
sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/bfcaf8ad/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/Column.scala b/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
index e6e475b..4d50821 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
@@ -78,7 +78,7 @@ class Column(protected[sql] val expr: Expression) extends Logging {
*
* @group expr_ops
*/
- def apply(field: Any): Column = UnresolvedExtractValue(expr, Literal(field))
+ def apply(extraction: Any): Column = UnresolvedExtractValue(expr, lit(extraction).expr)
/**
* Unary minus, i.e. negate the expression.
http://git-wip-us.apache.org/repos/asf/spark/blob/bfcaf8ad/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
index 2ade955..d58438e 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
@@ -456,6 +456,7 @@ class DataFrameSuite extends QueryTest {
assert(complexData.filter(complexData("a")(0) === 2).count() == 1)
assert(complexData.filter(complexData("m")("1") === 1).count() == 1)
assert(complexData.filter(complexData("s")("key") === 1).count() == 1)
+ assert(complexData.filter(complexData("m")(complexData("s")("value")) === 1).count() == 1)
}
test("SPARK-7324 dropDuplicates") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org