You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by mb...@apache.org on 2026/05/05 18:36:01 UTC
(datafusion-comet) branch main updated: fix: resolve Scala compiler warnings for auto-tupling and bare try (#4227)
This is an automated email from the ASF dual-hosted git repository.
mbutrovich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new 5e20267bd fix: resolve Scala compiler warnings for auto-tupling and bare try (#4227)
5e20267bd is described below
commit 5e20267bd9f67af3320b46dd2110a5ef47c1be24
Author: Andy Grove <ag...@apache.org>
AuthorDate: Tue May 5 12:35:57 2026 -0600
fix: resolve Scala compiler warnings for auto-tupling and bare try (#4227)
---
.../main/scala/org/apache/comet/GenerateDocs.scala | 152 +++++++++++----------
.../apache/comet/parquet/SourceFilterSerde.scala | 11 +-
.../serde/operator/CometIcebergNativeScan.scala | 2 +-
.../spark/sql/comet/shims/ShimCometScanExec.scala | 2 +-
.../sql/comet/shims/ShimSparkErrorConverter.scala | 3 +-
.../apache/comet/CometStringExpressionSuite.scala | 2 +-
.../comet/exec/CometColumnarShuffleSuite.scala | 2 +-
7 files changed, 91 insertions(+), 83 deletions(-)
diff --git a/spark/src/main/scala/org/apache/comet/GenerateDocs.scala b/spark/src/main/scala/org/apache/comet/GenerateDocs.scala
index 08f0f8691..e35f90e5c 100644
--- a/spark/src/main/scala/org/apache/comet/GenerateDocs.scala
+++ b/spark/src/main/scala/org/apache/comet/GenerateDocs.scala
@@ -50,78 +50,86 @@ object GenerateDocs {
* that category from the serde maps in `QueryPlanSerde`.
*/
private def categoryPages: Map[String, (String, () => CategoryNotes)] = Map(
- "array" -> ("compatibility/expressions/array.md",
- () =>
- QueryPlanSerde.arrayExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "datetime" -> ("compatibility/expressions/datetime.md",
- () =>
- QueryPlanSerde.temporalExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "math" -> ("compatibility/expressions/math.md",
- () =>
- QueryPlanSerde.mathExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "struct" -> ("compatibility/expressions/struct.md",
- () =>
- QueryPlanSerde.structExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "aggregate" -> ("compatibility/expressions/aggregate.md",
- () =>
- QueryPlanSerde.aggrSerdeMap.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "string" -> ("compatibility/expressions/string.md",
- () =>
- QueryPlanSerde.stringExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "map" -> ("compatibility/expressions/map.md",
- () =>
- QueryPlanSerde.mapExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }),
- "misc" -> ("compatibility/expressions/misc.md",
- () =>
- QueryPlanSerde.miscExpressions.toSeq.map { case (cls, serde) =>
- (
- cls.getSimpleName,
- serde.getCompatibleNotes(),
- serde.getIncompatibleReasons(),
- serde.getUnsupportedReasons())
- }))
+ "array" -> ((
+ "compatibility/expressions/array.md",
+ () =>
+ QueryPlanSerde.arrayExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "datetime" -> ((
+ "compatibility/expressions/datetime.md",
+ () =>
+ QueryPlanSerde.temporalExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "math" -> ((
+ "compatibility/expressions/math.md",
+ () =>
+ QueryPlanSerde.mathExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "struct" -> ((
+ "compatibility/expressions/struct.md",
+ () =>
+ QueryPlanSerde.structExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "aggregate" -> ((
+ "compatibility/expressions/aggregate.md",
+ () =>
+ QueryPlanSerde.aggrSerdeMap.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "string" -> ((
+ "compatibility/expressions/string.md",
+ () =>
+ QueryPlanSerde.stringExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "map" -> ((
+ "compatibility/expressions/map.md",
+ () =>
+ QueryPlanSerde.mapExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })),
+ "misc" -> ((
+ "compatibility/expressions/misc.md",
+ () =>
+ QueryPlanSerde.miscExpressions.toSeq.map { case (cls, serde) =>
+ (
+ cls.getSimpleName,
+ serde.getCompatibleNotes(),
+ serde.getIncompatibleReasons(),
+ serde.getUnsupportedReasons())
+ })))
def main(args: Array[String]): Unit = {
val userGuideLocation = args(0)
diff --git a/spark/src/main/scala/org/apache/comet/parquet/SourceFilterSerde.scala b/spark/src/main/scala/org/apache/comet/parquet/SourceFilterSerde.scala
index ac6a89ca3..9fdf38dc8 100644
--- a/spark/src/main/scala/org/apache/comet/parquet/SourceFilterSerde.scala
+++ b/spark/src/main/scala/org/apache/comet/parquet/SourceFilterSerde.scala
@@ -50,11 +50,12 @@ object SourceFilterSerde extends Logging {
.setDatatype(dataType.get)
.build()
Some(
- field.dataType,
- ExprOuterClass.Expr
- .newBuilder()
- .setBound(boundExpr)
- .build())
+ (
+ field.dataType,
+ ExprOuterClass.Expr
+ .newBuilder()
+ .setBound(boundExpr)
+ .build()))
} else {
None
}
diff --git a/spark/src/main/scala/org/apache/comet/serde/operator/CometIcebergNativeScan.scala b/spark/src/main/scala/org/apache/comet/serde/operator/CometIcebergNativeScan.scala
index 634023de9..31ecb36cd 100644
--- a/spark/src/main/scala/org/apache/comet/serde/operator/CometIcebergNativeScan.scala
+++ b/spark/src/main/scala/org/apache/comet/serde/operator/CometIcebergNativeScan.scala
@@ -819,7 +819,7 @@ object CometIcebergNativeScan extends CometOperatorSerde[CometBatchScanExec] wit
inputPartitions.foreach { inputPartition =>
val inputPartClass = inputPartition.getClass
- try {
+ {
val taskGroupMethod = inputPartClass.getDeclaredMethod("taskGroup")
taskGroupMethod.setAccessible(true)
val taskGroup = taskGroupMethod.invoke(inputPartition)
diff --git a/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimCometScanExec.scala b/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimCometScanExec.scala
index 12be0cc53..1c1ba68e3 100644
--- a/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimCometScanExec.scala
+++ b/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimCometScanExec.scala
@@ -41,7 +41,7 @@ trait ShimCometScanExec {
def isSparkVersionAtLeast355: Boolean = {
VersionUtils.majorMinorPatchVersion(SPARK_VERSION_SHORT) match {
- case Some((major, minor, patch)) => (major, minor, patch) >= (3, 5, 5)
+ case Some((major, minor, patch)) => (major, minor, patch) >= ((3, 5, 5))
case None =>
throw new IllegalArgumentException(s"Malformed Spark version: $SPARK_VERSION_SHORT")
}
diff --git a/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimSparkErrorConverter.scala b/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimSparkErrorConverter.scala
index 6cceb8bfc..ca37d5f52 100644
--- a/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimSparkErrorConverter.scala
+++ b/spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimSparkErrorConverter.scala
@@ -162,8 +162,7 @@ trait ShimSparkErrorConverter {
case "CollectionSizeLimitExceeded" =>
Some(
QueryExecutionErrors.createArrayWithElementsExceedLimitError(
- "array",
- params("numElements").toString.toLong))
+ ("array", params("numElements").toString.toLong)))
case "NotNullAssertViolation" =>
Some(
diff --git a/spark/src/test/scala/org/apache/comet/CometStringExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometStringExpressionSuite.scala
index 44513efaa..89d5dfd4b 100644
--- a/spark/src/test/scala/org/apache/comet/CometStringExpressionSuite.scala
+++ b/spark/src/test/scala/org/apache/comet/CometStringExpressionSuite.scala
@@ -582,7 +582,7 @@ class CometStringExpressionSuite extends CometTestBase {
}
test("substring - decomposed and combining unicode characters") {
- val data = edgeCases.map(s => (s, "")) :+ ("", "") :+ (null, "")
+ val data = edgeCases.map(s => (s, "")) :+ (("", "")) :+ ((null, ""))
withParquetTable(data, "tbl") {
// first code point only — exposes decomposed vs precomposed difference
checkSparkAnswerAndOperator("SELECT substring(_1, 1, 1) FROM tbl")
diff --git a/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala b/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala
index fe2866da6..7edbab969 100644
--- a/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala
+++ b/spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala
@@ -189,7 +189,7 @@ abstract class CometColumnarShuffleSuite extends CometTestBase with AdaptiveSpar
checkShuffleAnswer(df, complexKeyShuffles)
}
- withParquetTable((0 until 50).map(i => (Map(i -> (i, i.toString)), i + 1)), "tbl") {
+ withParquetTable((0 until 50).map(i => (Map(i -> ((i, i.toString))), i + 1)), "tbl") {
val df = sql("SELECT * FROM tbl")
.filter($"_2" > 10)
.repartition(numPartitions, $"_1", $"_2")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org