From 7c7c7529a16c0e79778e522a3df82a0f1c3762a3 Mon Sep 17 00:00:00 2001
From: Liang-Chi Hsieh <viirya@appier.com>
Date: Thu, 13 Aug 2015 22:06:09 -0700
Subject: [PATCH] [MINOR] [SQL] Remove canEqual in Row
As `InternalRow` does not extend `Row` now, I think we can remove it.
Author: Liang-Chi Hsieh <viirya@appier.com>
Closes #8170 from viirya/remove_canequal.
---
.../main/scala/org/apache/spark/sql/Row.scala | 21 -------------------
1 file changed, 21 deletions(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala
index 40159aaf14..ec895af9c3 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala
@@ -364,31 +364,10 @@ trait Row extends Serializable {
false
}
- /**
- * Returns true if we can check equality for these 2 rows.
- * Equality check between external row and internal row is not allowed.
- * Here we do this check to prevent call `equals` on external row with internal row.
- */
- protected def canEqual(other: Row) = {
- // Note that `Row` is not only the interface of external row but also the parent
- // of `InternalRow`, so we have to ensure `other` is not a internal row here to prevent
- // call `equals` on external row with internal row.
- // `InternalRow` overrides canEqual, and these two canEquals together makes sure that
- // equality check between external Row and InternalRow will always fail.
- // In the future, InternalRow should not extend Row. In that case, we can remove these
- // canEqual methods.
- !other.isInstanceOf[InternalRow]
- }
-
override def equals(o: Any): Boolean = {
if (!o.isInstanceOf[Row]) return false
val other = o.asInstanceOf[Row]
- if (!canEqual(other)) {
- throw new UnsupportedOperationException(
- "cannot check equality between external and internal rows")
- }
-
if (other eq null) return false
if (length != other.length) {
--
GitLab