PHILO-HE commented on code in PR #10357: URL: https://github.com/apache/incubator-gluten/pull/10357#discussion_r2265960169
########## gluten-ut/spark33/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala: ########## @@ -0,0 +1,90 @@ +/* + * 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.gluten.functions + +import org.apache.gluten.config.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer + +import org.apache.spark.SparkConf +import org.apache.spark.sql.GlutenTestsTrait +import org.apache.spark.sql.internal.SQLConf + +class ArithmeticAnsiValidateSuiteRasOff extends ArithmeticAnsiValidateSuite { + override protected def sparkConf: SparkConf = { + super.sparkConf + .set(GlutenConfig.RAS_ENABLED.key, "false") + } +} + +class ArithmeticAnsiValidateSuiteRasOn extends ArithmeticAnsiValidateSuite { + override protected def sparkConf: SparkConf = { + super.sparkConf + .set(GlutenConfig.RAS_ENABLED.key, "true") + } +} + +abstract class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite with GlutenTestsTrait { + + disableFallbackCheck + + override protected def sparkConf: SparkConf = { + super.sparkConf + .set(GlutenConfig.GLUTEN_ANSI_FALLBACK_ENABLED.key, "false") + .set(SQLConf.ANSI_ENABLED.key, "true") + } + + test("arithmetic addition with ansi mode") { + runQueryAndCompare("SELECT int_field1 + 100 FROM datatab WHERE int_field1 IS NOT NULL") { + checkGlutenOperatorMatch[ProjectExecTransformer] + } + } + + test("arithmetic subtraction with ansi mode") { + runQueryAndCompare("SELECT int_field1 - 50 FROM datatab WHERE int_field1 IS NOT NULL") { + checkGlutenOperatorMatch[ProjectExecTransformer] + } + } + + test("arithmetic multiplication with ansi mode") { + runQueryAndCompare("SELECT int_field1 * 2 FROM datatab WHERE int_field1 IS NOT NULL") { + checkGlutenOperatorMatch[ProjectExecTransformer] + } + } + + test("arithmetic division with ansi mode") { + runQueryAndCompare("SELECT int_field1 / 2 FROM datatab WHERE int_field1 IS NOT NULL") { + checkGlutenOperatorMatch[ProjectExecTransformer] + } + } + + test("arithmetic addition overflow exception with ansi mode") { + intercept[ArithmeticException] { + sql("SELECT 2147483647 + 1").collect() + } + } + + test("arithmetic division by zero exception with ansi mode") { + // Spark 3.3 doesn't throw exception for division by zero + sql("SELECT 1 / 0").collect() + } + + test("arithmetic multiplication overflow exception with ansi mode") { + intercept[ArithmeticException] { + sql("SELECT 2147483647 * 2").collect() + } + } +} Review Comment: Add an empty line at the end. Ditto for other files. ########## gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala: ########## @@ -780,6 +782,14 @@ object GlutenConfig { .booleanConf .createWithDefault(true) + val GLUTEN_ANSI_FALLBACK_ENABLED = + buildConf("spark.gluten.sql.enable.ansi.fallback") + .doc( + "When true (default), Gluten will fallback to Spark when ANSI mode is enabled. " + Review Comment: fall back ########## gluten-ut/spark32/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala: ########## @@ -0,0 +1,90 @@ +/* + * 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.gluten.functions + +import org.apache.gluten.config.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer + +import org.apache.spark.SparkConf +import org.apache.spark.sql.GlutenTestsTrait +import org.apache.spark.sql.internal.SQLConf + +class ArithmeticAnsiValidateSuiteRasOff extends ArithmeticAnsiValidateSuite { + override protected def sparkConf: SparkConf = { + super.sparkConf + .set(GlutenConfig.RAS_ENABLED.key, "false") + } +} + +class ArithmeticAnsiValidateSuiteRasOn extends ArithmeticAnsiValidateSuite { Review Comment: Seems no need to test RAS on/off for the new tests. Just use the default RAS setting. ########## gluten-ut/spark32/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala: ########## @@ -0,0 +1,90 @@ +/* + * 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.gluten.functions + +import org.apache.gluten.config.GlutenConfig +import org.apache.gluten.execution.ProjectExecTransformer + +import org.apache.spark.SparkConf +import org.apache.spark.sql.GlutenTestsTrait +import org.apache.spark.sql.internal.SQLConf + +class ArithmeticAnsiValidateSuiteRasOff extends ArithmeticAnsiValidateSuite { + override protected def sparkConf: SparkConf = { + super.sparkConf + .set(GlutenConfig.RAS_ENABLED.key, "false") + } +} + +class ArithmeticAnsiValidateSuiteRasOn extends ArithmeticAnsiValidateSuite { + override protected def sparkConf: SparkConf = { + super.sparkConf + .set(GlutenConfig.RAS_ENABLED.key, "true") + } +} + +abstract class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite with GlutenTestsTrait { Review Comment: It may be better to move the tests to the package below to reduce code duplication: backends-velox/src/test/scala/org/apache/gluten/functions/ ########## gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala: ########## @@ -780,6 +782,14 @@ object GlutenConfig { .booleanConf .createWithDefault(true) + val GLUTEN_ANSI_FALLBACK_ENABLED = + buildConf("spark.gluten.sql.enable.ansi.fallback") Review Comment: Follow the name pattern. Suggestion: `spark.gluten.sql.ansiFallback.enabled` ########## gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala: ########## @@ -780,6 +782,14 @@ object GlutenConfig { .booleanConf .createWithDefault(true) + val GLUTEN_ANSI_FALLBACK_ENABLED = + buildConf("spark.gluten.sql.enable.ansi.fallback") + .doc( + "When true (default), Gluten will fallback to Spark when ANSI mode is enabled. " + + "When false, Gluten will attempt to execute in ANSI mode") Review Comment: Add period at the end of sentence. -- 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]
