PHILO-HE commented on code in PR #10357:
URL:
https://github.com/apache/incubator-gluten/pull/10357#discussion_r2276920183
##########
backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxRuleApi.scala:
##########
@@ -75,8 +75,8 @@ object VeloxRuleApi {
// Legacy: Pre-transform rules.
injector.injectPreTransform(_ => RemoveTransitions)
injector.injectPreTransform(_ => PushDownInputFileExpression.PreOffload)
- injector.injectPreTransform(c => FallbackOnANSIMode.apply(c.session))
injector.injectPreTransform(c => FallbackMultiCodegens.apply(c.session))
+ injector.injectPreTransform(c => FallbackOnANSIMode.apply(c.session))
Review Comment:
Is this an intentional change?
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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") {
Review Comment:
"add"
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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()
+ }
Review Comment:
this test can be moved into the above add test.
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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") {
Review Comment:
"subtract"
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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()
+ }
+ }
+
+ testWithMinSparkVersion("arithmetic division by zero exception with ansi
mode", "3.4") {
+ intercept[SparkException] {
+ sql("SELECT 1 / 0").collect()
+ }
Review Comment:
Maybe, this can also be moved to the above divide test with
`matchSparkVersion` check to limit which Spark versions to run this test body.
```
if (matchSparkVersion(xxx, xxx)) {
intercept[SparkException] {
sql("SELECT 1 / 0").collect()
}
}
```
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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") {
Review Comment:
"multiply"
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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") {
Review Comment:
"divide"
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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()
+ }
+ }
+
+ testWithMinSparkVersion("arithmetic division by zero exception with ansi
mode", "3.4") {
+ intercept[SparkException] {
+ sql("SELECT 1 / 0").collect()
+ }
+ }
+
+ testWithMaxSparkVersion("arithmetic division by zero no exception with ansi
mode", "3.3") {
+ // Spark 3.2 and 3.3 don't throw exception for division by zero in ANSI
mode
+ sql("SELECT 1 / 0").collect()
+ }
Review Comment:
ditto
##########
backends-velox/src/test/scala/org/apache/gluten/functions/ArithmeticAnsiValidateSuite.scala:
##########
@@ -0,0 +1,82 @@
+/*
+ * 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.SparkException
+import org.apache.spark.sql.internal.SQLConf
+
+class ArithmeticAnsiValidateSuite extends FunctionsValidateSuite {
+
+ 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()
+ }
+ }
+
+ testWithMinSparkVersion("arithmetic division by zero exception with ansi
mode", "3.4") {
+ intercept[SparkException] {
+ sql("SELECT 1 / 0").collect()
+ }
+ }
+
+ testWithMaxSparkVersion("arithmetic division by zero no exception with ansi
mode", "3.3") {
+ // Spark 3.2 and 3.3 don't throw exception for division by zero in ANSI
mode
+ sql("SELECT 1 / 0").collect()
+ }
+
+ test("arithmetic multiplication overflow exception with ansi mode") {
+ intercept[ArithmeticException] {
+ sql("SELECT 2147483647 * 2").collect()
+ }
Review Comment:
ditto
--
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]
