You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by ch...@apache.org on 2026/02/02 09:26:01 UTC
(incubator-gluten) branch main updated: [UT] Add missing Gluten test suites for Spark 4.0 and 4.1 (#11512)
This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 4e3df671d2 [UT] Add missing Gluten test suites for Spark 4.0 and 4.1 (#11512)
4e3df671d2 is described below
commit 4e3df671d2c2b8a334df499d2d4ac5eb4f447361
Author: Chang Chen <ba...@gmail.com>
AuthorDate: Mon Feb 2 17:25:55 2026 +0800
[UT] Add missing Gluten test suites for Spark 4.0 and 4.1 (#11512)
Adding comprehensive test suite coverage for Gluten by creating wrapper test suites that extend Spark's original test suites. These newly introduced suites make up for the corresponding test coverage that has been missing in Gluten since Spark 3.3.
---------
Co-authored-by: Claude Sonnet 4.5 <no...@anthropic.com>
---
gluten-ut/spark40/pom.xml | 36 ++-
.../gluten/utils/velox/VeloxTestSettings.scala | 292 +++++++++++++++++++--
.../spark/sql/GlutenAggregateHashMapSuite.scala | 27 +-
.../apache/spark/sql/GlutenCacheManagerSuite.scala | 19 +-
.../spark/sql/GlutenDataFrameShowSuite.scala | 19 +-
.../spark/sql/GlutenDataFrameSubquerySuite.scala | 19 +-
.../GlutenDataFrameTableValuedFunctionsSuite.scala | 21 +-
.../spark/sql/GlutenDataFrameTransposeSuite.scala | 19 +-
.../spark/sql/GlutenDefaultANSIValueSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenExplainSuite.scala | 19 +-
.../spark/sql/GlutenICUCollationsMapSuite.scala | 19 +-
...GlutenInlineTableParsingImprovementsSuite.scala | 21 +-
.../org/apache/spark/sql/GlutenJoinHintSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenLogQuerySuite.scala | 19 +-
.../spark/sql/GlutenPercentileQuerySuite.scala | 19 +-
.../spark/sql/GlutenPlanStabilitySuite.scala | 43 +++
.../spark/sql/GlutenRandomDataGeneratorSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenRowJsonSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenRowSuite.scala | 19 +-
.../spark/sql/GlutenRuntimeConfigSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenSSBQuerySuite.scala | 19 +-
.../apache/spark/sql/GlutenSessionStateSuite.scala | 19 +-
.../apache/spark/sql/GlutenSetCommandSuite.scala | 19 +-
.../spark/sql/GlutenSparkSessionBuilderSuite.scala | 19 +-
...parkSessionJobTaggingAndCancellationSuite.scala | 21 +-
.../sql/GlutenTPCDSCollationQueryTestSuite.scala | 21 +-
.../apache/spark/sql/GlutenTPCDSQuerySuite.scala | 21 +-
.../spark/sql/GlutenTPCDSQueryTestSuite.scala | 19 +-
.../apache/spark/sql/GlutenTPCHQuerySuite.scala | 19 +-
.../org/apache/spark/sql/GlutenUDFSuite.scala | 19 +-
.../spark/sql/GlutenUDTRegistrationSuite.scala | 19 +-
.../apache/spark/sql/GlutenUnsafeRowSuite.scala | 19 +-
.../spark/sql/GlutenUserDefinedTypeSuite.scala | 19 +-
.../spark/sql/GlutenVariantEndToEndSuite.scala | 19 +-
.../spark/sql/GlutenVariantShreddingSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenVariantSuite.scala | 19 +-
.../sql/GlutenVariantWriteShreddingSuite.scala | 21 +-
.../apache/spark/sql/GlutenXmlFunctionsSuite.scala | 19 +-
.../GlutenAttributeResolutionSuite.scala | 19 +-
.../expressions/GlutenAttributeSetSuite.scala | 19 +-
.../GlutenBitmapExpressionUtilsSuite.scala | 21 +-
.../GlutenCallMethodViaReflectionSuite.scala | 21 +-
.../expressions/GlutenCanonicalizeSuite.scala | 19 +-
.../expressions/GlutenCastWithAnsiOnSuite.scala | 19 +-
.../expressions/GlutenCodeGenerationSuite.scala | 19 +-
...CodeGeneratorWithInterpretedFallbackSuite.scala | 21 +-
.../GlutenCollationExpressionSuite.scala | 19 +-
.../GlutenCollationRegexpExpressionsSuite.scala | 21 +-
.../expressions/GlutenCsvExpressionsSuite.scala | 19 +-
.../GlutenDynamicPruningSubquerySuite.scala | 21 +-
.../catalyst/expressions/GlutenExprIdSuite.scala | 19 +-
.../GlutenExpressionEvalHelperSuite.scala | 21 +-
.../GlutenExpressionImplUtilsSuite.scala | 19 +-
.../GlutenExpressionSQLBuilderSuite.scala | 21 +-
.../expressions/GlutenExpressionSetSuite.scala | 19 +-
...utenExtractPredicatesWithinOutputSetSuite.scala | 21 +-
.../sql/catalyst/expressions/GlutenHexSuite.scala | 19 +-
.../expressions/GlutenMutableProjectionSuite.scala | 19 +-
.../expressions/GlutenNamedExpressionSuite.scala | 19 +-
.../expressions/GlutenObjectExpressionsSuite.scala | 19 +-
.../catalyst/expressions/GlutenOrderingSuite.scala | 19 +-
.../catalyst/expressions/GlutenScalaUDFSuite.scala | 19 +-
.../expressions/GlutenSchemaPruningSuite.scala | 19 +-
.../expressions/GlutenSelectedFieldSuite.scala | 19 +-
.../GlutenSubexpressionEliminationSuite.scala | 21 +-
.../expressions/GlutenTimeWindowSuite.scala | 19 +-
.../expressions/GlutenToPrettyStringSuite.scala | 19 +-
.../GlutenUnsafeRowConverterSuite.scala | 19 +-
.../GlutenUnwrapUDTExpressionSuite.scala | 19 +-
.../expressions/GlutenV2ExpressionUtilsSuite.scala | 19 +-
.../GlutenValidateExternalTypeSuite.scala | 19 +-
.../expressions/GlutenXmlExpressionsSuite.scala | 19 +-
.../aggregate/GlutenAggregateExpressionSuite.scala | 19 +-
...lutenApproxCountDistinctForIntervalsSuite.scala | 21 +-
.../GlutenApproximatePercentileSuite.scala | 21 +-
.../aggregate/GlutenCentralMomentAggSuite.scala | 20 +-
.../aggregate/GlutenCountMinSketchAggSuite.scala | 19 +-
.../aggregate/GlutenCovarianceAggSuite.scala | 20 +-
.../GlutenDatasketchesHllSketchSuite.scala | 21 +-
.../aggregate/GlutenFirstLastTestSuite.scala | 19 +-
.../aggregate/GlutenHistogramNumericSuite.scala | 19 +-
.../aggregate/GlutenHyperLogLogPlusPlusSuite.scala | 19 +-
.../aggregate/GlutenProductAggSuite.scala | 19 +-
.../connector/GlutenDataSourceV2MetricsSuite.scala | 19 +-
.../connector/GlutenDataSourceV2OptionSuite.scala | 19 +-
.../connector/GlutenDataSourceV2UtilsSuite.scala | 19 +-
.../GlutenGroupBasedUpdateTableSuite.scala | 21 +-
.../connector/GlutenMergeIntoDataFrameSuite.scala | 19 +-
.../spark/sql/connector/GlutenProcedureSuite.scala | 19 +-
.../connector/GlutenPushablePredicateSuite.scala | 19 +-
.../sql/connector/GlutenV1ReadFallbackSuite.scala | 25 +-
.../sql/connector/GlutenV1WriteFallbackSuite.scala | 23 +-
.../GlutenV2CommandsCaseSensitivitySuite.scala | 21 +-
.../spark/sql/errors/GlutenQueryContextSuite.scala | 19 +-
.../GlutenQueryExecutionAnsiErrorsSuite.scala | 21 +-
.../GlutenAggregatingAccumulatorSuite.scala | 21 +-
.../execution/GlutenCoGroupedIteratorSuite.scala | 19 +-
.../sql/execution/GlutenColumnarRulesSuite.scala | 19 +-
.../GlutenDataSourceScanExecRedactionSuite.scala | 25 +-
.../GlutenExecuteImmediateEndToEndSuite.scala | 21 +-
...utenExternalAppendOnlyUnsafeRowArraySuite.scala | 21 +-
.../sql/execution/GlutenGlobalTempViewSuite.scala | 19 +-
.../sql/execution/GlutenGroupedIteratorSuite.scala | 19 +-
.../sql/execution/GlutenHiveResultSuite.scala | 19 +-
.../GlutenInsertSortForLimitAndOffsetSuite.scala | 21 +-
.../GlutenLogicalPlanTagInSparkPlanSuite.scala | 21 +-
.../GlutenOptimizeMetadataOnlyQuerySuite.scala | 21 +-
.../spark/sql/execution/GlutenPlannerSuite.scala | 19 +-
...utenProjectedOrderingAndPartitioningSuite.scala | 21 +-
.../GlutenQueryPlanningTrackerEndToEndSuite.scala | 21 +-
.../GlutenRemoveRedundantProjectsSuite.scala | 21 +-
.../GlutenRemoveRedundantSortsSuite.scala | 21 +-
.../GlutenRowToColumnConverterSuite.scala | 21 +-
.../sql/execution/GlutenSQLExecutionSuite.scala | 19 +-
.../sql/execution/GlutenSQLFunctionSuite.scala | 19 +-
.../sql/execution/GlutenSQLJsonProtocolSuite.scala | 19 +-
.../spark/sql/execution/GlutenSQLViewSuite.scala | 19 +-
.../sql/execution/GlutenSQLViewTestSuite.scala | 23 +-
.../GlutenShufflePartitionsUtilSuite.scala | 21 +-
.../spark/sql/execution/GlutenSparkPlanSuite.scala | 19 +-
.../sql/execution/GlutenSparkPlannerSuite.scala | 19 +-
.../GlutenSparkScriptTransformationSuite.scala | 21 +-
.../sql/execution/GlutenSparkSqlParserSuite.scala | 19 +-
...GlutenUnsafeFixedWidthAggregationMapSuite.scala | 21 +-
.../GlutenUnsafeKVExternalSorterSuite.scala | 21 +-
.../execution/GlutenUnsafeRowSerializerSuite.scala | 19 +-
.../GlutenWholeStageCodegenSparkSubmitSuite.scala | 21 +-
.../execution/GlutenWholeStageCodegenSuite.scala | 19 +-
...lutenBasicWriteJobStatsTrackerMetricSuite.scala | 21 +-
.../GlutenBasicWriteTaskStatsTrackerSuite.scala | 21 +-
.../GlutenCustomWriteTaskStatsTrackerSuite.scala | 21 +-
.../datasources/GlutenDataSourceManagerSuite.scala | 19 +-
.../GlutenDataSourceResolverSuite.scala | 19 +-
.../datasources/GlutenFileResolverSuite.scala | 19 +-
.../GlutenInMemoryTableMetricSuite.scala | 19 +-
.../GlutenPushVariantIntoScanSuite.scala | 19 +-
.../GlutenRowDataSourceStrategySuite.scala | 21 +-
.../GlutenSaveIntoDataSourceCommandSuite.scala | 21 +-
.../csv/GlutenCSVParsingOptionsSuite.scala | 19 +-
.../json/GlutenJsonParsingOptionsSuite.scala | 19 +-
.../datasources/orc/GlutenOrcEncryptionSuite.scala | 19 +-
.../GlutenParquetAvroCompatibilitySuite.scala | 21 +-
.../parquet/GlutenParquetCommitterSuite.scala | 19 +-
.../parquet/GlutenParquetFieldIdSchemaSuite.scala | 21 +-
.../parquet/GlutenParquetFilterSuite.scala | 9 +-
.../parquet/GlutenParquetTypeWideningSuite.scala | 19 +-
.../GlutenParquetVariantShreddingSuite.scala | 21 +-
.../text/GlutenWholeTextFileSuite.scala | 21 +-
.../v2/GlutenFileWriterFactorySuite.scala | 19 +-
.../v2/GlutenV2SessionCatalogSuite.scala | 25 +-
.../joins/GlutenHashedRelationSuite.scala | 19 +-
.../execution/joins/GlutenSingleJoinSuite.scala | 19 +-
.../metric/GlutenCustomMetricsSuite.scala | 19 +-
.../python/GlutenPythonDataSourceSuite.scala | 19 +-
.../execution/python/GlutenPythonUDFSuite.scala | 19 +-
.../execution/python/GlutenPythonUDTFSuite.scala | 21 +-
.../sql/execution/python/GlutenRowQueueSuite.scala | 19 +-
.../GlutenBucketedReadWithHiveSupportSuite.scala | 21 +-
.../GlutenBucketedWriteWithHiveSupportSuite.scala | 21 +-
.../GlutenCommitFailureTestRelationSuite.scala | 21 +-
.../sources/GlutenDataSourceAnalysisSuite.scala | 19 +-
...necessaryBucketedScanWithHiveSupportSuite.scala | 21 +-
.../sources/GlutenJsonHadoopFsRelationSuite.scala | 21 +-
.../GlutenParquetHadoopFsRelationSuite.scala | 21 +-
.../GlutenSimpleTextHadoopFsRelationSuite.scala | 21 +-
.../GlutenAcceptsLatestSeenOffsetSuite.scala | 21 +-
.../spark/sql/streaming/GlutenCommitLogSuite.scala | 19 +-
.../streaming/GlutenEventTimeWatermarkSuite.scala | 19 +-
.../sql/streaming/GlutenFileStreamSinkSuite.scala | 21 +-
.../streaming/GlutenFileStreamSourceSuite.scala | 23 +-
.../streaming/GlutenFileStreamStressSuite.scala | 19 +-
...pGroupsInPandasWithStateDistributionSuite.scala | 21 +-
...GlutenFlatMapGroupsInPandasWithStateSuite.scala | 21 +-
...enFlatMapGroupsWithStateDistributionSuite.scala | 21 +-
.../GlutenFlatMapGroupsWithStateSuite.scala | 25 +-
...atMapGroupsWithStateWithInitialStateSuite.scala | 21 +-
.../sql/streaming/GlutenGroupStateSuite.scala | 19 +-
.../streaming/GlutenMemorySourceStressSuite.scala | 19 +-
.../GlutenMultiStatefulOperatorsSuite.scala | 21 +-
.../spark/sql/streaming/GlutenOffsetSuite.scala | 19 +-
.../streaming/GlutenReportSinkMetricsSuite.scala | 19 +-
.../spark/sql/streaming/GlutenStreamSuite.scala | 19 +-
...utenStreamingAggregationDistributionSuite.scala | 21 +-
.../GlutenStreamingAggregationSuite.scala | 25 +-
...enStreamingDeduplicationDistributionSuite.scala | 21 +-
.../GlutenStreamingDeduplicationSuite.scala | 25 +-
...treamingDeduplicationWithinWatermarkSuite.scala | 21 +-
.../sql/streaming/GlutenStreamingJoinSuite.scala | 29 +-
...tenStreamingQueryHashPartitionVerifySuite.scala | 21 +-
.../GlutenStreamingQueryListenerSuite.scala | 21 +-
.../GlutenStreamingQueryListenersConfSuite.scala | 21 +-
.../GlutenStreamingQueryManagerSuite.scala | 21 +-
...treamingQueryOptimizationCorrectnessSuite.scala | 21 +-
...lutenStreamingQueryStatusAndProgressSuite.scala | 21 +-
.../streaming/GlutenStreamingSelfUnionSuite.scala | 19 +-
...enStreamingSessionWindowDistributionSuite.scala | 21 +-
.../GlutenStreamingSessionWindowSuite.scala | 21 +-
...reamingStateStoreFormatCompatibilitySuite.scala | 21 +-
...utenStreamingSymmetricHashJoinHelperSuite.scala | 21 +-
.../GlutenTransformWithListStateSuite.scala | 21 +-
.../GlutenTransformWithListStateTTLSuite.scala | 21 +-
.../GlutenTransformWithMapStateSuite.scala | 21 +-
.../GlutenTransformWithMapStateTTLSuite.scala | 21 +-
.../GlutenTransformWithStateAvroSuite.scala | 21 +-
.../GlutenTransformWithStateChainingSuite.scala | 21 +-
.../GlutenTransformWithStateClusterSuite.scala | 21 +-
...GlutenTransformWithStateInitialStateSuite.scala | 21 +-
.../streaming/GlutenTransformWithStateSuite.scala | 21 +-
.../GlutenTransformWithStateUnsafeRowSuite.scala | 21 +-
.../GlutenTransformWithValueStateTTLSuite.scala | 21 +-
.../streaming/GlutenTriggerAvailableNowSuite.scala | 19 +-
gluten-ut/spark41/pom.xml | 28 +-
.../gluten/utils/velox/VeloxTestSettings.scala | 287 ++++++++++++++++++--
.../spark/sql/GlutenAggregateHashMapSuite.scala | 27 +-
.../apache/spark/sql/GlutenCacheManagerSuite.scala | 19 +-
.../spark/sql/GlutenDataFrameShowSuite.scala | 19 +-
.../spark/sql/GlutenDataFrameSubquerySuite.scala | 19 +-
.../GlutenDataFrameTableValuedFunctionsSuite.scala | 21 +-
.../spark/sql/GlutenDataFrameTransposeSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenExplainSuite.scala | 19 +-
.../spark/sql/GlutenICUCollationsMapSuite.scala | 19 +-
...GlutenInlineTableParsingImprovementsSuite.scala | 21 +-
.../org/apache/spark/sql/GlutenJoinHintSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenLogQuerySuite.scala | 19 +-
.../spark/sql/GlutenPercentileQuerySuite.scala | 19 +-
.../spark/sql/GlutenPlanStabilitySuite.scala | 43 +++
.../spark/sql/GlutenRandomDataGeneratorSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenRowJsonSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenRowSuite.scala | 19 +-
.../spark/sql/GlutenRuntimeConfigSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenSSBQuerySuite.scala | 19 +-
.../apache/spark/sql/GlutenSessionStateSuite.scala | 19 +-
.../apache/spark/sql/GlutenSetCommandSuite.scala | 19 +-
.../spark/sql/GlutenSparkSessionBuilderSuite.scala | 19 +-
...parkSessionJobTaggingAndCancellationSuite.scala | 21 +-
.../sql/GlutenTPCDSCollationQueryTestSuite.scala | 21 +-
.../apache/spark/sql/GlutenTPCDSQuerySuite.scala | 21 +-
.../spark/sql/GlutenTPCDSQueryTestSuite.scala | 19 +-
.../apache/spark/sql/GlutenTPCHQuerySuite.scala | 19 +-
.../org/apache/spark/sql/GlutenUDFSuite.scala | 19 +-
.../spark/sql/GlutenUDTRegistrationSuite.scala | 19 +-
.../apache/spark/sql/GlutenUnsafeRowSuite.scala | 19 +-
.../spark/sql/GlutenUserDefinedTypeSuite.scala | 19 +-
.../spark/sql/GlutenVariantEndToEndSuite.scala | 19 +-
.../spark/sql/GlutenVariantShreddingSuite.scala | 19 +-
.../org/apache/spark/sql/GlutenVariantSuite.scala | 19 +-
.../sql/GlutenVariantWriteShreddingSuite.scala | 21 +-
.../apache/spark/sql/GlutenXmlFunctionsSuite.scala | 19 +-
.../GlutenAttributeResolutionSuite.scala | 19 +-
.../expressions/GlutenAttributeSetSuite.scala | 19 +-
.../GlutenBitmapExpressionUtilsSuite.scala | 21 +-
.../GlutenCallMethodViaReflectionSuite.scala | 21 +-
.../expressions/GlutenCanonicalizeSuite.scala | 19 +-
.../expressions/GlutenCastWithAnsiOnSuite.scala | 19 +-
.../expressions/GlutenCodeGenerationSuite.scala | 19 +-
...CodeGeneratorWithInterpretedFallbackSuite.scala | 21 +-
.../GlutenCollationExpressionSuite.scala | 19 +-
.../GlutenCollationRegexpExpressionsSuite.scala | 21 +-
.../expressions/GlutenCsvExpressionsSuite.scala | 19 +-
.../GlutenDynamicPruningSubquerySuite.scala | 21 +-
.../catalyst/expressions/GlutenExprIdSuite.scala | 19 +-
.../GlutenExpressionEvalHelperSuite.scala | 21 +-
.../GlutenExpressionImplUtilsSuite.scala | 19 +-
.../GlutenExpressionSQLBuilderSuite.scala | 21 +-
.../expressions/GlutenExpressionSetSuite.scala | 19 +-
...utenExtractPredicatesWithinOutputSetSuite.scala | 21 +-
.../sql/catalyst/expressions/GlutenHexSuite.scala | 19 +-
.../expressions/GlutenMutableProjectionSuite.scala | 19 +-
.../expressions/GlutenNamedExpressionSuite.scala | 19 +-
.../expressions/GlutenObjectExpressionsSuite.scala | 19 +-
.../catalyst/expressions/GlutenOrderingSuite.scala | 19 +-
.../catalyst/expressions/GlutenScalaUDFSuite.scala | 19 +-
.../expressions/GlutenSchemaPruningSuite.scala | 19 +-
.../expressions/GlutenSelectedFieldSuite.scala | 19 +-
.../GlutenSubexpressionEliminationSuite.scala | 21 +-
.../expressions/GlutenTimeWindowSuite.scala | 19 +-
.../expressions/GlutenToPrettyStringSuite.scala | 19 +-
.../GlutenUnsafeRowConverterSuite.scala | 19 +-
.../GlutenUnwrapUDTExpressionSuite.scala | 19 +-
.../expressions/GlutenV2ExpressionUtilsSuite.scala | 19 +-
.../GlutenValidateExternalTypeSuite.scala | 19 +-
.../expressions/GlutenXmlExpressionsSuite.scala | 19 +-
.../aggregate/GlutenAggregateExpressionSuite.scala | 19 +-
...lutenApproxCountDistinctForIntervalsSuite.scala | 21 +-
.../GlutenApproximatePercentileSuite.scala | 21 +-
.../aggregate/GlutenCentralMomentAggSuite.scala | 20 +-
.../aggregate/GlutenCountMinSketchAggSuite.scala | 19 +-
.../aggregate/GlutenCovarianceAggSuite.scala | 20 +-
.../GlutenDatasketchesHllSketchSuite.scala | 21 +-
.../aggregate/GlutenFirstLastTestSuite.scala | 19 +-
.../aggregate/GlutenHistogramNumericSuite.scala | 19 +-
.../aggregate/GlutenHyperLogLogPlusPlusSuite.scala | 19 +-
.../aggregate/GlutenProductAggSuite.scala | 19 +-
.../connector/GlutenDataSourceV2MetricsSuite.scala | 19 +-
.../connector/GlutenDataSourceV2OptionSuite.scala | 19 +-
.../connector/GlutenDataSourceV2UtilsSuite.scala | 19 +-
.../GlutenGroupBasedUpdateTableSuite.scala | 21 +-
.../connector/GlutenMergeIntoDataFrameSuite.scala | 19 +-
.../spark/sql/connector/GlutenProcedureSuite.scala | 19 +-
.../connector/GlutenPushablePredicateSuite.scala | 19 +-
.../sql/connector/GlutenV1ReadFallbackSuite.scala | 25 +-
.../sql/connector/GlutenV1WriteFallbackSuite.scala | 23 +-
.../GlutenV2CommandsCaseSensitivitySuite.scala | 21 +-
.../spark/sql/errors/GlutenQueryContextSuite.scala | 19 +-
.../GlutenQueryExecutionAnsiErrorsSuite.scala | 21 +-
.../GlutenAggregatingAccumulatorSuite.scala | 21 +-
.../execution/GlutenCoGroupedIteratorSuite.scala | 19 +-
.../sql/execution/GlutenColumnarRulesSuite.scala | 19 +-
.../GlutenDataSourceScanExecRedactionSuite.scala | 25 +-
.../GlutenExecuteImmediateEndToEndSuite.scala | 21 +-
...utenExternalAppendOnlyUnsafeRowArraySuite.scala | 21 +-
.../sql/execution/GlutenGlobalTempViewSuite.scala | 19 +-
.../sql/execution/GlutenGroupedIteratorSuite.scala | 19 +-
.../sql/execution/GlutenHiveResultSuite.scala | 19 +-
.../GlutenInsertSortForLimitAndOffsetSuite.scala | 21 +-
.../GlutenLogicalPlanTagInSparkPlanSuite.scala | 21 +-
.../GlutenOptimizeMetadataOnlyQuerySuite.scala | 21 +-
.../spark/sql/execution/GlutenPlannerSuite.scala | 19 +-
...utenProjectedOrderingAndPartitioningSuite.scala | 21 +-
.../GlutenQueryPlanningTrackerEndToEndSuite.scala | 21 +-
.../GlutenRemoveRedundantProjectsSuite.scala | 21 +-
.../GlutenRemoveRedundantSortsSuite.scala | 21 +-
.../GlutenRowToColumnConverterSuite.scala | 21 +-
.../sql/execution/GlutenSQLExecutionSuite.scala | 19 +-
.../sql/execution/GlutenSQLFunctionSuite.scala | 19 +-
.../sql/execution/GlutenSQLJsonProtocolSuite.scala | 19 +-
.../spark/sql/execution/GlutenSQLViewSuite.scala | 19 +-
.../sql/execution/GlutenSQLViewTestSuite.scala | 23 +-
.../GlutenShufflePartitionsUtilSuite.scala | 21 +-
.../spark/sql/execution/GlutenSparkPlanSuite.scala | 19 +-
.../sql/execution/GlutenSparkPlannerSuite.scala | 19 +-
.../GlutenSparkScriptTransformationSuite.scala | 21 +-
.../sql/execution/GlutenSparkSqlParserSuite.scala | 19 +-
...GlutenUnsafeFixedWidthAggregationMapSuite.scala | 21 +-
.../GlutenUnsafeKVExternalSorterSuite.scala | 21 +-
.../execution/GlutenUnsafeRowSerializerSuite.scala | 19 +-
.../GlutenWholeStageCodegenSparkSubmitSuite.scala | 21 +-
.../execution/GlutenWholeStageCodegenSuite.scala | 19 +-
...lutenBasicWriteJobStatsTrackerMetricSuite.scala | 21 +-
.../GlutenBasicWriteTaskStatsTrackerSuite.scala | 21 +-
.../GlutenCustomWriteTaskStatsTrackerSuite.scala | 21 +-
.../datasources/GlutenDataSourceManagerSuite.scala | 19 +-
.../GlutenDataSourceResolverSuite.scala | 19 +-
.../datasources/GlutenFileResolverSuite.scala | 19 +-
.../GlutenInMemoryTableMetricSuite.scala | 19 +-
.../GlutenPushVariantIntoScanSuite.scala | 19 +-
.../GlutenRowDataSourceStrategySuite.scala | 21 +-
.../GlutenSaveIntoDataSourceCommandSuite.scala | 21 +-
.../csv/GlutenCSVParsingOptionsSuite.scala | 19 +-
.../json/GlutenJsonParsingOptionsSuite.scala | 19 +-
.../datasources/orc/GlutenOrcEncryptionSuite.scala | 19 +-
.../GlutenParquetAvroCompatibilitySuite.scala | 21 +-
.../parquet/GlutenParquetCommitterSuite.scala | 19 +-
.../parquet/GlutenParquetFieldIdSchemaSuite.scala | 21 +-
.../parquet/GlutenParquetFilterSuite.scala | 5 +-
.../parquet/GlutenParquetTypeWideningSuite.scala | 19 +-
.../GlutenParquetVariantShreddingSuite.scala | 21 +-
.../text/GlutenWholeTextFileSuite.scala | 21 +-
.../v2/GlutenFileWriterFactorySuite.scala | 19 +-
.../v2/GlutenV2SessionCatalogSuite.scala | 25 +-
.../joins/GlutenHashedRelationSuite.scala | 19 +-
.../execution/joins/GlutenSingleJoinSuite.scala | 19 +-
.../metric/GlutenCustomMetricsSuite.scala | 19 +-
.../python/GlutenPythonDataSourceSuite.scala | 19 +-
.../execution/python/GlutenPythonUDFSuite.scala | 19 +-
.../execution/python/GlutenPythonUDTFSuite.scala | 21 +-
.../sql/execution/python/GlutenRowQueueSuite.scala | 19 +-
.../GlutenBucketedReadWithHiveSupportSuite.scala | 21 +-
.../GlutenBucketedWriteWithHiveSupportSuite.scala | 21 +-
.../GlutenCommitFailureTestRelationSuite.scala | 21 +-
.../sources/GlutenDataSourceAnalysisSuite.scala | 19 +-
...necessaryBucketedScanWithHiveSupportSuite.scala | 21 +-
.../sources/GlutenJsonHadoopFsRelationSuite.scala | 21 +-
.../GlutenParquetHadoopFsRelationSuite.scala | 21 +-
.../GlutenSimpleTextHadoopFsRelationSuite.scala | 21 +-
.../GlutenAcceptsLatestSeenOffsetSuite.scala | 21 +-
.../spark/sql/streaming/GlutenCommitLogSuite.scala | 19 +-
.../streaming/GlutenEventTimeWatermarkSuite.scala | 19 +-
.../sql/streaming/GlutenFileStreamSinkSuite.scala | 21 +-
.../streaming/GlutenFileStreamSourceSuite.scala | 23 +-
.../streaming/GlutenFileStreamStressSuite.scala | 19 +-
...pGroupsInPandasWithStateDistributionSuite.scala | 21 +-
...GlutenFlatMapGroupsInPandasWithStateSuite.scala | 21 +-
...enFlatMapGroupsWithStateDistributionSuite.scala | 21 +-
.../GlutenFlatMapGroupsWithStateSuite.scala | 25 +-
...atMapGroupsWithStateWithInitialStateSuite.scala | 21 +-
.../sql/streaming/GlutenGroupStateSuite.scala | 19 +-
.../streaming/GlutenMemorySourceStressSuite.scala | 19 +-
.../GlutenMultiStatefulOperatorsSuite.scala | 21 +-
.../spark/sql/streaming/GlutenOffsetSuite.scala | 19 +-
.../streaming/GlutenReportSinkMetricsSuite.scala | 19 +-
.../spark/sql/streaming/GlutenStreamSuite.scala | 19 +-
...utenStreamingAggregationDistributionSuite.scala | 21 +-
.../GlutenStreamingAggregationSuite.scala | 25 +-
...enStreamingDeduplicationDistributionSuite.scala | 21 +-
.../GlutenStreamingDeduplicationSuite.scala | 25 +-
...treamingDeduplicationWithinWatermarkSuite.scala | 21 +-
.../sql/streaming/GlutenStreamingJoinSuite.scala | 29 +-
...tenStreamingQueryHashPartitionVerifySuite.scala | 21 +-
.../GlutenStreamingQueryListenerSuite.scala | 21 +-
.../GlutenStreamingQueryListenersConfSuite.scala | 21 +-
.../GlutenStreamingQueryManagerSuite.scala | 21 +-
...treamingQueryOptimizationCorrectnessSuite.scala | 21 +-
...lutenStreamingQueryStatusAndProgressSuite.scala | 21 +-
.../streaming/GlutenStreamingSelfUnionSuite.scala | 19 +-
...enStreamingSessionWindowDistributionSuite.scala | 21 +-
.../GlutenStreamingSessionWindowSuite.scala | 21 +-
...reamingStateStoreFormatCompatibilitySuite.scala | 21 +-
...utenStreamingSymmetricHashJoinHelperSuite.scala | 21 +-
.../GlutenTransformWithListStateSuite.scala | 21 +-
.../GlutenTransformWithListStateTTLSuite.scala | 21 +-
.../GlutenTransformWithMapStateSuite.scala | 21 +-
.../GlutenTransformWithMapStateTTLSuite.scala | 21 +-
.../GlutenTransformWithStateAvroSuite.scala | 21 +-
.../GlutenTransformWithStateChainingSuite.scala | 21 +-
.../GlutenTransformWithStateClusterSuite.scala | 21 +-
...GlutenTransformWithStateInitialStateSuite.scala | 21 +-
.../streaming/GlutenTransformWithStateSuite.scala | 21 +-
.../GlutenTransformWithStateUnsafeRowSuite.scala | 21 +-
.../GlutenTransformWithValueStateTTLSuite.scala | 21 +-
.../streaming/GlutenTriggerAvailableNowSuite.scala | 19 +-
.../apache/spark/sql/classic/ClassicColumn.scala | 11 +-
.../apache/spark/sql/classic/ClassicColumn.scala | 11 +-
423 files changed, 2353 insertions(+), 6735 deletions(-)
diff --git a/gluten-ut/spark40/pom.xml b/gluten-ut/spark40/pom.xml
index d169abb888..05ecac5967 100644
--- a/gluten-ut/spark40/pom.xml
+++ b/gluten-ut/spark40/pom.xml
@@ -12,6 +12,12 @@
<packaging>jar</packaging>
<name>Gluten Unit Test Spark40</name>
+ <properties>
+ <parquet.version>1.15.2</parquet.version>
+ <parquet.test.deps.scope>test</parquet.test.deps.scope>
+ <avro.version>1.12.0</avro.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.gluten</groupId>
@@ -23,16 +29,38 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
- <version>1.15.2</version>
+ <version>${parquet.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
+ <scope>${parquet.test.deps.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
- <version>1.15.2</version>
+ <version>${parquet.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
+ <scope>${parquet.test.deps.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-avro</artifactId>
+ <version>${parquet.version}</version>
+ <scope>${parquet.test.deps.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ <scope>${parquet.test.deps.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index a066668517..e45b4b0b06 100644
--- a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -21,27 +21,28 @@ import org.apache.gluten.utils.{BackendTestSettings, SQLQueryTestSettings}
import org.apache.spark.GlutenSortShuffleSuite
import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.expressions._
+import org.apache.spark.sql.catalyst.expressions.aggregate
import org.apache.spark.sql.connector._
-import org.apache.spark.sql.errors.{GlutenQueryCompilationErrorsDSv2Suite, GlutenQueryCompilationErrorsSuite, GlutenQueryExecutionErrorsSuite, GlutenQueryParsingErrorsSuite}
+import org.apache.spark.sql.errors._
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive.velox.VeloxAdaptiveQueryExecSuite
import org.apache.spark.sql.execution.datasources._
import org.apache.spark.sql.execution.datasources.binaryfile.GlutenBinaryFileFormatSuite
-import org.apache.spark.sql.execution.datasources.csv.{GlutenCSVLegacyTimeParserSuite, GlutenCSVv1Suite, GlutenCSVv2Suite}
-import org.apache.spark.sql.execution.datasources.json.{GlutenJsonLegacyTimeParserSuite, GlutenJsonV1Suite, GlutenJsonV2Suite}
+import org.apache.spark.sql.execution.datasources.csv._
+import org.apache.spark.sql.execution.datasources.json._
import org.apache.spark.sql.execution.datasources.orc._
import org.apache.spark.sql.execution.datasources.parquet._
-import org.apache.spark.sql.execution.datasources.text.{GlutenTextV1Suite, GlutenTextV2Suite}
-import org.apache.spark.sql.execution.datasources.v2.{GlutenDataSourceV2StrategySuite, GlutenFileTableSuite, GlutenV2PredicateSuite}
+import org.apache.spark.sql.execution.datasources.text._
+import org.apache.spark.sql.execution.datasources.v2._
import org.apache.spark.sql.execution.exchange.{GlutenEnsureRequirementsSuite, GlutenValidateRequirementsSuite}
import org.apache.spark.sql.execution.joins._
-import org.apache.spark.sql.execution.metric.GlutenSQLMetricsSuite
+import org.apache.spark.sql.execution.metric.{GlutenCustomMetricsSuite, GlutenSQLMetricsSuite}
import org.apache.spark.sql.execution.python._
import org.apache.spark.sql.extension.{GlutenCollapseProjectExecTransformerSuite, GlutenSessionExtensionSuite, TestFileSourceScanExecTransformer}
import org.apache.spark.sql.gluten.{GlutenFallbackStrategiesSuite, GlutenFallbackSuite}
import org.apache.spark.sql.hive.execution.GlutenHiveSQLQuerySuite
import org.apache.spark.sql.sources._
-import org.apache.spark.sql.streaming.GlutenStreamingQuerySuite
+import org.apache.spark.sql.streaming._
// Some settings' line length exceeds 100
// scalastyle:off line.size.limit
@@ -83,15 +84,18 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSupportsCatalogOptionsSuite]
enableSuite[GlutenTableCapabilityCheckSuite]
enableSuite[GlutenWriteDistributionAndOrderingSuite]
- enableSuite[GlutenQueryCompilationErrorsDSv2Suite]
- enableSuite[GlutenQueryCompilationErrorsSuite]
- enableSuite[GlutenQueryExecutionErrorsSuite]
- // NEW SUITE: disable as it expects exception which doesn't happen when offloaded to gluten
- .exclude(
- "INCONSISTENT_BEHAVIOR_CROSS_VERSION: compatibility with Spark 2.4/3.2 in reading/writing dates")
- // Doesn't support unhex with failOnError=true.
- .exclude("CONVERSION_INVALID_INPUT: to_binary conversion function hex")
- enableSuite[GlutenQueryParsingErrorsSuite]
+ // Generated suites for org.apache.spark.sql.catalyst.expressions.aggregate
+ enableSuite[aggregate.GlutenAggregateExpressionSuite]
+ enableSuite[aggregate.GlutenApproxCountDistinctForIntervalsSuite]
+ enableSuite[aggregate.GlutenApproximatePercentileSuite]
+ enableSuite[aggregate.GlutenCountMinSketchAggSuite]
+ enableSuite[aggregate.GlutenDatasketchesHllSketchSuite]
+ enableSuite[aggregate.GlutenFirstLastTestSuite]
+ enableSuite[aggregate.GlutenHistogramNumericSuite]
+ enableSuite[aggregate.GlutenHyperLogLogPlusPlusSuite]
+ enableSuite[aggregate.GlutenCentralMomentAggSuite]
+ enableSuite[aggregate.GlutenCovarianceAggSuite]
+ enableSuite[aggregate.GlutenProductAggSuite] // to avoid conflict with sql.GlutenProductAggSuite
enableSuite[GlutenArithmeticExpressionSuite]
.exclude("SPARK-45786: Decimal multiply, divide, remainder, quot")
enableSuite[GlutenBitwiseExpressionsSuite]
@@ -203,6 +207,68 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSortOrderExpressionsSuite]
enableSuite[GlutenStringExpressionsSuite]
enableSuite[GlutenTryEvalSuite]
+ // Generated suites for org.apache.spark.sql.catalyst.expressions
+ enableSuite[GlutenAttributeResolutionSuite]
+ enableSuite[GlutenAttributeSetSuite]
+ enableSuite[GlutenBitmapExpressionUtilsSuite]
+ enableSuite[GlutenCallMethodViaReflectionSuite]
+ enableSuite[GlutenCanonicalizeSuite]
+ enableSuite[GlutenCastWithAnsiOnSuite]
+ enableSuite[GlutenCodeGenerationSuite]
+ enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
+ enableSuite[GlutenCollationExpressionSuite]
+ enableSuite[GlutenCollationRegexpExpressionsSuite]
+ enableSuite[GlutenCsvExpressionsSuite]
+ enableSuite[GlutenDynamicPruningSubquerySuite]
+ enableSuite[GlutenExprIdSuite]
+ enableSuite[GlutenExpressionEvalHelperSuite]
+ enableSuite[GlutenExpressionImplUtilsSuite]
+ enableSuite[GlutenExpressionSQLBuilderSuite]
+ enableSuite[GlutenExpressionSetSuite]
+ enableSuite[GlutenExtractPredicatesWithinOutputSetSuite]
+ enableSuite[GlutenHexSuite]
+ enableSuite[GlutenMutableProjectionSuite]
+ enableSuite[GlutenNamedExpressionSuite]
+ enableSuite[GlutenObjectExpressionsSuite]
+ enableSuite[GlutenOrderingSuite]
+ enableSuite[GlutenScalaUDFSuite]
+ enableSuite[GlutenSchemaPruningSuite]
+ enableSuite[GlutenSelectedFieldSuite]
+ // GlutenSubExprEvaluationRuntimeSuite is removed because SubExprEvaluationRuntimeSuite
+ // is in test-jar without shaded Guava, while SubExprEvaluationRuntime is shaded.
+ enableSuite[GlutenSubexpressionEliminationSuite]
+ enableSuite[GlutenTimeWindowSuite]
+ enableSuite[GlutenToPrettyStringSuite]
+ enableSuite[GlutenUnsafeRowConverterSuite]
+ enableSuite[GlutenUnwrapUDTExpressionSuite]
+ enableSuite[GlutenV2ExpressionUtilsSuite]
+ enableSuite[GlutenValidateExternalTypeSuite]
+ // TODO: 4.x enableSuite[GlutenXmlExpressionsSuite] // 7 failures
+ // Generated suites for org.apache.spark.sql.connector
+ enableSuite[GlutenDataSourceV2MetricsSuite]
+ enableSuite[GlutenDataSourceV2OptionSuite]
+ enableSuite[GlutenDataSourceV2UtilsSuite]
+ // TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenMergeIntoDataFrameSuite] // 1 failure
+ enableSuite[GlutenProcedureSuite]
+ enableSuite[GlutenPushablePredicateSuite]
+ enableSuite[GlutenV1ReadFallbackWithCatalogSuite]
+ enableSuite[GlutenV1ReadFallbackWithDataFrameReaderSuite]
+ enableSuite[GlutenV1WriteFallbackSessionCatalogSuite]
+ enableSuite[GlutenV1WriteFallbackSuite]
+ enableSuite[GlutenV2CommandsCaseSensitivitySuite]
+ // Generated suites for org.apache.spark.sql.errors
+ enableSuite[GlutenQueryCompilationErrorsDSv2Suite]
+ enableSuite[GlutenQueryCompilationErrorsSuite]
+ enableSuite[GlutenQueryExecutionErrorsSuite]
+ // NEW SUITE: disable as it expects exception which doesn't happen when offloaded to gluten
+ .exclude(
+ "INCONSISTENT_BEHAVIOR_CROSS_VERSION: compatibility with Spark 2.4/3.2 in reading/writing dates")
+ // Doesn't support unhex with failOnError=true.
+ .exclude("CONVERSION_INVALID_INPUT: to_binary conversion function hex")
+ enableSuite[GlutenQueryParsingErrorsSuite]
+ enableSuite[GlutenQueryContextSuite]
+ enableSuite[GlutenQueryExecutionAnsiErrorsSuite]
enableSuite[VeloxAdaptiveQueryExecSuite]
.includeAllGlutenTests()
.includeByPrefix(
@@ -236,6 +302,36 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenBinaryFileFormatSuite]
// Exception.
.exclude("column pruning - non-readable file")
+ // Generated suites for org.apache.spark.sql.execution.datasources
+ enableSuite[GlutenBasicWriteJobStatsTrackerMetricSuite]
+ enableSuite[GlutenBasicWriteTaskStatsTrackerSuite]
+ enableSuite[GlutenCustomWriteTaskStatsTrackerSuite]
+ enableSuite[GlutenDataSourceManagerSuite]
+ enableSuite[GlutenDataSourceResolverSuite]
+ enableSuite[GlutenFileResolverSuite]
+ enableSuite[GlutenInMemoryTableMetricSuite]
+ enableSuite[GlutenPushVariantIntoScanSuite]
+ enableSuite[GlutenRowDataSourceStrategySuite]
+ enableSuite[GlutenSaveIntoDataSourceCommandSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.csv
+ enableSuite[GlutenCSVParsingOptionsSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.json
+ enableSuite[GlutenJsonParsingOptionsSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.orc
+ enableSuite[GlutenOrcEncryptionSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.parquet
+ enableSuite[GlutenParquetAvroCompatibilitySuite]
+ enableSuite[GlutenParquetCommitterSuite]
+ enableSuite[GlutenParquetFieldIdSchemaSuite]
+ // TODO: 4.x enableSuite[GlutenParquetTypeWideningSuite] // 74 failures - MAJOR ISSUE
+ enableSuite[GlutenParquetVariantShreddingSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.text
+ // TODO: 4.x enableSuite[GlutenWholeTextFileV1Suite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenWholeTextFileV2Suite] // 1 failure
+ // Generated suites for org.apache.spark.sql.execution.datasources.v2
+ enableSuite[GlutenFileWriterFactorySuite]
+ enableSuite[GlutenV2SessionCatalogNamespaceSuite]
+ enableSuite[GlutenV2SessionCatalogTableSuite]
enableSuite[GlutenCSVv1Suite]
// file cars.csv include null string, Arrow not support to read
.exclude("DDL test with schema")
@@ -581,13 +677,51 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("Shouldn't bias towards build right if user didn't specify")
.exclude("SPARK-23192: broadcast hint should be retained after using the cached data")
.exclude("broadcast join where streamed side's output partitioning is HashPartitioning")
-
+ enableSuite[GlutenHashedRelationSuite]
+ enableSuite[GlutenSingleJoinSuite]
enableSuite[GlutenExistenceJoinSuite]
enableSuite[GlutenInnerJoinSuiteForceShjOn]
enableSuite[GlutenInnerJoinSuiteForceShjOff]
enableSuite[GlutenOuterJoinSuiteForceShjOn]
enableSuite[GlutenOuterJoinSuiteForceShjOff]
enableSuite[GlutenFallbackStrategiesSuite]
+ // Generated suites for org.apache.spark.sql.execution
+ enableSuite[GlutenAggregatingAccumulatorSuite]
+ enableSuite[GlutenCoGroupedIteratorSuite]
+ enableSuite[GlutenColumnarRulesSuite]
+ enableSuite[GlutenDataSourceScanExecRedactionSuite]
+ enableSuite[GlutenDataSourceV2ScanExecRedactionSuite]
+ enableSuite[GlutenExecuteImmediateEndToEndSuite]
+ enableSuite[GlutenExternalAppendOnlyUnsafeRowArraySuite]
+ enableSuite[GlutenGlobalTempViewSuite]
+ enableSuite[GlutenGlobalTempViewTestSuite]
+ enableSuite[GlutenGroupedIteratorSuite]
+ enableSuite[GlutenHiveResultSuite]
+ // TODO: 4.x enableSuite[GlutenInsertSortForLimitAndOffsetSuite] // 6 failures
+ enableSuite[GlutenLocalTempViewTestSuite]
+ enableSuite[GlutenLogicalPlanTagInSparkPlanSuite]
+ enableSuite[GlutenOptimizeMetadataOnlyQuerySuite]
+ enableSuite[GlutenPersistedViewTestSuite]
+ // TODO: 4.x enableSuite[GlutenPlannerSuite] // 1 failure
+ enableSuite[GlutenProjectedOrderingAndPartitioningSuite]
+ enableSuite[GlutenQueryPlanningTrackerEndToEndSuite]
+ enableSuite[GlutenRemoveRedundantProjectsSuite]
+ // TODO: 4.x enableSuite[GlutenRemoveRedundantSortsSuite] // 1 failure
+ enableSuite[GlutenRowToColumnConverterSuite]
+ enableSuite[GlutenSQLExecutionSuite]
+ enableSuite[GlutenSQLFunctionSuite]
+ enableSuite[GlutenSQLJsonProtocolSuite]
+ enableSuite[GlutenShufflePartitionsUtilSuite]
+ enableSuite[GlutenSimpleSQLViewSuite]
+ // TODO: 4.x enableSuite[GlutenSparkPlanSuite] // 1 failure
+ enableSuite[GlutenSparkPlannerSuite]
+ enableSuite[GlutenSparkScriptTransformationSuite]
+ enableSuite[GlutenSparkSqlParserSuite]
+ enableSuite[GlutenUnsafeFixedWidthAggregationMapSuite]
+ enableSuite[GlutenUnsafeKVExternalSorterSuite]
+ enableSuite[GlutenUnsafeRowSerializerSuite]
+ // TODO: 4.x enableSuite[GlutenWholeStageCodegenSparkSubmitSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenWholeStageCodegenSuite] // 24 failures
enableSuite[GlutenBroadcastExchangeSuite]
enableSuite[GlutenLocalBroadcastExchangeSuite]
enableSuite[GlutenCoalesceShufflePartitionsSuite]
@@ -633,7 +767,7 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-32767 Bucket join should work if SHUFFLE_PARTITIONS larger than bucket number")
.exclude("bucket coalescing eliminates shuffle")
.exclude("bucket coalescing is not satisfied")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("disable bucketing when the output doesn't contain all bucketing columns")
.excludeByPrefix("bucket coalescing is applied when join expressions match")
enableSuite[GlutenBucketedWriteWithoutHiveSupportSuite]
@@ -667,6 +801,62 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenResolvedDataSourceSuite]
enableSuite[GlutenSaveLoadSuite]
enableSuite[GlutenTableScanSuite]
+ // Generated suites for org.apache.spark.sql.sources
+ // TODO: 4.x enableSuite[GlutenBucketedReadWithHiveSupportSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenBucketedWriteWithHiveSupportSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenCommitFailureTestRelationSuite] // 2 failures
+ enableSuite[GlutenDataSourceAnalysisSuite]
+ // TODO: 4.x enableSuite[GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenJsonHadoopFsRelationSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenParquetHadoopFsRelationSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenSimpleTextHadoopFsRelationSuite] // 2 failures
+ // Generated suites for org.apache.spark.sql
+ enableSuite[GlutenCacheManagerSuite]
+ enableSuite[GlutenDataFrameShowSuite]
+ enableSuite[GlutenDataFrameSubquerySuite]
+ enableSuite[GlutenDataFrameTableValuedFunctionsSuite]
+ enableSuite[GlutenDataFrameTransposeSuite]
+ enableSuite[GlutenDefaultANSIValueSuite]
+ // TODO: 4.x enableSuite[GlutenExplainSuite] // 1 failure
+ enableSuite[GlutenICUCollationsMapSuite]
+ enableSuite[GlutenInlineTableParsingImprovementsSuite]
+ enableSuite[GlutenJoinHintSuite]
+ // TODO: 4.x enableSuite[GlutenLogQuerySuite] // 2 failures
+ enableSuite[GlutenPercentileQuerySuite]
+ enableSuite[GlutenRandomDataGeneratorSuite]
+ enableSuite[GlutenRowJsonSuite]
+ enableSuite[GlutenRowSuite]
+ enableSuite[GlutenRuntimeConfigSuite]
+ enableSuite[GlutenSSBQuerySuite]
+ enableSuite[GlutenSessionStateSuite]
+ // TODO: 4.x enableSuite[GlutenSetCommandSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenSingleLevelAggregateHashMapSuite] // 1 failure
+ enableSuite[GlutenSparkSessionBuilderSuite]
+ // TODO: 4.x enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite] // 1 failure
+ enableSuite[GlutenTPCDSCollationQueryTestSuite]
+ enableSuite[GlutenTPCDSModifiedPlanStabilitySuite]
+ enableSuite[GlutenTPCDSModifiedPlanStabilityWithStatsSuite]
+ enableSuite[GlutenTPCDSQueryANSISuite]
+ enableSuite[GlutenTPCDSQuerySuite]
+ enableSuite[GlutenTPCDSQueryTestSuite]
+ enableSuite[GlutenTPCDSQueryWithStatsSuite]
+ enableSuite[GlutenTPCDSV1_4_PlanStabilitySuite]
+ enableSuite[GlutenTPCDSV1_4_PlanStabilityWithStatsSuite]
+ enableSuite[GlutenTPCDSV2_7_PlanStabilitySuite]
+ enableSuite[GlutenTPCDSV2_7_PlanStabilityWithStatsSuite]
+ enableSuite[GlutenTPCHPlanStabilitySuite]
+ enableSuite[GlutenTPCHQuerySuite]
+ // TODO: 4.x enableSuite[GlutenTwoLevelAggregateHashMapSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenTwoLevelAggregateHashMapWithVectorizedMapSuite] // 1 failure
+ enableSuite[GlutenUDFSuite]
+ enableSuite[GlutenUDTRegistrationSuite]
+ enableSuite[GlutenUnsafeRowSuite]
+ enableSuite[GlutenUserDefinedTypeSuite]
+ // TODO: 4.x enableSuite[GlutenVariantEndToEndSuite] // 3 failures
+ // TODO: 4.x enableSuite[GlutenVariantShreddingSuite] // 8 failures
+ enableSuite[GlutenVariantSuite]
+ enableSuite[GlutenVariantWriteShreddingSuite]
+ // TODO: 4.x enableSuite[GlutenXmlFunctionsSuite] // 10 failures
enableSuite[GlutenApproxCountDistinctForIntervalsQuerySuite]
enableSuite[GlutenApproximatePercentileQuerySuite]
enableSuite[GlutenCachedTableSuite]
@@ -814,11 +1004,11 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-31116: Select nested schema with case insensitive mode")
// exclude as original metric not correct when task offloaded to velox
.exclude("SPARK-37585: test input metrics for DSV2 with output limits")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("File source v2: support passing data filters to FileScan without partitionFilters")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("File source v2: support partition pruning")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("SPARK-41017: filter pushdown with nondeterministic predicates")
enableSuite[GlutenFileScanSuite]
enableSuite[GlutenGeneratorFunctionSuite]
@@ -928,6 +1118,11 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenTableLocationSuite]
enableSuite[GlutenRemoveRedundantWindowGroupLimitsSuite]
enableSuite[GlutenSQLCollectLimitExecSuite]
+ // Generated suites for org.apache.spark.sql.execution.python
+ // TODO: 4.x enableSuite[GlutenPythonDataSourceSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenPythonUDFSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenPythonUDTFSuite]
+ enableSuite[GlutenRowQueueSuite]
enableSuite[GlutenBatchEvalPythonExecSuite]
// Replaced with other tests that check for native operations
.exclude("Python UDF: push down deterministic FilterExec predicates")
@@ -957,7 +1152,62 @@ class VeloxTestSettings extends BackendTestSettings {
// The case doesn't need to be run in Gluten since it's verifying against
// vanilla Spark's query plan.
.exclude("SPARK-47289: extended explain info")
+ enableSuite[GlutenCustomMetricsSuite]
enableSuite[GlutenSQLMetricsSuite]
+ enableSuite[GlutenAcceptsLatestSeenOffsetSuite]
+ enableSuite[GlutenCommitLogSuite]
+ // TODO: 4.x enableSuite[GlutenEventTimeWatermarkSuite]
+ enableSuite[GlutenFileStreamSinkV1Suite]
+ enableSuite[GlutenFileStreamSinkV2Suite]
+ enableSuite[GlutenFileStreamSourceStressTestSuite]
+ // TODO: 4.x enableSuite[GlutenFileStreamSourceSuite]
+ enableSuite[GlutenFileStreamStressSuite]
+ enableSuite[GlutenFlatMapGroupsInPandasWithStateDistributionSuite]
+ enableSuite[GlutenFlatMapGroupsInPandasWithStateSuite]
+ // TODO: 4.x enableSuite[GlutenFlatMapGroupsWithStateDistributionSuite]
+ // TODO: 4.x enableSuite[GlutenFlatMapGroupsWithStateSuite]
+ enableSuite[GlutenFlatMapGroupsWithStateWithInitialStateSuite]
+ enableSuite[GlutenGroupStateSuite]
+ enableSuite[GlutenLongOffsetSuite]
+ enableSuite[GlutenMemorySourceStressSuite]
+ enableSuite[GlutenMultiStatefulOperatorsSuite]
+ enableSuite[GlutenReportSinkMetricsSuite]
+ // TODO: 4.x enableSuite[GlutenRocksDBStateStoreFlatMapGroupsWithStateSuite]
+ // TODO: 4.x enableSuite[GlutenRocksDBStateStoreStreamingAggregationSuite]
+ // TODO: 4.x enableSuite[GlutenRocksDBStateStoreStreamingDeduplicationSuite]
+ // TODO: 4.x enableSuite[GlutenStreamSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingAggregationDistributionSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingAggregationSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingDeduplicationDistributionSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingDeduplicationSuite]
+ enableSuite[GlutenStreamingDeduplicationWithinWatermarkSuite]
+ enableSuite[GlutenStreamingFullOuterJoinSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingInnerJoinSuite]
+ enableSuite[GlutenStreamingLeftSemiJoinSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingOuterJoinSuite]
+ enableSuite[GlutenStreamingQueryHashPartitionVerifySuite]
+ enableSuite[GlutenStreamingQueryListenerSuite]
+ enableSuite[GlutenStreamingQueryListenersConfSuite]
+ enableSuite[GlutenStreamingQueryManagerSuite]
+ enableSuite[GlutenStreamingQueryOptimizationCorrectnessSuite]
+ enableSuite[GlutenStreamingQueryStatusAndProgressSuite]
+ enableSuite[GlutenStreamingSelfUnionSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingSessionWindowDistributionSuite]
+ enableSuite[GlutenStreamingSessionWindowSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingStateStoreFormatCompatibilitySuite]
+ enableSuite[GlutenStreamingSymmetricHashJoinHelperSuite]
+ enableSuite[GlutenTransformWithListStateSuite]
+ enableSuite[GlutenTransformWithListStateTTLSuite]
+ enableSuite[GlutenTransformWithMapStateSuite]
+ enableSuite[GlutenTransformWithMapStateTTLSuite]
+ enableSuite[GlutenTransformWithStateAvroSuite]
+ enableSuite[GlutenTransformWithStateChainingSuite]
+ enableSuite[GlutenTransformWithStateClusterSuite]
+ enableSuite[GlutenTransformWithStateInitialStateSuite]
+ enableSuite[GlutenTransformWithStateUnsafeRowSuite]
+ enableSuite[GlutenTransformWithStateValidationSuite]
+ enableSuite[GlutenTransformWithValueStateTTLSuite]
+ enableSuite[GlutenTriggerAvailableNowSuite]
override def getSQLQueryTestSettings: SQLQueryTestSettings = VeloxSQLQueryTestSettings
}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenAggregateHashMapSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenAggregateHashMapSuite.scala
index 7fe63d706e..3f576c9c1a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenAggregateHashMapSuite.scala
@@ -14,21 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+class GlutenSingleLevelAggregateHashMapSuite
+ extends SingleLevelAggregateHashMapSuite
+ with GlutenTestsCommonTrait {}
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTwoLevelAggregateHashMapSuite
+ extends TwoLevelAggregateHashMapSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTwoLevelAggregateHashMapWithVectorizedMapSuite
+ extends TwoLevelAggregateHashMapWithVectorizedMapSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala
index 7fe63d706e..e41b03f921 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCacheManagerSuite extends CacheManagerSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameShowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameShowSuite.scala
index 7fe63d706e..4921ea2a0c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameShowSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameShowSuite extends DataFrameShowSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameSubquerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameSubquerySuite.scala
index 7fe63d706e..b333dd8f1a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameSubquerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameSubquerySuite extends DataFrameSubquerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameTableValuedFunctionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameTableValuedFunctionsSuite.scala
index 7fe63d706e..f7e1b90dbc 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameTableValuedFunctionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameTableValuedFunctionsSuite
+ extends DataFrameTableValuedFunctionsSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameTransposeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameTransposeSuite.scala
index 7fe63d706e..8f9af2317b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDataFrameTransposeSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameTransposeSuite extends DataFrameTransposeSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDefaultANSIValueSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDefaultANSIValueSuite.scala
index 7fe63d706e..05ebbb8ca9 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenDefaultANSIValueSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDefaultANSIValueSuite extends DefaultANSIValueSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala
index 7fe63d706e..575c7f58b0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExplainSuite extends ExplainSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala
index 7fe63d706e..5782014ad2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenICUCollationsMapSuite extends ICUCollationsMapSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenInlineTableParsingImprovementsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenInlineTableParsingImprovementsSuite.scala
index 7fe63d706e..9eadb26c65 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenInlineTableParsingImprovementsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenInlineTableParsingImprovementsSuite
+ extends InlineTableParsingImprovementsSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala
index 7fe63d706e..9359701d66 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenJoinHintSuite extends JoinHintSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenLogQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenLogQuerySuite.scala
index 7fe63d706e..634da8516f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenLogQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenLogQuerySuite extends LogQuerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenPercentileQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenPercentileQuerySuite.scala
index 7fe63d706e..495dfc23ef 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenPercentileQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPercentileQuerySuite extends PercentileQuerySuite with GlutenSQLTestsTrait {}
diff --git a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenPlanStabilitySuite.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenPlanStabilitySuite.scala
new file mode 100644
index 0000000000..8eaa795090
--- /dev/null
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenPlanStabilitySuite.scala
@@ -0,0 +1,43 @@
+/*
+ * 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.spark.sql
+
+class GlutenTPCDSV1_4_PlanStabilitySuite
+ extends TPCDSV1_4_PlanStabilitySuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSV1_4_PlanStabilityWithStatsSuite
+ extends TPCDSV1_4_PlanStabilityWithStatsSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSV2_7_PlanStabilitySuite
+ extends TPCDSV2_7_PlanStabilitySuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSV2_7_PlanStabilityWithStatsSuite
+ extends TPCDSV2_7_PlanStabilityWithStatsSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSModifiedPlanStabilitySuite
+ extends TPCDSModifiedPlanStabilitySuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSModifiedPlanStabilityWithStatsSuite
+ extends TPCDSModifiedPlanStabilityWithStatsSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCHPlanStabilitySuite extends TPCHPlanStabilitySuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala
index 7fe63d706e..7650aa6dc7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRandomDataGeneratorSuite extends RandomDataGeneratorSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala
index 7fe63d706e..50ed512b5c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowJsonSuite extends RowJsonSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala
index 7fe63d706e..2fecc00415 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowSuite extends RowSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala
index 7fe63d706e..390f2cadc0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRuntimeConfigSuite extends RuntimeConfigSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSSBQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSSBQuerySuite.scala
index 7fe63d706e..13ad1f127b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSSBQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSSBQuerySuite extends SSBQuerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala
index 7fe63d706e..77443c2554 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSessionStateSuite extends SessionStateSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSetCommandSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSetCommandSuite.scala
index 7fe63d706e..ab5c2e43cb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSetCommandSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSetCommandSuite extends SetCommandSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala
index 7fe63d706e..de4af1063b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkSessionBuilderSuite extends SparkSessionBuilderSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala
index 7fe63d706e..bf1321c34d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkSessionJobTaggingAndCancellationSuite
+ extends SparkSessionJobTaggingAndCancellationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSCollationQueryTestSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSCollationQueryTestSuite.scala
index 7fe63d706e..f475a6e0a2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSCollationQueryTestSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCDSCollationQueryTestSuite
+ extends TPCDSCollationQueryTestSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSQuerySuite.scala
index 7fe63d706e..fe22c32374 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSQuerySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+class GlutenTPCDSQuerySuite extends TPCDSQuerySuite with GlutenSQLTestsTrait {}
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCDSQueryWithStatsSuite extends TPCDSQueryWithStatsSuite with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSQueryANSISuite extends TPCDSQueryANSISuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSQueryTestSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSQueryTestSuite.scala
index 7fe63d706e..e6c311b449 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCDSQueryTestSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCDSQueryTestSuite extends TPCDSQueryTestSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCHQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCHQuerySuite.scala
index 7fe63d706e..9e9e9797a8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenTPCHQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCHQuerySuite extends TPCHQuerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDFSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDFSuite.scala
index 7fe63d706e..f33cfd77a4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDFSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUDFSuite extends UDFSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala
index 7fe63d706e..bb02b2d3fc 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUDTRegistrationSuite extends UDTRegistrationSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala
index 7fe63d706e..dd3dc3d8a6 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnsafeRowSuite extends UnsafeRowSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUserDefinedTypeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUserDefinedTypeSuite.scala
index 7fe63d706e..727419c919 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUserDefinedTypeSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUserDefinedTypeSuite extends UserDefinedTypeSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantEndToEndSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantEndToEndSuite.scala
index 7fe63d706e..328d18dfb3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantEndToEndSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantEndToEndSuite extends VariantEndToEndSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantShreddingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantShreddingSuite.scala
index 7fe63d706e..2f8af5f834 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantShreddingSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantShreddingSuite extends VariantShreddingSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantSuite.scala
index 7fe63d706e..c5793bfd7b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantSuite extends VariantSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala
index 7fe63d706e..b726ccf971 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantWriteShreddingSuite
+ extends VariantWriteShreddingSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenXmlFunctionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenXmlFunctionsSuite.scala
index 7fe63d706e..a44a8e687c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenXmlFunctionsSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenXmlFunctionsSuite extends XmlFunctionsSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala
index 7fe63d706e..6fb13b6656 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAttributeResolutionSuite extends AttributeResolutionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala
index 7fe63d706e..e8302e83d6 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAttributeSetSuite extends AttributeSetSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala
index 7fe63d706e..b746af49e3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenBitmapExpressionUtilsSuite
+ extends BitmapExpressionUtilsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCallMethodViaReflectionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCallMethodViaReflectionSuite.scala
index 7fe63d706e..4fd9c13597 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCallMethodViaReflectionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCallMethodViaReflectionSuite
+ extends CallMethodViaReflectionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCanonicalizeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCanonicalizeSuite.scala
index 7fe63d706e..b98dfe563a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCanonicalizeSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCanonicalizeSuite extends CanonicalizeSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOnSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOnSuite.scala
index 7fe63d706e..c1e789c46b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOnSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCastWithAnsiOnSuite extends CastWithAnsiOnSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGenerationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGenerationSuite.scala
index 7fe63d706e..707be6fcdb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGenerationSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCodeGenerationSuite extends CodeGenerationSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGeneratorWithInterpretedFallbackSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGeneratorWithInterpretedFallbackSuite.scala
index 7fe63d706e..3cdfeebad5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGeneratorWithInterpretedFallbackSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCodeGeneratorWithInterpretedFallbackSuite
+ extends CodeGeneratorWithInterpretedFallbackSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationExpressionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationExpressionSuite.scala
index 7fe63d706e..63d75972f5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationExpressionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCollationExpressionSuite extends CollationExpressionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationRegexpExpressionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationRegexpExpressionsSuite.scala
index 7fe63d706e..56835957f7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationRegexpExpressionsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCollationRegexpExpressionsSuite
+ extends CollationRegexpExpressionsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCsvExpressionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCsvExpressionsSuite.scala
index 7fe63d706e..233fad5276 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCsvExpressionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCsvExpressionsSuite extends CsvExpressionsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenDynamicPruningSubquerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenDynamicPruningSubquerySuite.scala
index 7fe63d706e..0628558da8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenDynamicPruningSubquerySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDynamicPruningSubquerySuite
+ extends DynamicPruningSubquerySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExprIdSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExprIdSuite.scala
index 7fe63d706e..8dcbd0f95a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExprIdSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExprIdSuite extends ExprIdSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionEvalHelperSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionEvalHelperSuite.scala
index 7fe63d706e..8675c29ac9 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionEvalHelperSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionEvalHelperSuite
+ extends ExpressionEvalHelperSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionImplUtilsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionImplUtilsSuite.scala
index 7fe63d706e..df3d3b957a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionImplUtilsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionImplUtilsSuite extends ExpressionImplUtilsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSQLBuilderSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSQLBuilderSuite.scala
index 7fe63d706e..688d100487 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSQLBuilderSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionSQLBuilderSuite
+ extends ExpressionSQLBuilderSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSetSuite.scala
index 7fe63d706e..63cf7c6442 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSetSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionSetSuite extends ExpressionSetSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExtractPredicatesWithinOutputSetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExtractPredicatesWithinOutputSetSuite.scala
index 7fe63d706e..2cbed97324 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExtractPredicatesWithinOutputSetSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExtractPredicatesWithinOutputSetSuite
+ extends ExtractPredicatesWithinOutputSetSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenHexSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenHexSuite.scala
index 7fe63d706e..db4214eab4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenHexSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenHexSuite extends HexSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenMutableProjectionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenMutableProjectionSuite.scala
index 7fe63d706e..024c670495 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenMutableProjectionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenMutableProjectionSuite extends MutableProjectionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenNamedExpressionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenNamedExpressionSuite.scala
index 7fe63d706e..91650a96a1 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenNamedExpressionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenNamedExpressionSuite extends NamedExpressionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenObjectExpressionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenObjectExpressionsSuite.scala
index 7fe63d706e..8d2b8916e0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenObjectExpressionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenObjectExpressionsSuite extends ObjectExpressionsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenOrderingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenOrderingSuite.scala
index 7fe63d706e..ceee83f36e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenOrderingSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenOrderingSuite extends OrderingSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenScalaUDFSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenScalaUDFSuite.scala
index 7fe63d706e..97080dccf3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenScalaUDFSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenScalaUDFSuite extends ScalaUDFSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSchemaPruningSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSchemaPruningSuite.scala
index 7fe63d706e..e7a3da4ecb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSchemaPruningSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSchemaPruningSuite extends SchemaPruningSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSelectedFieldSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSelectedFieldSuite.scala
index 7fe63d706e..8166fa3da7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSelectedFieldSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSelectedFieldSuite extends SelectedFieldSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubexpressionEliminationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubexpressionEliminationSuite.scala
index 7fe63d706e..ba58b6aa6e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenSubexpressionEliminationSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSubexpressionEliminationSuite
+ extends SubexpressionEliminationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenTimeWindowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenTimeWindowSuite.scala
index 7fe63d706e..f7287f110f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenTimeWindowSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTimeWindowSuite extends TimeWindowSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenToPrettyStringSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenToPrettyStringSuite.scala
index 7fe63d706e..01ce3a99d4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenToPrettyStringSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenToPrettyStringSuite extends ToPrettyStringSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenUnsafeRowConverterSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenUnsafeRowConverterSuite.scala
index 7fe63d706e..8b8a6cdcf5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenUnsafeRowConverterSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnsafeRowConverterSuite extends UnsafeRowConverterSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenUnwrapUDTExpressionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenUnwrapUDTExpressionSuite.scala
index 7fe63d706e..037f7baa44 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenUnwrapUDTExpressionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnwrapUDTExpressionSuite extends UnwrapUDTExpressionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenV2ExpressionUtilsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenV2ExpressionUtilsSuite.scala
index 7fe63d706e..9366ae6a6a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenV2ExpressionUtilsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenV2ExpressionUtilsSuite extends V2ExpressionUtilsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenValidateExternalTypeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenValidateExternalTypeSuite.scala
index 7fe63d706e..ccd08ad659 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenValidateExternalTypeSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenValidateExternalTypeSuite extends ValidateExternalTypeSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
index 7fe63d706e..380ed0bbf4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenXmlExpressionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenXmlExpressionsSuite extends XmlExpressionsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenAggregateExpressionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenAggregateExpressionSuite.scala
index 7fe63d706e..408114e832 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenAggregateExpressionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAggregateExpressionSuite extends AggregateExpressionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenApproxCountDistinctForIntervalsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenApproxCountDistinctForIntervalsSuite.scala
index 7fe63d706e..ff8f9a8f15 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenApproxCountDistinctForIntervalsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenApproxCountDistinctForIntervalsSuite
+ extends ApproxCountDistinctForIntervalsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenApproximatePercentileSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenApproximatePercentileSuite.scala
index 7fe63d706e..2d18fe755d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenApproximatePercentileSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenApproximatePercentileSuite
+ extends ApproximatePercentileSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCentralMomentAggSuite.scala
similarity index 52%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCentralMomentAggSuite.scala
index 7fe63d706e..529522a047 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCentralMomentAggSuite.scala
@@ -14,21 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
+class GlutenCentralMomentAggSuite extends CentralMomentAggSuite with GlutenTestsTrait {
+ override def testBothCodegenAndInterpreted(name: String)(f: => Unit): Unit =
+ super[CentralMomentAggSuite].testBothCodegenAndInterpreted(name)(f)
}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCountMinSketchAggSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCountMinSketchAggSuite.scala
index 7fe63d706e..685ec0223f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCountMinSketchAggSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCountMinSketchAggSuite extends CountMinSketchAggSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCovarianceAggSuite.scala
similarity index 52%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCovarianceAggSuite.scala
index 7fe63d706e..dafff1468e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenCovarianceAggSuite.scala
@@ -14,21 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
+class GlutenCovarianceAggSuite extends CovarianceAggSuite with GlutenTestsTrait {
+ override def testBothCodegenAndInterpreted(name: String)(f: => Unit): Unit =
+ super[CovarianceAggSuite].testBothCodegenAndInterpreted(name)(f)
}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenDatasketchesHllSketchSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenDatasketchesHllSketchSuite.scala
index 7fe63d706e..b6ca4850f8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenDatasketchesHllSketchSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDatasketchesHllSketchSuite
+ extends DatasketchesHllSketchSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenFirstLastTestSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenFirstLastTestSuite.scala
index 7fe63d706e..7e50c837ff 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenFirstLastTestSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFirstLastTestSuite extends FirstLastTestSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenHistogramNumericSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenHistogramNumericSuite.scala
index 7fe63d706e..47ea00b569 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenHistogramNumericSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenHistogramNumericSuite extends HistogramNumericSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenHyperLogLogPlusPlusSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenHyperLogLogPlusPlusSuite.scala
index 7fe63d706e..6597d0d971 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenHyperLogLogPlusPlusSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenHyperLogLogPlusPlusSuite extends HyperLogLogPlusPlusSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenProductAggSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenProductAggSuite.scala
index 7fe63d706e..400c723730 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/aggregate/GlutenProductAggSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions.aggregate
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenProductAggSuite extends ProductAggSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2MetricsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2MetricsSuite.scala
index 7fe63d706e..4709fc8704 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2MetricsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceV2MetricsSuite extends DataSourceV2MetricsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2OptionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2OptionSuite.scala
index 7fe63d706e..1fa810a8ff 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2OptionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceV2OptionSuite extends DataSourceV2OptionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2UtilsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2UtilsSuite.scala
index 7fe63d706e..84d0689921 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2UtilsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceV2UtilsSuite extends DataSourceV2UtilsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenGroupBasedUpdateTableSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenGroupBasedUpdateTableSuite.scala
index 7fe63d706e..1325791a84 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenGroupBasedUpdateTableSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenGroupBasedUpdateTableSuite
+ extends GroupBasedUpdateTableSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoDataFrameSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoDataFrameSuite.scala
index 7fe63d706e..7fc78f8785 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoDataFrameSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenMergeIntoDataFrameSuite extends MergeIntoDataFrameSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenProcedureSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenProcedureSuite.scala
index 7fe63d706e..730cc1cad8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenProcedureSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenProcedureSuite extends ProcedureSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenPushablePredicateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenPushablePredicateSuite.scala
index 7fe63d706e..83cf7f649e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenPushablePredicateSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPushablePredicateSuite extends PushablePredicateSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV1ReadFallbackSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV1ReadFallbackSuite.scala
index 7fe63d706e..f3d8a45939 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV1ReadFallbackSuite.scala
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenV1ReadFallbackWithDataFrameReaderSuite
+ extends V1ReadFallbackWithDataFrameReaderSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenV1ReadFallbackWithCatalogSuite
+ extends V1ReadFallbackWithCatalogSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV1WriteFallbackSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV1WriteFallbackSuite.scala
index 7fe63d706e..fb6bf3554a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV1WriteFallbackSuite.scala
@@ -14,21 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.{GlutenSQLTestsTrait, GlutenTestsCommonTrait}
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenV1WriteFallbackSuite extends V1WriteFallbackSuite with GlutenSQLTestsTrait {}
+
+class GlutenV1WriteFallbackSessionCatalogSuite
+ extends V1WriteFallbackSessionCatalogSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV2CommandsCaseSensitivitySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV2CommandsCaseSensitivitySuite.scala
index 7fe63d706e..b70ffdae15 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/connector/GlutenV2CommandsCaseSensitivitySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.connector
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenV2CommandsCaseSensitivitySuite
+ extends V2CommandsCaseSensitivitySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/errors/GlutenQueryContextSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/errors/GlutenQueryContextSuite.scala
index 7fe63d706e..ab3218961c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/errors/GlutenQueryContextSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.errors
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenQueryContextSuite extends QueryContextSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/errors/GlutenQueryExecutionAnsiErrorsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/errors/GlutenQueryExecutionAnsiErrorsSuite.scala
index 7fe63d706e..0cffc633fe 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/errors/GlutenQueryExecutionAnsiErrorsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.errors
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenQueryExecutionAnsiErrorsSuite
+ extends QueryExecutionAnsiErrorsSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenAggregatingAccumulatorSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenAggregatingAccumulatorSuite.scala
index 7fe63d706e..bca9d26d53 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenAggregatingAccumulatorSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAggregatingAccumulatorSuite
+ extends AggregatingAccumulatorSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenCoGroupedIteratorSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenCoGroupedIteratorSuite.scala
index 7fe63d706e..d078ce7e12 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenCoGroupedIteratorSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCoGroupedIteratorSuite extends CoGroupedIteratorSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenColumnarRulesSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenColumnarRulesSuite.scala
index 7fe63d706e..2ea1c9970d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenColumnarRulesSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenColumnarRulesSuite extends ColumnarRulesSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenDataSourceScanExecRedactionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenDataSourceScanExecRedactionSuite.scala
index 7fe63d706e..f3518c9a64 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenDataSourceScanExecRedactionSuite.scala
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceScanExecRedactionSuite
+ extends DataSourceScanExecRedactionSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenDataSourceV2ScanExecRedactionSuite
+ extends DataSourceV2ScanExecRedactionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenExecuteImmediateEndToEndSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenExecuteImmediateEndToEndSuite.scala
index 7fe63d706e..77790b94e6 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenExecuteImmediateEndToEndSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExecuteImmediateEndToEndSuite
+ extends ExecuteImmediateEndToEndSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenExternalAppendOnlyUnsafeRowArraySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenExternalAppendOnlyUnsafeRowArraySuite.scala
index 7fe63d706e..dd29023a5e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenExternalAppendOnlyUnsafeRowArraySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExternalAppendOnlyUnsafeRowArraySuite
+ extends ExternalAppendOnlyUnsafeRowArraySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenGlobalTempViewSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenGlobalTempViewSuite.scala
index 7fe63d706e..f687bb4a7e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenGlobalTempViewSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenGlobalTempViewSuite extends GlobalTempViewSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenGroupedIteratorSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenGroupedIteratorSuite.scala
index 7fe63d706e..9965a475e2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenGroupedIteratorSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenGroupedIteratorSuite extends GroupedIteratorSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenHiveResultSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenHiveResultSuite.scala
index 7fe63d706e..1d1fbbdb33 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenHiveResultSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenHiveResultSuite extends HiveResultSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenInsertSortForLimitAndOffsetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenInsertSortForLimitAndOffsetSuite.scala
index 7fe63d706e..8c8dfc5e2c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenInsertSortForLimitAndOffsetSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenInsertSortForLimitAndOffsetSuite
+ extends InsertSortForLimitAndOffsetSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenLogicalPlanTagInSparkPlanSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenLogicalPlanTagInSparkPlanSuite.scala
index 7fe63d706e..fdbd243f06 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenLogicalPlanTagInSparkPlanSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenLogicalPlanTagInSparkPlanSuite
+ extends LogicalPlanTagInSparkPlanSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenOptimizeMetadataOnlyQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenOptimizeMetadataOnlyQuerySuite.scala
index 7fe63d706e..dc9035d637 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenOptimizeMetadataOnlyQuerySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenOptimizeMetadataOnlyQuerySuite
+ extends OptimizeMetadataOnlyQuerySuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenPlannerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenPlannerSuite.scala
index 7fe63d706e..d604def90c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenPlannerSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPlannerSuite extends PlannerSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenProjectedOrderingAndPartitioningSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenProjectedOrderingAndPartitioningSuite.scala
index 7fe63d706e..30718b2d74 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenProjectedOrderingAndPartitioningSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenProjectedOrderingAndPartitioningSuite
+ extends ProjectedOrderingAndPartitioningSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenQueryPlanningTrackerEndToEndSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenQueryPlanningTrackerEndToEndSuite.scala
index 7fe63d706e..21781c935b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenQueryPlanningTrackerEndToEndSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenQueryPlanningTrackerEndToEndSuite
+ extends QueryPlanningTrackerEndToEndSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRemoveRedundantProjectsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRemoveRedundantProjectsSuite.scala
index 7fe63d706e..c809a5427f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRemoveRedundantProjectsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRemoveRedundantProjectsSuite
+ extends RemoveRedundantProjectsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRemoveRedundantSortsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRemoveRedundantSortsSuite.scala
index 7fe63d706e..8c78caa0d1 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRemoveRedundantSortsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRemoveRedundantSortsSuite
+ extends RemoveRedundantSortsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRowToColumnConverterSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRowToColumnConverterSuite.scala
index 7fe63d706e..73d65e76ed 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenRowToColumnConverterSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowToColumnConverterSuite
+ extends RowToColumnConverterSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLExecutionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLExecutionSuite.scala
index 7fe63d706e..ddf7bf2c3d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLExecutionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSQLExecutionSuite extends SQLExecutionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLFunctionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLFunctionSuite.scala
index 7fe63d706e..7d943f76b2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLFunctionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSQLFunctionSuite extends SQLFunctionSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLJsonProtocolSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLJsonProtocolSuite.scala
index 7fe63d706e..f0ce085f2c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLJsonProtocolSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSQLJsonProtocolSuite extends SQLJsonProtocolSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
index 7fe63d706e..c9e30b253f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewTestSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewTestSuite.scala
index 7fe63d706e..6fac2759b1 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewTestSuite.scala
@@ -14,21 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenLocalTempViewTestSuite extends LocalTempViewTestSuite with GlutenTestsCommonTrait {}
+
+class GlutenGlobalTempViewTestSuite extends GlobalTempViewTestSuite with GlutenTestsCommonTrait {}
+
+class GlutenPersistedViewTestSuite extends PersistedViewTestSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenShufflePartitionsUtilSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenShufflePartitionsUtilSuite.scala
index 7fe63d706e..e845dae849 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenShufflePartitionsUtilSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenShufflePartitionsUtilSuite
+ extends ShufflePartitionsUtilSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkPlanSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkPlanSuite.scala
index 7fe63d706e..a3f0a577d7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkPlanSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkPlanSuite extends SparkPlanSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkPlannerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkPlannerSuite.scala
index 7fe63d706e..5347059a16 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkPlannerSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkPlannerSuite extends SparkPlannerSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkScriptTransformationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkScriptTransformationSuite.scala
index 7fe63d706e..de77311a06 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkScriptTransformationSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkScriptTransformationSuite
+ extends SparkScriptTransformationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkSqlParserSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkSqlParserSuite.scala
index 7fe63d706e..d0ae94da0d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSparkSqlParserSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkSqlParserSuite extends SparkSqlParserSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeFixedWidthAggregationMapSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeFixedWidthAggregationMapSuite.scala
index 7fe63d706e..f121516095 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeFixedWidthAggregationMapSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnsafeFixedWidthAggregationMapSuite
+ extends UnsafeFixedWidthAggregationMapSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeKVExternalSorterSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeKVExternalSorterSuite.scala
index 7fe63d706e..0ec60fee84 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeKVExternalSorterSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnsafeKVExternalSorterSuite
+ extends UnsafeKVExternalSorterSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeRowSerializerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeRowSerializerSuite.scala
index 7fe63d706e..a8f414f607 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenUnsafeRowSerializerSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnsafeRowSerializerSuite extends UnsafeRowSerializerSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenWholeStageCodegenSparkSubmitSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenWholeStageCodegenSparkSubmitSuite.scala
index 7fe63d706e..2d1dc4e33d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenWholeStageCodegenSparkSubmitSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenWholeStageCodegenSparkSubmitSuite
+ extends WholeStageCodegenSparkSubmitSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenWholeStageCodegenSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenWholeStageCodegenSuite.scala
index 7fe63d706e..1a79a087be 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenWholeStageCodegenSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenWholeStageCodegenSuite extends WholeStageCodegenSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenBasicWriteJobStatsTrackerMetricSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenBasicWriteJobStatsTrackerMetricSuite.scala
index 7fe63d706e..7cdbceddb6 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenBasicWriteJobStatsTrackerMetricSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenBasicWriteJobStatsTrackerMetricSuite
+ extends BasicWriteJobStatsTrackerMetricSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenBasicWriteTaskStatsTrackerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenBasicWriteTaskStatsTrackerSuite.scala
index 7fe63d706e..a7b064c7fa 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenBasicWriteTaskStatsTrackerSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenBasicWriteTaskStatsTrackerSuite
+ extends BasicWriteTaskStatsTrackerSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenCustomWriteTaskStatsTrackerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenCustomWriteTaskStatsTrackerSuite.scala
index 7fe63d706e..4719fea2ce 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenCustomWriteTaskStatsTrackerSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCustomWriteTaskStatsTrackerSuite
+ extends CustomWriteTaskStatsTrackerSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenDataSourceManagerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenDataSourceManagerSuite.scala
index 7fe63d706e..d229c4d56e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenDataSourceManagerSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceManagerSuite extends DataSourceManagerSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenDataSourceResolverSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenDataSourceResolverSuite.scala
index 7fe63d706e..2e3eb9baae 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenDataSourceResolverSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceResolverSuite extends DataSourceResolverSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileResolverSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileResolverSuite.scala
index 7fe63d706e..d08d194bd1 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenFileResolverSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFileResolverSuite extends FileResolverSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenInMemoryTableMetricSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenInMemoryTableMetricSuite.scala
index 7fe63d706e..e3a334e702 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenInMemoryTableMetricSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenInMemoryTableMetricSuite extends InMemoryTableMetricSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenPushVariantIntoScanSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenPushVariantIntoScanSuite.scala
index 7fe63d706e..d80b6f8bb7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenPushVariantIntoScanSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPushVariantIntoScanSuite extends PushVariantIntoScanSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenRowDataSourceStrategySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenRowDataSourceStrategySuite.scala
index 7fe63d706e..b2540ca545 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenRowDataSourceStrategySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowDataSourceStrategySuite
+ extends RowDataSourceStrategySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenSaveIntoDataSourceCommandSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenSaveIntoDataSourceCommandSuite.scala
index 7fe63d706e..f4b580ec4a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/GlutenSaveIntoDataSourceCommandSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSaveIntoDataSourceCommandSuite
+ extends SaveIntoDataSourceCommandSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVParsingOptionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVParsingOptionsSuite.scala
index 7fe63d706e..5e08e18ce7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/csv/GlutenCSVParsingOptionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.csv
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCSVParsingOptionsSuite extends CSVParsingOptionsSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/json/GlutenJsonParsingOptionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/json/GlutenJsonParsingOptionsSuite.scala
index 7fe63d706e..944edf59de 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/json/GlutenJsonParsingOptionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.json
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenJsonParsingOptionsSuite extends JsonParsingOptionsSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcEncryptionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcEncryptionSuite.scala
index 7fe63d706e..6b608fbf46 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/orc/GlutenOrcEncryptionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.orc
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenOrcEncryptionSuite extends OrcEncryptionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetAvroCompatibilitySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetAvroCompatibilitySuite.scala
index 7fe63d706e..d1aaad52a1 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetAvroCompatibilitySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.parquet
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenParquetAvroCompatibilitySuite
+ extends ParquetAvroCompatibilitySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetCommitterSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetCommitterSuite.scala
index 7fe63d706e..8f8073a060 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetCommitterSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.parquet
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenParquetCommitterSuite extends ParquetCommitterSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFieldIdSchemaSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFieldIdSchemaSuite.scala
index 7fe63d706e..4669a9e1cb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFieldIdSchemaSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.parquet
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenParquetFieldIdSchemaSuite
+ extends ParquetFieldIdSchemaSuite
+ with GlutenTestsCommonTrait {}
diff --git a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala
index 3a039d975f..b6d6cb8b50 100644
--- a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala
@@ -22,6 +22,7 @@ import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.optimizer.InferFiltersFromConstraints
import org.apache.spark.sql.catalyst.planning.PhysicalOperation
+import org.apache.spark.sql.classic.ClassicColumn
import org.apache.spark.sql.classic.ClassicConversions._
import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.parseColumnPath
import org.apache.spark.sql.execution.datasources.{DataSourceStrategy, HadoopFsRelation, LogicalRelation, PushableColumnAndNestedColumn}
@@ -309,8 +310,8 @@ class GlutenParquetV1FilterSuite extends GlutenParquetFilterSuite with GlutenSQL
SQLConf.NESTED_PREDICATE_PUSHDOWN_FILE_SOURCE_LIST.key -> pushdownDsList
) {
val query = df
- .select(output.map(e => Column(e)): _*)
- .where(Column(predicate))
+ .select(output.map(e => ClassicColumn(e)): _*)
+ .where(ClassicColumn(predicate))
val nestedOrAttributes = predicate.collectFirst {
case g: GetStructField => g
@@ -395,8 +396,8 @@ class GlutenParquetV2FilterSuite extends GlutenParquetFilterSuite with GlutenSQL
SQLConf.PARQUET_VECTORIZED_READER_ENABLED.key -> "false"
) {
val query = df
- .select(output.map(e => Column(e)): _*)
- .where(Column(predicate))
+ .select(output.map(e => ClassicColumn(e)): _*)
+ .where(ClassicColumn(predicate))
query.queryExecution.optimizedPlan.collectFirst {
case PhysicalOperation(
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetTypeWideningSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetTypeWideningSuite.scala
index 7fe63d706e..2090b70f77 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetTypeWideningSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.parquet
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenParquetTypeWideningSuite extends ParquetTypeWideningSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetVariantShreddingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetVariantShreddingSuite.scala
index 7fe63d706e..ea9d5a7418 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetVariantShreddingSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.parquet
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenParquetVariantShreddingSuite
+ extends ParquetVariantShreddingSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/text/GlutenWholeTextFileSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/text/GlutenWholeTextFileSuite.scala
index 7fe63d706e..05ff73b560 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/text/GlutenWholeTextFileSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.text
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenWholeTextFileV1Suite extends WholeTextFileV1Suite with GlutenTestsCommonTrait {}
+
+class GlutenWholeTextFileV2Suite extends WholeTextFileV2Suite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/v2/GlutenFileWriterFactorySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/v2/GlutenFileWriterFactorySuite.scala
index 7fe63d706e..78e11b8606 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/v2/GlutenFileWriterFactorySuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.v2
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFileWriterFactorySuite extends FileWriterFactorySuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/v2/GlutenV2SessionCatalogSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/v2/GlutenV2SessionCatalogSuite.scala
index 7fe63d706e..c61f3015b4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/v2/GlutenV2SessionCatalogSuite.scala
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.datasources.v2
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenV2SessionCatalogTableSuite
+ extends V2SessionCatalogTableSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenV2SessionCatalogNamespaceSuite
+ extends V2SessionCatalogNamespaceSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/joins/GlutenHashedRelationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/joins/GlutenHashedRelationSuite.scala
index 7fe63d706e..ec2456a924 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/joins/GlutenHashedRelationSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.joins
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenHashedRelationSuite extends HashedRelationSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/joins/GlutenSingleJoinSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/joins/GlutenSingleJoinSuite.scala
index 7fe63d706e..876088a14b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/joins/GlutenSingleJoinSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.joins
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSingleJoinSuite extends SingleJoinSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/metric/GlutenCustomMetricsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/metric/GlutenCustomMetricsSuite.scala
index 7fe63d706e..ae79f1732b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/metric/GlutenCustomMetricsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.metric
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCustomMetricsSuite extends CustomMetricsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonDataSourceSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonDataSourceSuite.scala
index 7fe63d706e..3d3a7482f0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonDataSourceSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.python
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPythonDataSourceSuite extends PythonDataSourceSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonUDFSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonUDFSuite.scala
index 7fe63d706e..4738848937 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonUDFSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.python
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPythonUDFSuite extends PythonUDFSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonUDTFSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonUDTFSuite.scala
index 7fe63d706e..e9067eecd7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenPythonUDTFSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.python
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenSQLTestsTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+// TODO: 4.x extends PythonUDTFSuite, currently PythonUDTFSuite requires Python executable
+// [python3] and pyspark to be available, which are not present in the 4.0 CI environment.
+class GlutenPythonUDTFSuite extends GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenRowQueueSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenRowQueueSuite.scala
index 7fe63d706e..73daf08b4c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/python/GlutenRowQueueSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.execution.python
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowQueueSuite extends RowQueueSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedReadWithHiveSupportSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedReadWithHiveSupportSuite.scala
index 7fe63d706e..115f933638 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedReadWithHiveSupportSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenBucketedReadWithHiveSupportSuite
+ extends BucketedReadWithHiveSupportSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteWithHiveSupportSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteWithHiveSupportSuite.scala
index 7fe63d706e..0ccbb1cf43 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteWithHiveSupportSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenBucketedWriteWithHiveSupportSuite
+ extends BucketedWriteWithHiveSupportSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenCommitFailureTestRelationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenCommitFailureTestRelationSuite.scala
index 7fe63d706e..0b7232772f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenCommitFailureTestRelationSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCommitFailureTestRelationSuite
+ extends CommitFailureTestRelationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenDataSourceAnalysisSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenDataSourceAnalysisSuite.scala
index 7fe63d706e..d8b7868e7e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenDataSourceAnalysisSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataSourceAnalysisSuite extends DataSourceAnalysisSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite.scala
index 7fe63d706e..3ce4d072bc 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite
+ extends DisableUnnecessaryBucketedScanWithHiveSupportSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenJsonHadoopFsRelationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenJsonHadoopFsRelationSuite.scala
index 7fe63d706e..4bc841c4ad 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenJsonHadoopFsRelationSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenJsonHadoopFsRelationSuite
+ extends JsonHadoopFsRelationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenParquetHadoopFsRelationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenParquetHadoopFsRelationSuite.scala
index 7fe63d706e..8aef43c990 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenParquetHadoopFsRelationSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenParquetHadoopFsRelationSuite
+ extends ParquetHadoopFsRelationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenSimpleTextHadoopFsRelationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenSimpleTextHadoopFsRelationSuite.scala
index 7fe63d706e..40a99eb003 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenSimpleTextHadoopFsRelationSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.sources
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSimpleTextHadoopFsRelationSuite
+ extends SimpleTextHadoopFsRelationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenAcceptsLatestSeenOffsetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenAcceptsLatestSeenOffsetSuite.scala
index 7fe63d706e..564097fd33 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenAcceptsLatestSeenOffsetSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAcceptsLatestSeenOffsetSuite
+ extends AcceptsLatestSeenOffsetSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenCommitLogSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenCommitLogSuite.scala
index 7fe63d706e..f9c70019dd 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenCommitLogSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCommitLogSuite extends CommitLogSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenEventTimeWatermarkSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenEventTimeWatermarkSuite.scala
index 7fe63d706e..c2749c4fd5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenEventTimeWatermarkSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenEventTimeWatermarkSuite extends EventTimeWatermarkSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamSinkSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamSinkSuite.scala
index 7fe63d706e..c5843a6cbd 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamSinkSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFileStreamSinkV1Suite extends FileStreamSinkV1Suite with GlutenTestsCommonTrait {}
+
+class GlutenFileStreamSinkV2Suite extends FileStreamSinkV2Suite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamSourceSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamSourceSuite.scala
index 7fe63d706e..bc6a3c33d5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamSourceSuite.scala
@@ -14,21 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFileStreamSourceSuite extends FileStreamSourceSuite with GlutenTestsCommonTrait {}
+
+class GlutenFileStreamSourceStressTestSuite
+ extends FileStreamSourceStressTestSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamStressSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamStressSuite.scala
index 7fe63d706e..2f82fcc5a5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFileStreamStressSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFileStreamStressSuite extends FileStreamStressSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsInPandasWithStateDistributionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsInPandasWithStateDistributionSuite.scala
index 7fe63d706e..a8d2a5dfd0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsInPandasWithStateDistributionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFlatMapGroupsInPandasWithStateDistributionSuite
+ extends FlatMapGroupsInPandasWithStateDistributionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsInPandasWithStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsInPandasWithStateSuite.scala
index 7fe63d706e..4e63ee1d0a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsInPandasWithStateSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFlatMapGroupsInPandasWithStateSuite
+ extends FlatMapGroupsInPandasWithStateSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateDistributionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateDistributionSuite.scala
index 7fe63d706e..6c9f276beb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateDistributionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFlatMapGroupsWithStateDistributionSuite
+ extends FlatMapGroupsWithStateDistributionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateSuite.scala
index 7fe63d706e..0d351ecae3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateSuite.scala
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFlatMapGroupsWithStateSuite
+ extends FlatMapGroupsWithStateSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenRocksDBStateStoreFlatMapGroupsWithStateSuite
+ extends RocksDBStateStoreFlatMapGroupsWithStateSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateWithInitialStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateWithInitialStateSuite.scala
index 7fe63d706e..69a02981c9 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenFlatMapGroupsWithStateWithInitialStateSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenFlatMapGroupsWithStateWithInitialStateSuite
+ extends FlatMapGroupsWithStateWithInitialStateSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenGroupStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenGroupStateSuite.scala
index 7fe63d706e..dbcf873c13 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenGroupStateSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenGroupStateSuite extends GroupStateSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenMemorySourceStressSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenMemorySourceStressSuite.scala
index 7fe63d706e..c1d673239d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenMemorySourceStressSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenMemorySourceStressSuite extends MemorySourceStressSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenMultiStatefulOperatorsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenMultiStatefulOperatorsSuite.scala
index 7fe63d706e..e3d1d86774 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenMultiStatefulOperatorsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenMultiStatefulOperatorsSuite
+ extends MultiStatefulOperatorsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenOffsetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenOffsetSuite.scala
index 7fe63d706e..4d1eaf0a10 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenOffsetSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenLongOffsetSuite extends LongOffsetSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenReportSinkMetricsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenReportSinkMetricsSuite.scala
index 7fe63d706e..bbf6b2b82d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenReportSinkMetricsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenReportSinkMetricsSuite extends ReportSinkMetricsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamSuite.scala
index 7fe63d706e..56969369ff 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamSuite extends StreamSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingAggregationDistributionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingAggregationDistributionSuite.scala
index 7fe63d706e..3c7a04bd08 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingAggregationDistributionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingAggregationDistributionSuite
+ extends StreamingAggregationDistributionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingAggregationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingAggregationSuite.scala
index 7fe63d706e..a4a4e2cc8b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingAggregationSuite.scala
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingAggregationSuite
+ extends StreamingAggregationSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenRocksDBStateStoreStreamingAggregationSuite
+ extends RocksDBStateStoreStreamingAggregationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationDistributionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationDistributionSuite.scala
index 7fe63d706e..976f17f71b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationDistributionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingDeduplicationDistributionSuite
+ extends StreamingDeduplicationDistributionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationSuite.scala
index 7fe63d706e..568b0e3fd4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationSuite.scala
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingDeduplicationSuite
+ extends StreamingDeduplicationSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenRocksDBStateStoreStreamingDeduplicationSuite
+ extends RocksDBStateStoreStreamingDeduplicationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationWithinWatermarkSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationWithinWatermarkSuite.scala
index 7fe63d706e..712a8579d4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingDeduplicationWithinWatermarkSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingDeduplicationWithinWatermarkSuite
+ extends StreamingDeduplicationWithinWatermarkSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingJoinSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingJoinSuite.scala
index 7fe63d706e..9ec3fb5554 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingJoinSuite.scala
@@ -14,21 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingInnerJoinSuite extends StreamingInnerJoinSuite with GlutenTestsCommonTrait {}
+
+class GlutenStreamingOuterJoinSuite extends StreamingOuterJoinSuite with GlutenTestsCommonTrait {}
+
+class GlutenStreamingFullOuterJoinSuite
+ extends StreamingFullOuterJoinSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenStreamingLeftSemiJoinSuite
+ extends StreamingLeftSemiJoinSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryHashPartitionVerifySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryHashPartitionVerifySuite.scala
index 7fe63d706e..82dbf96c78 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryHashPartitionVerifySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingQueryHashPartitionVerifySuite
+ extends StreamingQueryHashPartitionVerifySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryListenerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryListenerSuite.scala
index 7fe63d706e..2cc5f46314 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryListenerSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingQueryListenerSuite
+ extends StreamingQueryListenerSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryListenersConfSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryListenersConfSuite.scala
index 7fe63d706e..a8602e22ff 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryListenersConfSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingQueryListenersConfSuite
+ extends StreamingQueryListenersConfSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryManagerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryManagerSuite.scala
index 7fe63d706e..cefba75532 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryManagerSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingQueryManagerSuite
+ extends StreamingQueryManagerSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryOptimizationCorrectnessSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryOptimizationCorrectnessSuite.scala
index 7fe63d706e..2de771cab3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryOptimizationCorrectnessSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingQueryOptimizationCorrectnessSuite
+ extends StreamingQueryOptimizationCorrectnessSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryStatusAndProgressSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryStatusAndProgressSuite.scala
index 7fe63d706e..4c4864003a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingQueryStatusAndProgressSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingQueryStatusAndProgressSuite
+ extends StreamingQueryStatusAndProgressSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSelfUnionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSelfUnionSuite.scala
index 7fe63d706e..d9adca29a0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSelfUnionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingSelfUnionSuite extends StreamingSelfUnionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSessionWindowDistributionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSessionWindowDistributionSuite.scala
index 7fe63d706e..31fc7ee00f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSessionWindowDistributionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingSessionWindowDistributionSuite
+ extends StreamingSessionWindowDistributionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSessionWindowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSessionWindowSuite.scala
index 7fe63d706e..b3db44928b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSessionWindowSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingSessionWindowSuite
+ extends StreamingSessionWindowSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingStateStoreFormatCompatibilitySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingStateStoreFormatCompatibilitySuite.scala
index 7fe63d706e..e9d4f77874 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingStateStoreFormatCompatibilitySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingStateStoreFormatCompatibilitySuite
+ extends StreamingStateStoreFormatCompatibilitySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSymmetricHashJoinHelperSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSymmetricHashJoinHelperSuite.scala
index 7fe63d706e..510e5059c2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenStreamingSymmetricHashJoinHelperSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenStreamingSymmetricHashJoinHelperSuite
+ extends StreamingSymmetricHashJoinHelperSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithListStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithListStateSuite.scala
index 7fe63d706e..8ff76807b8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithListStateSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithListStateSuite
+ extends TransformWithListStateSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithListStateTTLSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithListStateTTLSuite.scala
index 7fe63d706e..1ffdbce75e 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithListStateTTLSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithListStateTTLSuite
+ extends TransformWithListStateTTLSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithMapStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithMapStateSuite.scala
index 7fe63d706e..f75026870a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithMapStateSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithMapStateSuite
+ extends TransformWithMapStateSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithMapStateTTLSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithMapStateTTLSuite.scala
index 7fe63d706e..d04cef1016 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithMapStateTTLSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithMapStateTTLSuite
+ extends TransformWithMapStateTTLSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateAvroSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateAvroSuite.scala
index 7fe63d706e..677e468707 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateAvroSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithStateAvroSuite
+ extends TransformWithStateAvroSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateChainingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateChainingSuite.scala
index 7fe63d706e..a7ddb1b16f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateChainingSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithStateChainingSuite
+ extends TransformWithStateChainingSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateClusterSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateClusterSuite.scala
index 7fe63d706e..56abdd85c3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateClusterSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithStateClusterSuite
+ extends TransformWithStateClusterSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateInitialStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateInitialStateSuite.scala
index 7fe63d706e..00e2e4b41b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateInitialStateSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithStateInitialStateSuite
+ extends TransformWithStateInitialStateSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateSuite.scala
index 7fe63d706e..590630208d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithStateValidationSuite
+ extends TransformWithStateValidationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateUnsafeRowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateUnsafeRowSuite.scala
index 7fe63d706e..ce82e3b378 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithStateUnsafeRowSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithStateUnsafeRowSuite
+ extends TransformWithStateUnsafeRowSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithValueStateTTLSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithValueStateTTLSuite.scala
index 7fe63d706e..6304aec025 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTransformWithValueStateTTLSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTransformWithValueStateTTLSuite
+ extends TransformWithValueStateTTLSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTriggerAvailableNowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTriggerAvailableNowSuite.scala
index 7fe63d706e..11444794f2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/streaming/GlutenTriggerAvailableNowSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.streaming
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTriggerAvailableNowSuite extends TriggerAvailableNowSuite with GlutenTestsCommonTrait {}
diff --git a/gluten-ut/spark41/pom.xml b/gluten-ut/spark41/pom.xml
index 838649a21d..c3de20267d 100644
--- a/gluten-ut/spark41/pom.xml
+++ b/gluten-ut/spark41/pom.xml
@@ -14,6 +14,8 @@
<properties>
<parquet.version>1.16.0</parquet.version>
+ <parquet.test.deps.scope>test</parquet.test.deps.scope>
+ <avro.version>1.12.1</avro.version>
</properties>
<dependencies>
@@ -29,14 +31,36 @@
<artifactId>parquet-column</artifactId>
<version>${parquet.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
+ <scope>${parquet.test.deps.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
<version>${parquet.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
+ <scope>${parquet.test.deps.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-avro</artifactId>
+ <version>${parquet.version}</version>
+ <scope>${parquet.test.deps.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ <scope>${parquet.test.deps.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 584701e0ff..5598bbb1fd 100644
--- a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -23,20 +23,20 @@ import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.aggregate
import org.apache.spark.sql.connector._
-import org.apache.spark.sql.errors.{GlutenQueryCompilationErrorsDSv2Suite, GlutenQueryCompilationErrorsSuite, GlutenQueryExecutionErrorsSuite, GlutenQueryParsingErrorsSuite}
+import org.apache.spark.sql.errors._
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive.velox.VeloxAdaptiveQueryExecSuite
import org.apache.spark.sql.execution.datasources._
import org.apache.spark.sql.execution.datasources.binaryfile.GlutenBinaryFileFormatSuite
-import org.apache.spark.sql.execution.datasources.csv.{GlutenCSVLegacyTimeParserSuite, GlutenCSVv1Suite, GlutenCSVv2Suite}
-import org.apache.spark.sql.execution.datasources.json.{GlutenJsonLegacyTimeParserSuite, GlutenJsonV1Suite, GlutenJsonV2Suite}
+import org.apache.spark.sql.execution.datasources.csv._
+import org.apache.spark.sql.execution.datasources.json._
import org.apache.spark.sql.execution.datasources.orc._
import org.apache.spark.sql.execution.datasources.parquet._
-import org.apache.spark.sql.execution.datasources.text.{GlutenTextV1Suite, GlutenTextV2Suite}
+import org.apache.spark.sql.execution.datasources.text._
import org.apache.spark.sql.execution.datasources.v2._
import org.apache.spark.sql.execution.exchange.{GlutenEnsureRequirementsSuite, GlutenValidateRequirementsSuite}
import org.apache.spark.sql.execution.joins._
-import org.apache.spark.sql.execution.metric.GlutenSQLMetricsSuite
+import org.apache.spark.sql.execution.metric.{GlutenCustomMetricsSuite, GlutenSQLMetricsSuite}
import org.apache.spark.sql.execution.python._
import org.apache.spark.sql.extension.{GlutenCollapseProjectExecTransformerSuite, GlutenSessionExtensionSuite, TestFileSourceScanExecTransformer}
import org.apache.spark.sql.gluten.{GlutenFallbackStrategiesSuite, GlutenFallbackSuite}
@@ -87,15 +87,18 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSupportsCatalogOptionsSuite]
enableSuite[GlutenTableCapabilityCheckSuite]
enableSuite[GlutenWriteDistributionAndOrderingSuite]
- enableSuite[GlutenQueryCompilationErrorsDSv2Suite]
- enableSuite[GlutenQueryCompilationErrorsSuite]
- enableSuite[GlutenQueryExecutionErrorsSuite]
- // NEW SUITE: disable as it expects exception which doesn't happen when offloaded to gluten
- .exclude(
- "INCONSISTENT_BEHAVIOR_CROSS_VERSION: compatibility with Spark 2.4/3.2 in reading/writing dates")
- // Doesn't support unhex with failOnError=true.
- .exclude("CONVERSION_INVALID_INPUT: to_binary conversion function hex")
- enableSuite[GlutenQueryParsingErrorsSuite]
+ // Generated suites for org.apache.spark.sql.catalyst.expressions.aggregate
+ enableSuite[aggregate.GlutenAggregateExpressionSuite]
+ enableSuite[aggregate.GlutenApproxCountDistinctForIntervalsSuite]
+ enableSuite[aggregate.GlutenApproximatePercentileSuite]
+ enableSuite[aggregate.GlutenCountMinSketchAggSuite]
+ enableSuite[aggregate.GlutenDatasketchesHllSketchSuite]
+ enableSuite[aggregate.GlutenFirstLastTestSuite]
+ enableSuite[aggregate.GlutenHistogramNumericSuite]
+ enableSuite[aggregate.GlutenHyperLogLogPlusPlusSuite]
+ enableSuite[aggregate.GlutenCentralMomentAggSuite]
+ enableSuite[aggregate.GlutenCovarianceAggSuite]
+ enableSuite[aggregate.GlutenProductAggSuite] // to avoid conflict with sql.GlutenProductAggSuite
enableSuite[GlutenArithmeticExpressionSuite]
.exclude("SPARK-45786: Decimal multiply, divide, remainder, quot")
enableSuite[GlutenAttributeMapSuite]
@@ -215,6 +218,68 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenStringExpressionsSuite]
enableSuite[GlutenTimeExpressionsSuite]
enableSuite[GlutenTryEvalSuite]
+ // Generated suites for org.apache.spark.sql.catalyst.expressions
+ enableSuite[GlutenAttributeResolutionSuite]
+ enableSuite[GlutenAttributeSetSuite]
+ enableSuite[GlutenBitmapExpressionUtilsSuite]
+ enableSuite[GlutenCallMethodViaReflectionSuite]
+ enableSuite[GlutenCanonicalizeSuite]
+ enableSuite[GlutenCastWithAnsiOnSuite]
+ enableSuite[GlutenCodeGenerationSuite]
+ enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
+ enableSuite[GlutenCollationExpressionSuite]
+ enableSuite[GlutenCollationRegexpExpressionsSuite]
+ enableSuite[GlutenCsvExpressionsSuite]
+ enableSuite[GlutenDynamicPruningSubquerySuite]
+ enableSuite[GlutenExprIdSuite]
+ enableSuite[GlutenExpressionEvalHelperSuite]
+ enableSuite[GlutenExpressionImplUtilsSuite]
+ enableSuite[GlutenExpressionSQLBuilderSuite]
+ enableSuite[GlutenExpressionSetSuite]
+ enableSuite[GlutenExtractPredicatesWithinOutputSetSuite]
+ enableSuite[GlutenHexSuite]
+ enableSuite[GlutenMutableProjectionSuite]
+ enableSuite[GlutenNamedExpressionSuite]
+ enableSuite[GlutenObjectExpressionsSuite]
+ enableSuite[GlutenOrderingSuite]
+ enableSuite[GlutenScalaUDFSuite]
+ enableSuite[GlutenSchemaPruningSuite]
+ enableSuite[GlutenSelectedFieldSuite]
+ // GlutenSubExprEvaluationRuntimeSuite is removed because SubExprEvaluationRuntimeSuite
+ // is in test-jar without shaded Guava, while SubExprEvaluationRuntime is shaded.
+ enableSuite[GlutenSubexpressionEliminationSuite]
+ enableSuite[GlutenTimeWindowSuite]
+ enableSuite[GlutenToPrettyStringSuite]
+ enableSuite[GlutenUnsafeRowConverterSuite]
+ enableSuite[GlutenUnwrapUDTExpressionSuite]
+ enableSuite[GlutenV2ExpressionUtilsSuite]
+ enableSuite[GlutenValidateExternalTypeSuite]
+ // TODO: 4.x enableSuite[GlutenXmlExpressionsSuite] // 7 failures
+ // Generated suites for org.apache.spark.sql.connector
+ enableSuite[GlutenDataSourceV2MetricsSuite]
+ enableSuite[GlutenDataSourceV2OptionSuite]
+ enableSuite[GlutenDataSourceV2UtilsSuite]
+ // TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenMergeIntoDataFrameSuite] // 1 failure
+ enableSuite[GlutenProcedureSuite]
+ enableSuite[GlutenPushablePredicateSuite]
+ enableSuite[GlutenV1ReadFallbackWithCatalogSuite]
+ enableSuite[GlutenV1ReadFallbackWithDataFrameReaderSuite]
+ enableSuite[GlutenV1WriteFallbackSessionCatalogSuite]
+ enableSuite[GlutenV1WriteFallbackSuite]
+ enableSuite[GlutenV2CommandsCaseSensitivitySuite]
+ // Generated suites for org.apache.spark.sql.errors
+ enableSuite[GlutenQueryCompilationErrorsDSv2Suite]
+ enableSuite[GlutenQueryCompilationErrorsSuite]
+ enableSuite[GlutenQueryExecutionErrorsSuite]
+ // NEW SUITE: disable as it expects exception which doesn't happen when offloaded to gluten
+ .exclude(
+ "INCONSISTENT_BEHAVIOR_CROSS_VERSION: compatibility with Spark 2.4/3.2 in reading/writing dates")
+ // Doesn't support unhex with failOnError=true.
+ .exclude("CONVERSION_INVALID_INPUT: to_binary conversion function hex")
+ enableSuite[GlutenQueryParsingErrorsSuite]
+ enableSuite[GlutenQueryContextSuite]
+ enableSuite[GlutenQueryExecutionAnsiErrorsSuite]
enableSuite[VeloxAdaptiveQueryExecSuite]
.includeAllGlutenTests()
.includeByPrefix(
@@ -248,6 +313,36 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenBinaryFileFormatSuite]
// Exception.
.exclude("column pruning - non-readable file")
+ // Generated suites for org.apache.spark.sql.execution.datasources
+ enableSuite[GlutenBasicWriteJobStatsTrackerMetricSuite]
+ enableSuite[GlutenBasicWriteTaskStatsTrackerSuite]
+ enableSuite[GlutenCustomWriteTaskStatsTrackerSuite]
+ enableSuite[GlutenDataSourceManagerSuite]
+ enableSuite[GlutenDataSourceResolverSuite]
+ enableSuite[GlutenFileResolverSuite]
+ enableSuite[GlutenInMemoryTableMetricSuite]
+ enableSuite[GlutenPushVariantIntoScanSuite]
+ enableSuite[GlutenRowDataSourceStrategySuite]
+ enableSuite[GlutenSaveIntoDataSourceCommandSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.csv
+ enableSuite[GlutenCSVParsingOptionsSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.json
+ enableSuite[GlutenJsonParsingOptionsSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.orc
+ enableSuite[GlutenOrcEncryptionSuite]
+ // Generated suites for org.apache.spark.sql.execution.datasources.parquet
+ enableSuite[GlutenParquetAvroCompatibilitySuite]
+ enableSuite[GlutenParquetCommitterSuite]
+ enableSuite[GlutenParquetFieldIdSchemaSuite]
+ // TODO: 4.x enableSuite[GlutenParquetTypeWideningSuite] // 74 failures - MAJOR ISSUE
+ // TODO: 4.x enableSuite[GlutenParquetVariantShreddingSuite] // 1 failure
+ // Generated suites for org.apache.spark.sql.execution.datasources.text
+ // TODO: 4.x enableSuite[GlutenWholeTextFileV1Suite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenWholeTextFileV2Suite] // 1 failure
+ // Generated suites for org.apache.spark.sql.execution.datasources.v2
+ enableSuite[GlutenFileWriterFactorySuite]
+ enableSuite[GlutenV2SessionCatalogNamespaceSuite]
+ enableSuite[GlutenV2SessionCatalogTableSuite]
enableSuite[GlutenCSVv1Suite]
enableSuite[GlutenCSVv2Suite]
// https://github.com/apache/incubator-gluten/issues/11505
@@ -546,13 +641,51 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("Shouldn't bias towards build right if user didn't specify")
.exclude("SPARK-23192: broadcast hint should be retained after using the cached data")
.exclude("broadcast join where streamed side's output partitioning is HashPartitioning")
-
+ enableSuite[GlutenHashedRelationSuite]
+ enableSuite[GlutenSingleJoinSuite]
enableSuite[GlutenExistenceJoinSuite]
enableSuite[GlutenInnerJoinSuiteForceShjOn]
enableSuite[GlutenInnerJoinSuiteForceShjOff]
enableSuite[GlutenOuterJoinSuiteForceShjOn]
enableSuite[GlutenOuterJoinSuiteForceShjOff]
enableSuite[GlutenFallbackStrategiesSuite]
+ // Generated suites for org.apache.spark.sql.execution
+ enableSuite[GlutenAggregatingAccumulatorSuite]
+ enableSuite[GlutenCoGroupedIteratorSuite]
+ enableSuite[GlutenColumnarRulesSuite]
+ enableSuite[GlutenDataSourceScanExecRedactionSuite]
+ enableSuite[GlutenDataSourceV2ScanExecRedactionSuite]
+ enableSuite[GlutenExecuteImmediateEndToEndSuite]
+ enableSuite[GlutenExternalAppendOnlyUnsafeRowArraySuite]
+ enableSuite[GlutenGlobalTempViewSuite]
+ enableSuite[GlutenGlobalTempViewTestSuite]
+ enableSuite[GlutenGroupedIteratorSuite]
+ enableSuite[GlutenHiveResultSuite]
+ // TODO: 4.x enableSuite[GlutenInsertSortForLimitAndOffsetSuite] // 6 failures
+ enableSuite[GlutenLocalTempViewTestSuite]
+ enableSuite[GlutenLogicalPlanTagInSparkPlanSuite]
+ enableSuite[GlutenOptimizeMetadataOnlyQuerySuite]
+ enableSuite[GlutenPersistedViewTestSuite]
+ // TODO: 4.x enableSuite[GlutenPlannerSuite] // 1 failure
+ enableSuite[GlutenProjectedOrderingAndPartitioningSuite]
+ enableSuite[GlutenQueryPlanningTrackerEndToEndSuite]
+ enableSuite[GlutenRemoveRedundantProjectsSuite]
+ // TODO: 4.x enableSuite[GlutenRemoveRedundantSortsSuite] // 1 failure
+ enableSuite[GlutenRowToColumnConverterSuite]
+ enableSuite[GlutenSQLExecutionSuite]
+ enableSuite[GlutenSQLFunctionSuite]
+ enableSuite[GlutenSQLJsonProtocolSuite]
+ enableSuite[GlutenShufflePartitionsUtilSuite]
+ enableSuite[GlutenSimpleSQLViewSuite]
+ // TODO: 4.x enableSuite[GlutenSparkPlanSuite] // 1 failure
+ enableSuite[GlutenSparkPlannerSuite]
+ enableSuite[GlutenSparkScriptTransformationSuite]
+ enableSuite[GlutenSparkSqlParserSuite]
+ enableSuite[GlutenUnsafeFixedWidthAggregationMapSuite]
+ enableSuite[GlutenUnsafeKVExternalSorterSuite]
+ enableSuite[GlutenUnsafeRowSerializerSuite]
+ // TODO: 4.x enableSuite[GlutenWholeStageCodegenSparkSubmitSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenWholeStageCodegenSuite] // 24 failures
enableSuite[GlutenBroadcastExchangeSuite]
.exclude("SPARK-52962: broadcast exchange should not reset metrics") // Add Gluten test
enableSuite[GlutenLocalBroadcastExchangeSuite]
@@ -600,7 +733,7 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-32767 Bucket join should work if SHUFFLE_PARTITIONS larger than bucket number")
.exclude("bucket coalescing eliminates shuffle")
.exclude("bucket coalescing is not satisfied")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("disable bucketing when the output doesn't contain all bucketing columns")
.excludeByPrefix("bucket coalescing is applied when join expressions match")
enableSuite[GlutenBucketedWriteWithoutHiveSupportSuite]
@@ -634,6 +767,61 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenResolvedDataSourceSuite]
enableSuite[GlutenSaveLoadSuite]
enableSuite[GlutenTableScanSuite]
+ // Generated suites for org.apache.spark.sql.sources
+ // TODO: 4.x enableSuite[GlutenBucketedReadWithHiveSupportSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenBucketedWriteWithHiveSupportSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenCommitFailureTestRelationSuite] // 2 failures
+ enableSuite[GlutenDataSourceAnalysisSuite]
+ // TODO: 4.x enableSuite[GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenJsonHadoopFsRelationSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenParquetHadoopFsRelationSuite] // 2 failures
+ // TODO: 4.x enableSuite[GlutenSimpleTextHadoopFsRelationSuite] // 2 failures
+ // Generated suites for org.apache.spark.sql
+ enableSuite[GlutenCacheManagerSuite]
+ enableSuite[GlutenDataFrameShowSuite]
+ // TODO: 4.x enableSuite[GlutenDataFrameSubquerySuite] // 1 failure
+ enableSuite[GlutenDataFrameTableValuedFunctionsSuite]
+ enableSuite[GlutenDataFrameTransposeSuite]
+ // TODO: 4.x enableSuite[GlutenExplainSuite] // 1 failure
+ enableSuite[GlutenICUCollationsMapSuite]
+ enableSuite[GlutenInlineTableParsingImprovementsSuite]
+ enableSuite[GlutenJoinHintSuite]
+ // TODO: 4.x enableSuite[GlutenLogQuerySuite] // 2 failures
+ enableSuite[GlutenPercentileQuerySuite]
+ enableSuite[GlutenRandomDataGeneratorSuite]
+ enableSuite[GlutenRowJsonSuite]
+ enableSuite[GlutenRowSuite]
+ enableSuite[GlutenRuntimeConfigSuite]
+ enableSuite[GlutenSSBQuerySuite]
+ enableSuite[GlutenSessionStateSuite]
+ // TODO: 4.x enableSuite[GlutenSetCommandSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenSingleLevelAggregateHashMapSuite] // 1 failure
+ enableSuite[GlutenSparkSessionBuilderSuite]
+ // TODO: 4.x enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite] // 1 failure
+ enableSuite[GlutenTPCDSCollationQueryTestSuite]
+ enableSuite[GlutenTPCDSModifiedPlanStabilitySuite]
+ enableSuite[GlutenTPCDSModifiedPlanStabilityWithStatsSuite]
+ enableSuite[GlutenTPCDSQueryANSISuite]
+ enableSuite[GlutenTPCDSQuerySuite]
+ enableSuite[GlutenTPCDSQueryTestSuite]
+ enableSuite[GlutenTPCDSQueryWithStatsSuite]
+ enableSuite[GlutenTPCDSV1_4_PlanStabilitySuite]
+ enableSuite[GlutenTPCDSV1_4_PlanStabilityWithStatsSuite]
+ enableSuite[GlutenTPCDSV2_7_PlanStabilitySuite]
+ enableSuite[GlutenTPCDSV2_7_PlanStabilityWithStatsSuite]
+ enableSuite[GlutenTPCHPlanStabilitySuite]
+ enableSuite[GlutenTPCHQuerySuite]
+ // TODO: 4.x enableSuite[GlutenTwoLevelAggregateHashMapSuite] // 1 failure
+ // TODO: 4.x enableSuite[GlutenTwoLevelAggregateHashMapWithVectorizedMapSuite] // 1 failure
+ enableSuite[GlutenUDFSuite]
+ enableSuite[GlutenUDTRegistrationSuite]
+ enableSuite[GlutenUnsafeRowSuite]
+ enableSuite[GlutenUserDefinedTypeSuite]
+ // TODO: 4.x enableSuite[GlutenVariantEndToEndSuite] // 3 failures
+ // TODO: 4.x enableSuite[GlutenVariantShreddingSuite] // 8 failures
+ enableSuite[GlutenVariantSuite]
+ enableSuite[GlutenVariantWriteShreddingSuite]
+ // TODO: 4.x enableSuite[GlutenXmlFunctionsSuite] // 10 failures
enableSuite[GlutenApproxCountDistinctForIntervalsQuerySuite]
enableSuite[GlutenAddMetadataColumnsSuite]
enableSuite[GlutenAlwaysPersistedConfigsSuite]
@@ -789,11 +977,11 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-31116: Select nested schema with case insensitive mode")
// exclude as original metric not correct when task offloaded to velox
.exclude("SPARK-37585: test input metrics for DSV2 with output limits")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("File source v2: support passing data filters to FileScan without partitionFilters")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("File source v2: support partition pruning")
- // DISABLED: GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
+ // GLUTEN-4893 Vanilla UT checks scan operator by exactly matching the class type
.exclude("SPARK-41017: filter pushdown with nondeterministic predicates")
enableSuite[GlutenFileScanSuite]
enableSuite[GlutenGeneratorFunctionSuite]
@@ -916,6 +1104,11 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenTableLocationSuite]
enableSuite[GlutenRemoveRedundantWindowGroupLimitsSuite]
enableSuite[GlutenSQLCollectLimitExecSuite]
+ // Generated suites for org.apache.spark.sql.execution.python
+ // TODO: 4.x enableSuite[GlutenPythonDataSourceSuite]
+ // TODO: 4.x enableSuite[GlutenPythonUDFSuite]
+ // TODO: 4.x enableSuite[GlutenPythonUDTFSuite]
+ // TODO: 4.x enableSuite[GlutenRowQueueSuite]
enableSuite[GlutenBatchEvalPythonExecSuite]
// Replaced with other tests that check for native operations
.exclude("Python UDF: push down deterministic FilterExec predicates")
@@ -966,7 +1159,63 @@ class VeloxTestSettings extends BackendTestSettings {
// The case doesn't need to be run in Gluten since it's verifying against
// vanilla Spark's query plan.
.exclude("SPARK-47289: extended explain info")
+ enableSuite[GlutenCustomMetricsSuite]
enableSuite[GlutenSQLMetricsSuite]
+ enableSuite[GlutenAcceptsLatestSeenOffsetSuite]
+ enableSuite[GlutenCommitLogSuite]
+ // TODO: 4.x enableSuite[GlutenEventTimeWatermarkSuite]
+ enableSuite[GlutenFileStreamSinkV1Suite]
+ enableSuite[GlutenFileStreamSinkV2Suite]
+ enableSuite[GlutenFileStreamSourceStressTestSuite]
+ // TODO: 4.x enableSuite[GlutenFileStreamSourceSuite]
+ enableSuite[GlutenFileStreamStressSuite]
+ enableSuite[GlutenFlatMapGroupsInPandasWithStateDistributionSuite]
+ enableSuite[GlutenFlatMapGroupsInPandasWithStateSuite]
+ // TODO: 4.x enableSuite[GlutenFlatMapGroupsWithStateDistributionSuite]
+ // TODO: 4.x enableSuite[GlutenFlatMapGroupsWithStateSuite]
+ enableSuite[GlutenFlatMapGroupsWithStateWithInitialStateSuite]
+ enableSuite[GlutenGroupStateSuite]
+ enableSuite[GlutenLongOffsetSuite]
+ enableSuite[GlutenMemorySourceStressSuite]
+ enableSuite[GlutenMultiStatefulOperatorsSuite]
+ enableSuite[GlutenReportSinkMetricsSuite]
+ // TODO: 4.x enableSuite[GlutenRocksDBStateStoreFlatMapGroupsWithStateSuite]
+ // TODO: 4.x enableSuite[GlutenRocksDBStateStoreStreamingAggregationSuite]
+ // TODO: 4.x enableSuite[GlutenRocksDBStateStoreStreamingDeduplicationSuite]
+ // TODO: 4.x enableSuite[GlutenStreamSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingAggregationDistributionSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingAggregationSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingDeduplicationDistributionSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingDeduplicationSuite]
+ enableSuite[GlutenStreamingDeduplicationWithinWatermarkSuite]
+ enableSuite[GlutenStreamingFullOuterJoinSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingInnerJoinSuite]
+ enableSuite[GlutenStreamingLeftSemiJoinSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingOuterJoinSuite]
+ enableSuite[GlutenStreamingQueryHashPartitionVerifySuite]
+ enableSuite[GlutenStreamingQueryListenerSuite]
+ enableSuite[GlutenStreamingQueryListenersConfSuite]
+ enableSuite[GlutenStreamingQueryManagerSuite]
+ enableSuite[GlutenStreamingQueryOptimizationCorrectnessSuite]
+ enableSuite[GlutenStreamingQueryStatusAndProgressSuite]
+ enableSuite[GlutenStreamingSelfUnionSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingSessionWindowDistributionSuite]
+ enableSuite[GlutenStreamingSessionWindowSuite]
+ // TODO: 4.x enableSuite[GlutenStreamingStateStoreFormatCompatibilitySuite]
+ enableSuite[GlutenStreamingSymmetricHashJoinHelperSuite]
+ enableSuite[GlutenTransformWithListStateSuite]
+ enableSuite[GlutenTransformWithListStateTTLSuite]
+ enableSuite[GlutenTransformWithMapStateSuite]
+ enableSuite[GlutenTransformWithMapStateTTLSuite]
+ enableSuite[GlutenTransformWithStateAvroSuite]
+ enableSuite[GlutenTransformWithStateChainingSuite]
+ enableSuite[GlutenTransformWithStateClusterSuite]
+ enableSuite[GlutenTransformWithStateInitialStateSuite]
+ enableSuite[GlutenTransformWithStateUnsafeRowSuite]
+ enableSuite[GlutenTransformWithStateValidationSuite]
+ enableSuite[GlutenTransformWithValueStateTTLSuite]
+ enableSuite[GlutenTriggerAvailableNowSuite]
+
override def getSQLQueryTestSettings: SQLQueryTestSettings = VeloxSQLQueryTestSettings
}
// scalastyle:on line.size.limit
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenAggregateHashMapSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenAggregateHashMapSuite.scala
index 7fe63d706e..3f576c9c1a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenAggregateHashMapSuite.scala
@@ -14,21 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+class GlutenSingleLevelAggregateHashMapSuite
+ extends SingleLevelAggregateHashMapSuite
+ with GlutenTestsCommonTrait {}
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTwoLevelAggregateHashMapSuite
+ extends TwoLevelAggregateHashMapSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTwoLevelAggregateHashMapWithVectorizedMapSuite
+ extends TwoLevelAggregateHashMapWithVectorizedMapSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala
index 7fe63d706e..e41b03f921 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCacheManagerSuite extends CacheManagerSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameShowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameShowSuite.scala
index 7fe63d706e..4921ea2a0c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameShowSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameShowSuite extends DataFrameShowSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameSubquerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameSubquerySuite.scala
index 7fe63d706e..b333dd8f1a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameSubquerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameSubquerySuite extends DataFrameSubquerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameTableValuedFunctionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameTableValuedFunctionsSuite.scala
index 7fe63d706e..f7e1b90dbc 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameTableValuedFunctionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameTableValuedFunctionsSuite
+ extends DataFrameTableValuedFunctionsSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameTransposeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameTransposeSuite.scala
index 7fe63d706e..8f9af2317b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenDataFrameTransposeSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDataFrameTransposeSuite extends DataFrameTransposeSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala
index 7fe63d706e..575c7f58b0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExplainSuite extends ExplainSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala
index 7fe63d706e..5782014ad2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenICUCollationsMapSuite extends ICUCollationsMapSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenInlineTableParsingImprovementsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenInlineTableParsingImprovementsSuite.scala
index 7fe63d706e..9eadb26c65 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenInlineTableParsingImprovementsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenInlineTableParsingImprovementsSuite
+ extends InlineTableParsingImprovementsSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala
index 7fe63d706e..9359701d66 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenJoinHintSuite extends JoinHintSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenLogQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenLogQuerySuite.scala
index 7fe63d706e..634da8516f 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenLogQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenLogQuerySuite extends LogQuerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenPercentileQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenPercentileQuerySuite.scala
index 7fe63d706e..495dfc23ef 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenPercentileQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenPercentileQuerySuite extends PercentileQuerySuite with GlutenSQLTestsTrait {}
diff --git a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenPlanStabilitySuite.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenPlanStabilitySuite.scala
new file mode 100644
index 0000000000..8eaa795090
--- /dev/null
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenPlanStabilitySuite.scala
@@ -0,0 +1,43 @@
+/*
+ * 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.spark.sql
+
+class GlutenTPCDSV1_4_PlanStabilitySuite
+ extends TPCDSV1_4_PlanStabilitySuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSV1_4_PlanStabilityWithStatsSuite
+ extends TPCDSV1_4_PlanStabilityWithStatsSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSV2_7_PlanStabilitySuite
+ extends TPCDSV2_7_PlanStabilitySuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSV2_7_PlanStabilityWithStatsSuite
+ extends TPCDSV2_7_PlanStabilityWithStatsSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSModifiedPlanStabilitySuite
+ extends TPCDSModifiedPlanStabilitySuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSModifiedPlanStabilityWithStatsSuite
+ extends TPCDSModifiedPlanStabilityWithStatsSuite
+ with GlutenTestsCommonTrait {}
+
+class GlutenTPCHPlanStabilitySuite extends TPCHPlanStabilitySuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala
index 7fe63d706e..7650aa6dc7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRandomDataGeneratorSuite extends RandomDataGeneratorSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala
index 7fe63d706e..50ed512b5c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowJsonSuite extends RowJsonSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala
index 7fe63d706e..2fecc00415 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRowSuite extends RowSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala
index 7fe63d706e..390f2cadc0 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenRuntimeConfigSuite extends RuntimeConfigSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSSBQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSSBQuerySuite.scala
index 7fe63d706e..13ad1f127b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSSBQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSSBQuerySuite extends SSBQuerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala
index 7fe63d706e..77443c2554 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSessionStateSuite extends SessionStateSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSetCommandSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSetCommandSuite.scala
index 7fe63d706e..ab5c2e43cb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSetCommandSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSetCommandSuite extends SetCommandSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala
index 7fe63d706e..de4af1063b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkSessionBuilderSuite extends SparkSessionBuilderSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala
index 7fe63d706e..bf1321c34d 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenSparkSessionJobTaggingAndCancellationSuite
+ extends SparkSessionJobTaggingAndCancellationSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSCollationQueryTestSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSCollationQueryTestSuite.scala
index 7fe63d706e..f475a6e0a2 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSCollationQueryTestSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCDSCollationQueryTestSuite
+ extends TPCDSCollationQueryTestSuite
+ with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSQuerySuite.scala
index 7fe63d706e..fe22c32374 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSQuerySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+class GlutenTPCDSQuerySuite extends TPCDSQuerySuite with GlutenSQLTestsTrait {}
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCDSQueryWithStatsSuite extends TPCDSQueryWithStatsSuite with GlutenTestsCommonTrait {}
+
+class GlutenTPCDSQueryANSISuite extends TPCDSQueryANSISuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSQueryTestSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSQueryTestSuite.scala
index 7fe63d706e..e6c311b449 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCDSQueryTestSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCDSQueryTestSuite extends TPCDSQueryTestSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCHQuerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCHQuerySuite.scala
index 7fe63d706e..9e9e9797a8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTPCHQuerySuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenTPCHQuerySuite extends TPCHQuerySuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUDFSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUDFSuite.scala
index 7fe63d706e..f33cfd77a4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUDFSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUDFSuite extends UDFSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala
index 7fe63d706e..bb02b2d3fc 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUDTRegistrationSuite extends UDTRegistrationSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala
index 7fe63d706e..dd3dc3d8a6 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUnsafeRowSuite extends UnsafeRowSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUserDefinedTypeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUserDefinedTypeSuite.scala
index 7fe63d706e..727419c919 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenUserDefinedTypeSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenUserDefinedTypeSuite extends UserDefinedTypeSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantEndToEndSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantEndToEndSuite.scala
index 7fe63d706e..328d18dfb3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantEndToEndSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantEndToEndSuite extends VariantEndToEndSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantShreddingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantShreddingSuite.scala
index 7fe63d706e..2f8af5f834 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantShreddingSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantShreddingSuite extends VariantShreddingSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantSuite.scala
index 7fe63d706e..c5793bfd7b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantSuite extends VariantSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala
index 7fe63d706e..b726ccf971 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenVariantWriteShreddingSuite
+ extends VariantWriteShreddingSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenXmlFunctionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenXmlFunctionsSuite.scala
index 7fe63d706e..a44a8e687c 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenXmlFunctionsSuite.scala
@@ -14,21 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
-
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenXmlFunctionsSuite extends XmlFunctionsSuite with GlutenSQLTestsTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala
index 7fe63d706e..6fb13b6656 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAttributeResolutionSuite extends AttributeResolutionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala
index 7fe63d706e..e8302e83d6 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenAttributeSetSuite extends AttributeSetSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala
index 7fe63d706e..b746af49e3 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenBitmapExpressionUtilsSuite
+ extends BitmapExpressionUtilsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCallMethodViaReflectionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCallMethodViaReflectionSuite.scala
index 7fe63d706e..4fd9c13597 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCallMethodViaReflectionSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCallMethodViaReflectionSuite
+ extends CallMethodViaReflectionSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCanonicalizeSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCanonicalizeSuite.scala
index 7fe63d706e..b98dfe563a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCanonicalizeSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCanonicalizeSuite extends CanonicalizeSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOnSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOnSuite.scala
index 7fe63d706e..c1e789c46b 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOnSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCastWithAnsiOnSuite extends CastWithAnsiOnSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGenerationSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGenerationSuite.scala
index 7fe63d706e..707be6fcdb 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGenerationSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCodeGenerationSuite extends CodeGenerationSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGeneratorWithInterpretedFallbackSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGeneratorWithInterpretedFallbackSuite.scala
index 7fe63d706e..3cdfeebad5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCodeGeneratorWithInterpretedFallbackSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCodeGeneratorWithInterpretedFallbackSuite
+ extends CodeGeneratorWithInterpretedFallbackSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationExpressionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationExpressionSuite.scala
index 7fe63d706e..63d75972f5 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationExpressionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCollationExpressionSuite extends CollationExpressionSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationRegexpExpressionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationRegexpExpressionsSuite.scala
index 7fe63d706e..56835957f7 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCollationRegexpExpressionsSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCollationRegexpExpressionsSuite
+ extends CollationRegexpExpressionsSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCsvExpressionsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCsvExpressionsSuite.scala
index 7fe63d706e..233fad5276 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCsvExpressionsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenCsvExpressionsSuite extends CsvExpressionsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenDynamicPruningSubquerySuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenDynamicPruningSubquerySuite.scala
index 7fe63d706e..0628558da8 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenDynamicPruningSubquerySuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenDynamicPruningSubquerySuite
+ extends DynamicPruningSubquerySuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExprIdSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExprIdSuite.scala
index 7fe63d706e..8dcbd0f95a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExprIdSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExprIdSuite extends ExprIdSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionEvalHelperSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionEvalHelperSuite.scala
index 7fe63d706e..8675c29ac9 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionEvalHelperSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionEvalHelperSuite
+ extends ExpressionEvalHelperSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionImplUtilsSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionImplUtilsSuite.scala
index 7fe63d706e..df3d3b957a 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionImplUtilsSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionImplUtilsSuite extends ExpressionImplUtilsSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSQLBuilderSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSQLBuilderSuite.scala
index 7fe63d706e..688d100487 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSQLBuilderSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionSQLBuilderSuite
+ extends ExpressionSQLBuilderSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSetSuite.scala
index 7fe63d706e..63cf7c6442 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExpressionSetSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExpressionSetSuite extends ExpressionSetSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExtractPredicatesWithinOutputSetSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExtractPredicatesWithinOutputSetSuite.scala
index 7fe63d706e..2cbed97324 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenExtractPredicatesWithinOutputSetSuite.scala
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenExtractPredicatesWithinOutputSetSuite
+ extends ExtractPredicatesWithinOutputSetSuite
+ with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenHexSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenHexSuite.scala
index 7fe63d706e..db4214eab4 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenHexSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
-import org.apache.spark.sql.classic.ClassicConversions._
+import org.apache.spark.sql.GlutenTestsCommonTrait
-/**
- * Ensures compatibility with Spark 4.0. The implicit class ColumnConstructorExt from
- * ClassicConversions is used to construct a Column from an Expression. Since Spark 4.0, the Column
- * class is private to the package org.apache.spark. This class provides a way to construct a Column
- * in code that is outside the org.apache.spark package. Developers can directly call Column(e) if
- * ColumnConstructorExt is imported and the caller code is within this package.
- */
-object ClassicColumn {
- def apply(e: Expression): Column = {
- Column(e)
- }
-}
+class GlutenHexSuite extends HexSuite with GlutenTestsCommonTrait {}
diff --git a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenMutableProjectionSuite.scala
similarity index 51%
copy from shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
copy to gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenMutableProjectionSuite.scala
index 7fe63d706e..024c670495 100644
--- a/shims/spark40/src/main/scala/org/apache/spark/sql/classic/ClassicColumn.scala
+++ b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenMutableProjectionSuite.scala
@@ -14,21 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.spark.sql.classic
+package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.Column
-import org.apache.spark.sql.catalyst.expressions.Expression
... 5159 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org