From 20f8f3a03c790c7f901e52978dcb961fefd27396 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 9 Feb 2026 14:15:35 +0800 Subject: [PATCH 1/3] [Feature] Support Spark expression: minutes_of_time --- .../apache/comet/shims/CometExprShim.scala | 22 ++++++++++++++++++- .../apache/comet/CometExpressionSuite.scala | 17 ++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala b/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala index 1d4427d159..a17e81f624 100644 --- a/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala +++ b/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala @@ -19,7 +19,7 @@ package org.apache.comet.shims -import org.apache.spark.sql.catalyst.expressions._ +import org.apache.spark.sql.catalyst.expressions.{Expression, MinutesOfTime} import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke import org.apache.spark.sql.internal.SQLConf import org.apache.spark.sql.internal.types.StringTypeWithCollation @@ -108,6 +108,26 @@ trait CometExprShim extends CommonStringExprs { val optExpr = scalarFunctionExprToProto("width_bucket", childExprs: _*) optExprWithInfo(optExpr, wb, wb.children: _*) + case mot: MinutesOfTime => + // MinutesOfTime is a RuntimeReplaceable expression that delegates to DateTimeUtils.getMinutesOfTime. + // It has the same functionality as Minute, so we convert it to the same protobuf Minute message. + val childExpr = exprToProtoInternal(mot.children.head, inputs, binding) + childExpr match { + case Some(child) => + val builder = ExprOuterClass.Minute.newBuilder() + builder.setChild(child) + // RuntimeReplaceable expressions typically don't have timeZoneId, default to UTC + builder.setTimezone("UTC") + Some( + ExprOuterClass.Expr + .newBuilder() + .setMinute(builder) + .build()) + case None => + withInfo(mot, mot.children.head) + None + } + case _ => None } } diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index 2999d8bfe5..399d5bb5df 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -618,6 +618,23 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { } } + test("MinutesOfTime expression support") { + // MinutesOfTime is only available in Spark 4.0+ + assume(isSpark40Plus, "MinutesOfTime is only available in Spark 4.0+") + Seq(true, false).foreach { dictionaryEnabled => + withTempDir { dir => + val path = new Path(dir.toURI.toString, "part-r-0.parquet") + makeRawTimeParquetFile(path, dictionaryEnabled = dictionaryEnabled, 10000) + readParquetFile(path.toString) { df => + // Test that MinutesOfTime (via minute() function) works correctly + val query = df.select(expr("minute(_1)")) + + checkSparkAnswerAndOperator(query) + } + } + } + } + test("hour on int96 timestamp column") { import testImplicits._ From 11cce9a41325aa073a672f7c1625c876d37d2be5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 9 Feb 2026 14:55:01 +0800 Subject: [PATCH 2/3] Revert "[Feature] Support Spark expression: minutes_of_time" This reverts commit 20f8f3a03c790c7f901e52978dcb961fefd27396. --- .../apache/comet/shims/CometExprShim.scala | 22 +------------------ .../apache/comet/CometExpressionSuite.scala | 17 -------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala b/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala index a17e81f624..1d4427d159 100644 --- a/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala +++ b/spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala @@ -19,7 +19,7 @@ package org.apache.comet.shims -import org.apache.spark.sql.catalyst.expressions.{Expression, MinutesOfTime} +import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke import org.apache.spark.sql.internal.SQLConf import org.apache.spark.sql.internal.types.StringTypeWithCollation @@ -108,26 +108,6 @@ trait CometExprShim extends CommonStringExprs { val optExpr = scalarFunctionExprToProto("width_bucket", childExprs: _*) optExprWithInfo(optExpr, wb, wb.children: _*) - case mot: MinutesOfTime => - // MinutesOfTime is a RuntimeReplaceable expression that delegates to DateTimeUtils.getMinutesOfTime. - // It has the same functionality as Minute, so we convert it to the same protobuf Minute message. - val childExpr = exprToProtoInternal(mot.children.head, inputs, binding) - childExpr match { - case Some(child) => - val builder = ExprOuterClass.Minute.newBuilder() - builder.setChild(child) - // RuntimeReplaceable expressions typically don't have timeZoneId, default to UTC - builder.setTimezone("UTC") - Some( - ExprOuterClass.Expr - .newBuilder() - .setMinute(builder) - .build()) - case None => - withInfo(mot, mot.children.head) - None - } - case _ => None } } diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index 399d5bb5df..2999d8bfe5 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -618,23 +618,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { } } - test("MinutesOfTime expression support") { - // MinutesOfTime is only available in Spark 4.0+ - assume(isSpark40Plus, "MinutesOfTime is only available in Spark 4.0+") - Seq(true, false).foreach { dictionaryEnabled => - withTempDir { dir => - val path = new Path(dir.toURI.toString, "part-r-0.parquet") - makeRawTimeParquetFile(path, dictionaryEnabled = dictionaryEnabled, 10000) - readParquetFile(path.toString) { df => - // Test that MinutesOfTime (via minute() function) works correctly - val query = df.select(expr("minute(_1)")) - - checkSparkAnswerAndOperator(query) - } - } - } - } - test("hour on int96 timestamp column") { import testImplicits._ From feed44f96b4840c70028271e4359c8cf33493746 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 9 Feb 2026 15:05:40 +0800 Subject: [PATCH 3/3] [Feature] Support Spark expression: minutes_of_time --- .../apache/comet/serde/QueryPlanSerde.scala | 1 + .../org/apache/comet/serde/datetime.scala | 28 ++++++++++++++++++- .../apache/comet/CometExpressionSuite.scala | 15 ++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala b/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala index 73b88ae935..ea4b61a700 100644 --- a/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala +++ b/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala @@ -196,6 +196,7 @@ object QueryPlanSerde extends Logging with CometExprShim { classOf[LastDay] -> CometLastDay, classOf[Hour] -> CometHour, classOf[Minute] -> CometMinute, + classOf[MinutesOfTime] -> CometMinutesOfTime, classOf[Second] -> CometSecond, classOf[TruncDate] -> CometTruncDate, classOf[TruncTimestamp] -> CometTruncTimestamp, diff --git a/spark/src/main/scala/org/apache/comet/serde/datetime.scala b/spark/src/main/scala/org/apache/comet/serde/datetime.scala index a623146916..63f3d9cbc5 100644 --- a/spark/src/main/scala/org/apache/comet/serde/datetime.scala +++ b/spark/src/main/scala/org/apache/comet/serde/datetime.scala @@ -21,7 +21,7 @@ package org.apache.comet.serde import java.util.Locale -import org.apache.spark.sql.catalyst.expressions.{Attribute, DateAdd, DateDiff, DateFormatClass, DateSub, DayOfMonth, DayOfWeek, DayOfYear, GetDateField, Hour, LastDay, Literal, Minute, Month, Quarter, Second, TruncDate, TruncTimestamp, UnixDate, UnixTimestamp, WeekDay, WeekOfYear, Year} +import org.apache.spark.sql.catalyst.expressions.{Attribute, DateAdd, DateDiff, DateFormatClass, DateSub, DayOfMonth, DayOfWeek, DayOfYear, GetDateField, Hour, LastDay, Literal, Minute, MinutesOfTime, Month, Quarter, Second, TruncDate, TruncTimestamp, UnixDate, UnixTimestamp, WeekDay, WeekOfYear, Year} import org.apache.spark.sql.types.{DateType, IntegerType, StringType, TimestampType} import org.apache.spark.unsafe.types.UTF8String @@ -228,6 +228,32 @@ object CometMinute extends CometExpressionSerde[Minute] { } } +object CometMinutesOfTime extends CometExpressionSerde[MinutesOfTime] { + override def convert( + expr: MinutesOfTime, + inputs: Seq[Attribute], + binding: Boolean): Option[ExprOuterClass.Expr] = { + val childExpr = exprToProtoInternal(expr.children.head, inputs, binding) + + if (childExpr.isDefined) { + val builder = ExprOuterClass.Minute.newBuilder() + builder.setChild(childExpr.get) + + // MinutesOfTime is a RuntimeReplaceable expression and doesn't have timeZoneId property. + builder.setTimezone("UTC") + + Some( + ExprOuterClass.Expr + .newBuilder() + .setMinute(builder) + .build()) + } else { + withInfo(expr, expr.children.head) + None + } + } +} + object CometSecond extends CometExpressionSerde[Second] { override def convert( expr: Second, diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala index 2999d8bfe5..7c7e3935c9 100644 --- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala +++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala @@ -618,6 +618,21 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { } } + test("MinutesOfTime expression support") { + Seq(true, false).foreach { dictionaryEnabled => + withTempDir { dir => + val path = new Path(dir.toURI.toString, "part-r-0.parquet") + makeRawTimeParquetFile(path, dictionaryEnabled = dictionaryEnabled, 10000) + readParquetFile(path.toString) { df => + // Test that MinutesOfTime (via minute() function) works correctly + val query = df.select(expr("minute(_1)")) + + checkSparkAnswerAndOperator(query) + } + } + } + } + test("hour on int96 timestamp column") { import testImplicits._