From e2a67aed57ba6c2c4eaefe6ef3f38436bae50495 Mon Sep 17 00:00:00 2001 From: Andy HF Kwok Date: Sun, 5 Oct 2025 02:14:49 -0700 Subject: [PATCH] Fix lint issues --- .../main/scala/org/apache/spark/sql/comet/util/Utils.scala | 4 ++-- .../main/spark-3.x/org/apache/comet/shims/CometTypeShim.scala | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/src/main/scala/org/apache/spark/sql/comet/util/Utils.scala b/common/src/main/scala/org/apache/spark/sql/comet/util/Utils.scala index 03333a14d4..036c5c9aaf 100644 --- a/common/src/main/scala/org/apache/spark/sql/comet/util/Utils.scala +++ b/common/src/main/scala/org/apache/spark/sql/comet/util/Utils.scala @@ -223,9 +223,9 @@ object Utils extends CometTypeShim { writer.close() if (out.size() > 0) { - (batch.numRows(), cbbos.toChunkedByteBuffer) + (batch.numRows().toLong, cbbos.toChunkedByteBuffer) } else { - (batch.numRows(), new ChunkedByteBuffer(Array.empty[ByteBuffer])) + (batch.numRows().toLong, new ChunkedByteBuffer(Array.empty[ByteBuffer])) } } } diff --git a/common/src/main/spark-3.x/org/apache/comet/shims/CometTypeShim.scala b/common/src/main/spark-3.x/org/apache/comet/shims/CometTypeShim.scala index 14e0881e0e..853f89b677 100644 --- a/common/src/main/spark-3.x/org/apache/comet/shims/CometTypeShim.scala +++ b/common/src/main/spark-3.x/org/apache/comet/shims/CometTypeShim.scala @@ -20,6 +20,9 @@ package org.apache.comet.shims import org.apache.spark.sql.types.DataType +import scala.annotation.nowarn + trait CometTypeShim { + @nowarn // Spark 4 feature; stubbed to false in Spark 3.x for compatibility. def isStringCollationType(dt: DataType): Boolean = false } \ No newline at end of file