parthchandra commented on code in PR #509:
URL: https://github.com/apache/datafusion-comet/pull/509#discussion_r1626789495
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -578,6 +576,14 @@ object QueryPlanSerde extends Logging with
ShimQueryPlanSerde with CometExprShim
}
}
+ def evalModeToProto(evalMode: CometEvalMode.Value): ExprOuterClass.EvalMode
= {
+ evalMode match {
+ case CometEvalMode.LEGACY => ExprOuterClass.EvalMode.LEGACY
+ case CometEvalMode.TRY => ExprOuterClass.EvalMode.TRY
+ case CometEvalMode.ANSI => ExprOuterClass.EvalMode.ANSI
Review Comment:
Add a 'catch all' case for when someone tries to change CometEvalMode and
things don't work as planned?
##########
spark/src/main/scala/org/apache/comet/expressions/CometEvalMode.scala:
##########
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.comet.expressions
+
+import org.apache.spark.sql.internal.SQLConf
+
+/**
+ * We cannot reference Spark's EvalMode directly because the package is
different between Spark
+ * versions, so we copy it here.
+ *
+ * Expression evaluation modes.
+ * - LEGACY: the default evaluation mode, which is compliant to Hive SQL.
+ * - ANSI: a evaluation mode which is compliant to ANSI SQL standard.
+ * - TRY: a evaluation mode for `try_*` functions. It is identical to ANSI
evaluation mode
Review Comment:
Is `conf.ansiEnabled` ignored for `try_*` ? Maybe the comment can clarify.
##########
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala:
##########
@@ -701,17 +698,38 @@ object QueryPlanSerde extends Logging with
ShimQueryPlanSerde with CometExprShim
case UnaryExpression(child) if expr.prettyName == "trycast" =>
val timeZoneId = SQLConf.get.sessionLocalTimeZone
- handleCast(child, inputs, expr.dataType, Some(timeZoneId), "TRY")
+ handleCast(child, inputs, expr.dataType, Some(timeZoneId),
CometEvalMode.TRY)
- case Cast(child, dt, timeZoneId, evalMode) =>
- val evalModeStr = if (evalMode.isInstanceOf[Boolean]) {
- // Spark 3.2 & 3.3 has ansiEnabled boolean
- if (evalMode.asInstanceOf[Boolean]) "ANSI" else "LEGACY"
- } else {
- // Spark 3.4+ has EvalMode enum with values LEGACY, ANSI, and TRY
- evalMode.toString
- }
- handleCast(child, inputs, dt, timeZoneId, evalModeStr)
+ case c @ Cast(child, dt, timeZoneId, _) =>
+ handleCast(child, inputs, dt, timeZoneId, evalMode(c))
+
+ case expr: Add if evalMode(expr) == CometEvalMode.ANSI &&
!cometAnsiEnabled =>
Review Comment:
Should we move these to be next to the corresponding supported
implementations so new developers can discover this case easily?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
