Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLFunctionSuite]
enableSuite[GlutenSQLJsonProtocolSuite]
enableSuite[GlutenShufflePartitionsUtilSuite]
// TODO: 4.x enableSuite[GlutenSimpleSQLViewSuite] // 1 failure
enableSuite[GlutenSimpleSQLViewSuite]
enableSuite[GlutenSparkPlanSuite]
.exclude("SPARK-37779: ColumnarToRowExec should be canonicalizable after being (de)serialized")
enableSuite[GlutenSparkPlannerSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,25 @@
*/
package org.apache.spark.sql.execution

import org.apache.spark.SparkThrowable
import org.apache.spark.sql.GlutenSQLTestsTrait

class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with GlutenSQLTestsTrait {}
class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with GlutenSQLTestsTrait {

// Velox returns a native FILE_NOT_FOUND error instead of Spark's structured error condition.
override def checkErrorMatchPVals(
exception: SparkThrowable,
condition: String,
parameters: Map[String, String]): Unit = {
if (condition == "FAILED_READ_FILE.FILE_NOT_EXIST") {
val messages = Iterator
.iterate[Throwable](exception.asInstanceOf[Throwable])(_.getCause)
.takeWhile(_ != null)
.flatMap(error => Option(error.getMessage))

assert(messages.exists(_.contains("FILE_NOT_FOUND")))
} else {
super.checkErrorMatchPVals(exception, condition, parameters)
}
Comment on lines +29 to +38
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLFunctionSuite]
enableSuite[GlutenSQLJsonProtocolSuite]
enableSuite[GlutenShufflePartitionsUtilSuite]
// TODO: 4.x enableSuite[GlutenSimpleSQLViewSuite] // 1 failure remains after GLUTEN-11917 fix
enableSuite[GlutenSimpleSQLViewSuite]
enableSuite[GlutenSparkPlanSuite]
.exclude("SPARK-37779: ColumnarToRowExec should be canonicalizable after being (de)serialized")
enableSuite[GlutenSparkPlannerSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,25 @@
*/
package org.apache.spark.sql.execution

import org.apache.spark.SparkThrowable
import org.apache.spark.sql.GlutenSQLTestsTrait

class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with GlutenSQLTestsTrait {}
class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with GlutenSQLTestsTrait {

// Velox returns a native FILE_NOT_FOUND error instead of Spark's structured error condition.
override def checkErrorMatchPVals(
exception: SparkThrowable,
condition: String,
parameters: Map[String, String]): Unit = {
if (condition == "FAILED_READ_FILE.FILE_NOT_EXIST") {
val messages = Iterator
.iterate[Throwable](exception.asInstanceOf[Throwable])(_.getCause)
.takeWhile(_ != null)
.flatMap(error => Option(error.getMessage))

assert(messages.exists(_.contains("FILE_NOT_FOUND")))
} else {
super.checkErrorMatchPVals(exception, condition, parameters)
}
Comment on lines +29 to +38
}
}
Loading