This is an automated email from the ASF dual-hosted git repository. hongze pushed a commit to branch revert-5723-wip-forbid-inherit-caseclass in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
commit e33432bba6a2ffe48fbc8267001e660c2c18d407 Author: Hongze Zhang <[email protected]> AuthorDate: Mon May 13 15:49:17 2024 +0800 Revert "[CORE] Add a compilation-time check to forbid case-class inheritance" This reverts commit f5a6c98bb80b11f22a8e07abf9ee22852fc5a425. --- .../spark/sql/delta/catalog/ClickHouseTableV2.scala | 2 -- .../datasources/v2/clickhouse/metadata/AddFileTags.scala | 1 - .../apache/spark/shuffle/HashPartitioningWrapper.scala | 1 - pom.xml | 15 --------------- 4 files changed, 19 deletions(-) diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala index 1107c6a2e..8c09ae7c7 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/delta/catalog/ClickHouseTableV2.scala @@ -39,7 +39,6 @@ import java.{util => ju} import scala.collection.JavaConverters._ -@SuppressWarnings(Array("io.github.zhztheplayer.scalawarts.InheritFromCaseClass")) class ClickHouseTableV2( override val spark: SparkSession, override val path: Path, @@ -269,7 +268,6 @@ class ClickHouseTableV2( } } -@SuppressWarnings(Array("io.github.zhztheplayer.scalawarts.InheritFromCaseClass")) class TempClickHouseTableV2( override val spark: SparkSession, override val catalogTable: Option[CatalogTable] = None) diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala index 0680663eb..bdb3a30e9 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala +++ b/backends-clickhouse/src/main/scala/org/apache/spark/sql/execution/datasources/v2/clickhouse/metadata/AddFileTags.scala @@ -28,7 +28,6 @@ import java.util.{List => JList} import scala.collection.JavaConverters._ import scala.collection.mutable.ArrayBuffer -@SuppressWarnings(Array("io.github.zhztheplayer.scalawarts.InheritFromCaseClass")) class AddMergeTreeParts( val database: String, val table: String, diff --git a/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/HashPartitioningWrapper.scala b/gluten-core/src/main/scala/org/apache/spark/shuffle/HashPartitioningWrapper.scala similarity index 94% rename from backends-clickhouse/src/main/scala/org/apache/spark/shuffle/HashPartitioningWrapper.scala rename to gluten-core/src/main/scala/org/apache/spark/shuffle/HashPartitioningWrapper.scala index bf1cbe4a8..06ce8fe0f 100644 --- a/backends-clickhouse/src/main/scala/org/apache/spark/shuffle/HashPartitioningWrapper.scala +++ b/gluten-core/src/main/scala/org/apache/spark/shuffle/HashPartitioningWrapper.scala @@ -21,7 +21,6 @@ import org.apache.spark.sql.catalyst.plans.physical.HashPartitioning // A wrapper for HashPartitioning to remain original hash expressions. // Only used by CH backend when shuffle hash expressions contains non-field expression. -@SuppressWarnings(Array("io.github.zhztheplayer.scalawarts.InheritFromCaseClass")) class HashPartitioningWrapper( original: Seq[Expression], newExpr: Seq[Expression], diff --git a/pom.xml b/pom.xml index a29f19832..dbf46ac17 100644 --- a/pom.xml +++ b/pom.xml @@ -615,20 +615,6 @@ <artifactId>scala-maven-plugin</artifactId> <version>${scala.compiler.version}</version> <configuration> - <compilerPlugins> - <compilerPlugin> - <groupId>org.wartremover</groupId> - <artifactId>wartremover_${scala.binary.version}</artifactId> - <version>3.1.6</version> - </compilerPlugin> - </compilerPlugins> - <dependencies> - <dependency> - <groupId>io.github.zhztheplayer.scalawarts</groupId> - <artifactId>scalawarts</artifactId> - <version>0.1.0</version> - </dependency> - </dependencies> <recompileMode>${scala.recompile.mode}</recompileMode> <args> <arg>-Wconf:msg=While parsing annotations in:silent</arg> @@ -636,7 +622,6 @@ <arg>-Xfatal-warnings</arg> <arg>-deprecation</arg> <arg>-feature</arg> - <arg>-P:wartremover:traverser:io.github.zhztheplayer.scalawarts.InheritFromCaseClass</arg> </args> </configuration> <executions> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
