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/03/12 08:55:29 UTC
spark git commit: [SPARK-6296] [SQL] Added equals to Column
Repository: spark
Updated Branches:
refs/heads/master e921a665c -> 25b71d8c1
[SPARK-6296] [SQL] Added equals to Column
Author: Volodymyr Lyubinets <vl...@gmail.com>
Closes #4988 from vlyubin/columncomp and squashes the following commits:
92d7c8f [Volodymyr Lyubinets] Added equals to Column
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/25b71d8c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/25b71d8c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/25b71d8c
Branch: refs/heads/master
Commit: 25b71d8c15572f0f2b951c827c169f8c65f726ad
Parents: e921a66
Author: Volodymyr Lyubinets <vl...@gmail.com>
Authored: Thu Mar 12 00:55:26 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Mar 12 00:55:26 2015 -0700
----------------------------------------------------------------------
sql/core/src/main/scala/org/apache/spark/sql/Column.scala | 7 +++++++
.../scala/org/apache/spark/sql/ColumnExpressionSuite.scala | 5 +++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/25b71d8c/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 a2cc9a9..908c78a 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
@@ -59,6 +59,13 @@ class Column(protected[sql] val expr: Expression) {
override def toString: String = expr.prettyString
+ override def equals(that: Any) = that match {
+ case that: Column => that.expr.equals(this.expr)
+ case _ => false
+ }
+
+ override def hashCode: Int = this.expr.hashCode
+
/**
* Unary minus, i.e. negate the expression.
* {{{
http://git-wip-us.apache.org/repos/asf/spark/blob/25b71d8c/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
----------------------------------------------------------------------
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 37c02aa..3036fbc 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
@@ -313,4 +313,9 @@ class ColumnExpressionSuite extends QueryTest {
test("lift alias out of cast") {
assert(col("1234").as("name").cast("int").expr === col("1234").cast("int").as("name").expr)
}
+
+ test("columns can be compared") {
+ assert('key.desc == 'key.desc)
+ assert('key.desc != 'key.asc)
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org