diff options
author | Liang-Chi Hsieh <viirya@appier.com> | 2015-08-13 22:06:09 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2015-08-13 22:06:18 -0700 |
commit | 00ccb21736689ef9d9ac4c92e50bff38691920fa (patch) | |
tree | d926a56aa1d44b236d91b628e1a1e998776654bb /sql | |
parent | 703e3f1eaee86c8b835468b36613b202041e0810 (diff) | |
download | spark-00ccb21736689ef9d9ac4c92e50bff38691920fa.tar.gz spark-00ccb21736689ef9d9ac4c92e50bff38691920fa.tar.bz2 spark-00ccb21736689ef9d9ac4c92e50bff38691920fa.zip |
[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.
(cherry picked from commit 7c7c7529a16c0e79778e522a3df82a0f1c3762a3)
Signed-off-by: Reynold Xin <rxin@databricks.com>
Diffstat (limited to 'sql')
-rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/Row.scala | 21 |
1 files changed, 0 insertions, 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) { |