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 @@ -45,6 +45,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class ClickHouseTestSettings extends BackendTestSettings {
import SuiteSettings._

// disable tests that will break the whole UT
override def shouldRun(suiteName: String, testName: String): Boolean = {
Expand Down Expand Up @@ -1881,6 +1882,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeGlutenTest("fallbackSummary with cache")
.excludeGlutenTest("fallbackSummary with cached data and shuffle")
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenHiveSQLQueryCHSuite]
enableSuite[GlutenPercentileSuite]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class VeloxTestSettings extends BackendTestSettings {
import SuiteSettings._
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenBloomFilterAggregateQuerySuite]
enableSuite[GlutenBloomFilterAggregateQuerySuiteCGOff]
Expand Down Expand Up @@ -910,6 +911,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenImplicitsTest]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenSQLCollectLimitExecSuite]
enableSuite[GlutenBatchEvalPythonExecSuite]
// Replaced with other tests that check for native operations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class ClickHouseTestSettings extends BackendTestSettings {
import SuiteSettings._

// disable tests that will break the whole UT
override def shouldRun(suiteName: String, testName: String): Boolean = {
Expand Down Expand Up @@ -1740,6 +1741,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
"SELECT structFieldSimple.key, arrayFieldSimple[1] FROM tableWithSchema a where int_Field=1")
.exclude("SELECT structFieldComplex.Value.`value_(2)` FROM tableWithSchema")
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenHiveSQLQueryCHSuite]
enableSuite[GlutenPercentileSuite]
enableSuite[GlutenTryCastSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import org.apache.spark.sql.sources.{GlutenBucketedReadWithoutHiveSupportSuite,
// scalastyle:off line.size.limit

class VeloxTestSettings extends BackendTestSettings {
import SuiteSettings._
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenBloomFilterAggregateQuerySuite]
enableSuite[GlutenDataSourceV2DataFrameSessionCatalogSuite]
Expand Down Expand Up @@ -955,6 +956,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class ClickHouseTestSettings extends BackendTestSettings {
import SuiteSettings._

enableSuite[ClickHouseAdaptiveQueryExecSuite]
.includeAllGlutenTests()
Expand Down Expand Up @@ -2100,6 +2101,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false, sortOrder=List('a DESC NULLS LAST)")
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false, sortOrder=List('a DESC NULLS FIRST)")
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenStatisticsCollectionSuite]
// The output byte size of Velox is different
.includeCH("SPARK-33687: analyze all tables in a specific database")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class VeloxTestSettings extends BackendTestSettings {
import SuiteSettings._
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenBloomFilterAggregateQuerySuite]
enableSuite[GlutenBloomFilterAggregateQuerySuiteCGOff]
Expand Down Expand Up @@ -913,6 +914,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class ClickHouseTestSettings extends BackendTestSettings {
import SuiteSettings._

enableSuite[ClickHouseAdaptiveQueryExecSuite]
.includeAllGlutenTests()
Expand Down Expand Up @@ -2073,6 +2074,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false, sortOrder=List('a DESC NULLS LAST)")
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false, sortOrder=List('a DESC NULLS FIRST)")
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenStatisticsCollectionSuite]
// The output byte size of Velox is different
.includeCH("SPARK-33687: analyze all tables in a specific database")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import org.apache.spark.sql.streaming._
// scalastyle:off line.size.limit

class VeloxTestSettings extends BackendTestSettings {
import SuiteSettings._
private val ansiNoFallback: Boolean =
sys.props.get(GlutenConfig.GLUTEN_ANSI_FALLBACK_ENABLED.key).contains("false")
enableSuite[GlutenStringFunctionsSuite]
Expand Down Expand Up @@ -1148,7 +1149,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLQuerySuiteAE]
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
// TODO: 4.x enableSuite[GlutenSparkSessionExtensionSuite] // 1 failure
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ package org.apache.spark.sql

import org.apache.gluten.config.GlutenConfig

class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite with GlutenTestsTrait {
class GlutenSparkSessionExtensionSuite
extends SparkSessionExtensionSuite
with GlutenTestsCommonTrait {

testGluten("customColumnarOp") {
val extensions = DummyFilterColmnarHelper.create {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import org.apache.spark.sql.sources._
// scalastyle:off line.size.limit

class ClickHouseTestSettings extends BackendTestSettings {
import SuiteSettings._

enableSuite[ClickHouseAdaptiveQueryExecSuite]
.includeAllGlutenTests()
Expand Down Expand Up @@ -2073,6 +2074,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false, sortOrder=List('a DESC NULLS LAST)")
.excludeCH("sorting on YearMonthIntervalType(0,1) with nullable=false, sortOrder=List('a DESC NULLS FIRST)")
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
Comment on lines 2076 to +2077

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

enableSuite[GlutenStatisticsCollectionSuite]
// The output byte size of Velox is different
.includeCH("SPARK-33687: analyze all tables in a specific database")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import org.apache.spark.sql.streaming._
// scalastyle:off line.size.limit

class VeloxTestSettings extends BackendTestSettings {
import SuiteSettings._
private val ansiNoFallback: Boolean =
sys.props.get(GlutenConfig.GLUTEN_ANSI_FALLBACK_ENABLED.key).contains("false")
enableSuite[GlutenStringFunctionsSuite]
Expand Down Expand Up @@ -1151,7 +1152,8 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLQuerySuiteAE]
enableSuite[GlutenWindowQuerySuite]
enableSuite[GlutenCollapseProjectExecTransformerSuite]
// TODO: 4.x enableSuite[GlutenSparkSessionExtensionSuite] // 1 failure
enableSuite[GlutenSparkSessionExtensionSuite]
.includeGlutenTest("customColumnarOp")
enableSuite[GlutenGroupBasedDeleteFromTableSuite]
enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
enableSuite[GlutenDataFrameToSchemaSuite]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package org.apache.spark.sql

import org.apache.gluten.config.GlutenConfig

import org.apache.spark.sql.shim.GlutenTestsTrait

class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite with GlutenTestsTrait {
class GlutenSparkSessionExtensionSuite
extends SparkSessionExtensionSuite
with GlutenTestsCommonTrait {

testGluten("customColumnarOp") {
val extensions = DummyFilterColmnarHelper.create {
Expand Down
Loading