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/05/31 09:06:00 UTC
spark git commit: [SPARK-7975] Add style checker to disallow
overriding equals covariantly.
Repository: spark
Updated Branches:
refs/heads/master 8764dcceb -> 7896e99b2
[SPARK-7975] Add style checker to disallow overriding equals covariantly.
Author: Reynold Xin <rx...@databricks.com>
This patch had conflicts when merged, resolved by
Committer: Reynold Xin <rx...@databricks.com>
Closes #6527 from rxin/covariant-equals and squashes the following commits:
e7d7784 [Reynold Xin] [SPARK-7975] Enforce CovariantEqualsChecker
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7896e99b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7896e99b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7896e99b
Branch: refs/heads/master
Commit: 7896e99b2a0a160bd0b6c5c11cf40b6cbf4a65cf
Parents: 8764dcc
Author: Reynold Xin <rx...@databricks.com>
Authored: Sun May 31 00:05:55 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Sun May 31 00:05:55 2015 -0700
----------------------------------------------------------------------
scalastyle-config.xml | 2 +-
.../src/main/scala/org/apache/spark/sql/parquet/newParquet.scala | 2 +-
.../scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7896e99b/scalastyle-config.xml
----------------------------------------------------------------------
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 072c480..3a98422 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> -->
http://git-wip-us.apache.org/repos/asf/spark/blob/7896e99b/sql/core/src/main/scala/org/apache/spark/sql/parquet/newParquet.scala
----------------------------------------------------------------------
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 8b3e1b2..e439a18 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
http://git-wip-us.apache.org/repos/asf/spark/blob/7896e99b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala
----------------------------------------------------------------------
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 47b8573..ca1f49b 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 &&
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org