feat: Enable WeekDay function (apache#2411)

wForget · web-flow · commit 9cac1af03f14 · 2025-09-17T07:53:10.000-06:00
diff --git a/docs/source/user-guide/latest/expressions.md b/docs/source/user-guide/latest/expressions.md
@@ -91,25 +91,26 @@ incompatible expressions.
 
 ## Date/Time Functions
 
-| Expression     | SQL                          | Spark-Compatible? | Compatibility Notes                                                                                  |
-| -------------- |------------------------------| ----------------- |------------------------------------------------------------------------------------------------------|
-| DateAdd        | `date_add`                   | Yes               |                                                                                                      |
-| DateSub        | `date_sub`                   | Yes               |                                                                                                      |
-| DatePart       | `date_part(field, source)`   | Yes               | Supported values of `field`: `year`/`month`/`week`/`day`/`dayofweek`/`doy`/`quarter`/`hour`/`minute` |
-| Extract        | `extract(field FROM source)` | Yes               | Supported values of `field`: `year`/`month`/`week`/`day`/`dayofweek`/`doy`/`quarter`/`hour`/`minute` |
-| FromUnixTime   | `from_unixtime`              | No                | Does not support format, supports only -8334601211038 <= sec <= 8210266876799                        |
-| Hour           | `hour`                       | Yes               |                                                                                                      |
-| Minute         | `minute`                     | Yes               |                                                                                                      |
-| Second         | `second`                     | Yes               |                                                                                                      |
-| TruncDate      | `trunc`                      | Yes               |                                                                                                      |
-| TruncTimestamp | `trunc_date`                 | Yes               |                                                                                                      |
-| Year           | `year`                       | Yes               |                                                                                                      |
-| Month          | `month`                      | Yes               |                                                                                                      |
-| DayOfMonth     | `day`/`dayofmonth`           | Yes               |                                                                                                      |
-| DayOfWeek      | `dayofweek`                  | Yes               |                                                                                                      |
-| DayOfYear      | `dayofyear`                  | Yes               |                                                                                                      |
-| WeekOfYear     | `weekofyear`                 | Yes               |                                                                                                      |
-| Quarter        | `quarter`                    | Yes               |                                                                                                      |
+| Expression     | SQL                          | Spark-Compatible? | Compatibility Notes                                                                                                  |
+|----------------|------------------------------| ----------------- |----------------------------------------------------------------------------------------------------------------------|
+| DateAdd        | `date_add`                   | Yes               |                                                                                                                      |
+| DateSub        | `date_sub`                   | Yes               |                                                                                                                      |
+| DatePart       | `date_part(field, source)`   | Yes               | Supported values of `field`: `year`/`month`/`week`/`day`/`dayofweek`/`dayofweek_iso`/`doy`/`quarter`/`hour`/`minute` |
+| Extract        | `extract(field FROM source)` | Yes               | Supported values of `field`: `year`/`month`/`week`/`day`/`dayofweek`/`dayofweek_iso`/`doy`/`quarter`/`hour`/`minute` |
+| FromUnixTime   | `from_unixtime`              | No                | Does not support format, supports only -8334601211038 <= sec <= 8210266876799                                        |
+| Hour           | `hour`                       | Yes               |                                                                                                                      |
+| Minute         | `minute`                     | Yes               |                                                                                                                      |
+| Second         | `second`                     | Yes               |                                                                                                                      |
+| TruncDate      | `trunc`                      | Yes               |                                                                                                                      |
+| TruncTimestamp | `trunc_date`                 | Yes               |                                                                                                                      |
+| Year           | `year`                       | Yes               |                                                                                                                      |
+| Month          | `month`                      | Yes               |                                                                                                                      |
+| DayOfMonth     | `day`/`dayofmonth`           | Yes               |                                                                                                                      |
+| DayOfWeek      | `dayofweek`                  | Yes               |                                                                                                                      |
+| WeekDay        | `weekday`                    | Yes               |                                                                                                                      |
+| DayOfYear      | `dayofyear`                  | Yes               |                                                                                                                      |
+| WeekOfYear     | `weekofyear`                 | Yes               |                                                                                                                      |
+| Quarter        | `quarter`                    | Yes               |                                                                                                                      |
 
 ## Math Expressions
 
diff --git a/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala b/spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala
@@ -207,9 +207,7 @@ object QueryPlanSerde extends Logging with CometExprShim {
     classOf[Month] -> CometMonth,
     classOf[DayOfMonth] -> CometDayOfMonth,
     classOf[DayOfWeek] -> CometDayOfWeek,
-    // FIXME: current datafusion version does not support isodow (WeekDay)
-    //  , see: https://github.com/apache/datafusion-comet/issues/2330
-    // classOf[WeekDay] -> CometWeekDay,
+    classOf[WeekDay] -> CometWeekDay,
     classOf[DayOfYear] -> CometDayOfYear,
     classOf[WeekOfYear] -> CometWeekOfYear,
     classOf[Quarter] -> CometQuarter)
diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
@@ -1729,9 +1729,8 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
         withTable(table) {
           sql(s"create table $table(col timestamp) using parquet")
           sql(s"insert into $table values (now()), (timestamp('1900-01-01')), (null)")
-          // TODO: weekday(col) https://github.com/apache/datafusion-comet/issues/2330
           checkSparkAnswerAndOperator(
-            "SELECT col, year(col), month(col), day(col)," +
+            "SELECT col, year(col), month(col), day(col), weekday(col), " +
               s" dayofweek(col), dayofyear(col), weekofyear(col), quarter(col) FROM $table")
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -1729,9 +1729,8 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {`
`1729`	`1729`	`withTable(table) {`
`1730`	`1730`	`sql(s"create table $table(col timestamp) using parquet")`
`1731`	`1731`	`sql(s"insert into $table values (now()), (timestamp('1900-01-01')), (null)")`
`1732`		`- // TODO: weekday(col) https://github.com/apache/datafusion-comet/issues/2330`
`1733`	`1732`	`checkSparkAnswerAndOperator(`
`1734`		`- "SELECT col, year(col), month(col), day(col)," +`
	`1733`	`+ "SELECT col, year(col), month(col), day(col), weekday(col), " +`
`1735`	`1734`	`s" dayofweek(col), dayofyear(col), weekofyear(col), quarter(col) FROM $table")`
`1736`	`1735`	`}`
`1737`	`1736`	`}`