You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by li...@apache.org on 2017/10/21 03:58:59 UTC
spark git commit: [SPARK-22326][SQL] Remove unnecessary hashCode and
equals methods
Repository: spark
Updated Branches:
refs/heads/master b8624b06e -> d9f286d26
[SPARK-22326][SQL] Remove unnecessary hashCode and equals methods
## What changes were proposed in this pull request?
Plan equality should be computed by `canonicalized`, so we can remove unnecessary `hashCode` and `equals` methods.
## How was this patch tested?
Existing tests.
Author: Zhenhua Wang <wa...@huawei.com>
Closes #19539 from wzhfy/remove_equals.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d9f286d2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d9f286d2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d9f286d2
Branch: refs/heads/master
Commit: d9f286d261c6ee9e8dcb46e78d4666318ea25af2
Parents: b8624b0
Author: Zhenhua Wang <wa...@huawei.com>
Authored: Fri Oct 20 20:58:55 2017 -0700
Committer: gatorsmile <ga...@gmail.com>
Committed: Fri Oct 20 20:58:55 2017 -0700
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/catalog/interface.scala | 11 -----------
.../sql/execution/datasources/LogicalRelation.scala | 11 -----------
2 files changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d9f286d2/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
index 975b084..1dbae4d 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
@@ -22,8 +22,6 @@ import java.util.Date
import scala.collection.mutable
-import com.google.common.base.Objects
-
import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.catalyst.{FunctionIdentifier, InternalRow, TableIdentifier}
import org.apache.spark.sql.catalyst.analysis.MultiInstanceRelation
@@ -440,15 +438,6 @@ case class HiveTableRelation(
def isPartitioned: Boolean = partitionCols.nonEmpty
- override def equals(relation: Any): Boolean = relation match {
- case other: HiveTableRelation => tableMeta == other.tableMeta && output == other.output
- case _ => false
- }
-
- override def hashCode(): Int = {
- Objects.hashCode(tableMeta.identifier, output)
- }
-
override lazy val canonicalized: HiveTableRelation = copy(
tableMeta = tableMeta.copy(
storage = CatalogStorageFormat.empty,
http://git-wip-us.apache.org/repos/asf/spark/blob/d9f286d2/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/LogicalRelation.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/LogicalRelation.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/LogicalRelation.scala
index 17a6107..3e98cb2 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/LogicalRelation.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/LogicalRelation.scala
@@ -34,17 +34,6 @@ case class LogicalRelation(
override val isStreaming: Boolean)
extends LeafNode with MultiInstanceRelation {
- // Logical Relations are distinct if they have different output for the sake of transformations.
- override def equals(other: Any): Boolean = other match {
- case l @ LogicalRelation(otherRelation, _, _, isStreaming) =>
- relation == otherRelation && output == l.output && isStreaming == l.isStreaming
- case _ => false
- }
-
- override def hashCode: Int = {
- com.google.common.base.Objects.hashCode(relation, output)
- }
-
// Only care about relation when canonicalizing.
override lazy val canonicalized: LogicalPlan = copy(
output = output.map(QueryPlan.normalizeExprId(_, output)),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org