diff options
author | Reynold Xin <rxin@databricks.com> | 2015-05-31 00:05:55 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2015-05-31 00:05:55 -0700 |
commit | 7896e99b2a0a160bd0b6c5c11cf40b6cbf4a65cf (patch) | |
tree | 04dd0292a2588009dab580f82d36fe755af9987e | |
parent | 8764dccebd44292ab6f6834640199aad451459c5 (diff) | |
download | spark-7896e99b2a0a160bd0b6c5c11cf40b6cbf4a65cf.tar.gz spark-7896e99b2a0a160bd0b6c5c11cf40b6cbf4a65cf.tar.bz2 spark-7896e99b2a0a160bd0b6c5c11cf40b6cbf4a65cf.zip |
[SPARK-7975] Add style checker to disallow overriding equals covariantly.
Author: Reynold Xin <rxin@databricks.com>
This patch had conflicts when merged, resolved by
Committer: Reynold Xin <rxin@databricks.com>
Closes #6527 from rxin/covariant-equals and squashes the following commits:
e7d7784 [Reynold Xin] [SPARK-7975] Enforce CovariantEqualsChecker
3 files changed, 3 insertions, 3 deletions
diff --git a/scalastyle-config.xml b/scalastyle-config.xml index 072c48062c..3a98422216 100644 --- a/scalastyle-config.xml +++ b/scalastyle-config.xml @@ -97,7 +97,7 @@ <!-- <check level="error" class="org.scalastyle.scalariform.NullChecker" enabled="true"></check> --> <!-- <check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"></check> --> <check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check> - <!-- <check level="error" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check> --> + <check level="error" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check> <!-- <check level="error" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="true"></check> --> <!-- <check level="error" class="org.scalastyle.file.RegexChecker" enabled="true"> --> <!-- <parameters> --> diff --git a/sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala b/sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala index 8b3e1b2b59..e439a18ac4 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala @@ -155,7 +155,7 @@ private[sql] class ParquetRelation2( meta } - override def equals(other: scala.Any): Boolean = other match { + override def equals(other: Any): Boolean = other match { case that: ParquetRelation2 => val schemaEquality = if (shouldMergeSchemas) { this.shouldMergeSchemas == that.shouldMergeSchemas diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala index 47b8573158..ca1f49b546 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala @@ -596,7 +596,7 @@ private[hive] case class MetastoreRelation self: Product => - override def equals(other: scala.Any): Boolean = other match { + override def equals(other: Any): Boolean = other match { case relation: MetastoreRelation => databaseName == relation.databaseName && tableName == relation.tableName && |