[GLUTEN-11550][UT] Add GlutenTestSetWithSystemPropertyTrait, enable 6 suites, remove 7 TestHiveSingleton suites#11847
Draft
baibaichen wants to merge 3 commits intoapache:mainfrom
Draft
Conversation
Root cause: Gluten's offload rules replace Spark physical plan nodes with Transformer nodes but don't propagate LOGICAL_PLAN_TAG. This tag is used by Spark's LogicalPlanTagInSparkPlanSuite to verify logical-physical plan linkage. Three core fixes: 1. LegacyOffload: propagate LOGICAL_PLAN_TAG from original node to offloaded Transformer node using setTagValue (non-recursive to avoid tagging Exchange). 2. HeuristicTransform.Simple: same tag propagation for the simple offload path. 3. PushDownFilterToScan: copyTagsFrom when creating new scan via withNewPushdownFilters (case class copy loses tags). Test suite overrides checkGeneratedCode with Gluten-aware version that: - Recognizes Transformer node types (joins, aggregates, windows, scans, etc.) - For scan trees, finds logical plan tag from any node in the tree (not just root), since rewrite rules may create new Project/Filter without tags. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
…e 6 suites Add a reusable trait for test suites whose parent creates per-test SparkContext/SparkSession (via LocalSparkContext/LocalSparkSession). It injects GlutenPlugin config via system properties so per-test sessions inherit it, avoiding shared session conflicts. Enable 6 suites by switching to this trait: - GlutenSQLExecutionSuite (SQLExecutionSuite: new SparkContext internally) - GlutenSQLJsonProtocolSuite (SQLJsonProtocolSuite with LocalSparkSession) - GlutenShufflePartitionsUtilSuite (ShufflePartitionsUtilSuite with LocalSparkContext) - GlutenExternalAppendOnlyUnsafeRowArraySuite (with LocalSparkContext) - GlutenUnsafeRowSerializerSuite (UnsafeRowSerializerSuite with LocalSparkSession) - GlutenSparkSessionJobTaggingAndCancellationSuite (with LocalSparkContext) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…lutenPlugin Remove 7 test suites (spark40 + spark41) that extend TestHiveSingleton. TestHiveSingleton.spark (protected val) conflicts with Gluten test traits' spark (implicit protected def), making it impossible to load GlutenPlugin. The non-Hive variants (e.g. GlutenBucketedReadWithoutHiveSupportSuite) are already enabled and cover the same functionality. Removed suites: - GlutenBucketedReadWithHiveSupportSuite - GlutenBucketedWriteWithHiveSupportSuite - GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite - GlutenCommitFailureTestRelationSuite - GlutenJsonHadoopFsRelationSuite - GlutenParquetHadoopFsRelationSuite - GlutenSimpleTextHadoopFsRelationSuite Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
baibaichen
force-pushed
the
fix/11550-system-property-trait
branch
from
619c5dd to
6662b97
Compare
|
Run Gluten Clickhouse CI on x86 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
1. Add
GlutenTestSetWithSystemPropertyTrait— a reusable trait for test suites whose Spark parent creates per-test SparkContext/SparkSession (viaLocalSparkContext,LocalSparkSession, or directnew SparkContext). It injects GlutenPlugin config via system properties so per-test sessions inherit it.2. Enable 6 suites by switching to this trait:
GlutenSQLExecutionSuite— parentSQLExecutionSuite(internalnew SparkContext)GlutenSQLJsonProtocolSuite— parentSQLJsonProtocolSuite with LocalSparkSessionGlutenShufflePartitionsUtilSuite— parentShufflePartitionsUtilSuite with LocalSparkContextGlutenExternalAppendOnlyUnsafeRowArraySuite— parent withLocalSparkContextGlutenUnsafeRowSerializerSuite— parentUnsafeRowSerializerSuite with LocalSparkSessionGlutenSparkSessionJobTaggingAndCancellationSuite— parent withLocalSparkContext3. Remove 7 TestHiveSingleton suites that cannot load GlutenPlugin due to trait conflict (
TestHiveSingleton.spark(protected val) vs Gluten traitspark(implicit protected def)). The non-Hive variants are already enabled. Updatedexcluded-spark-uts.md.How was this patch tested?
All 6 enabled suites verified on spark41 and spark40 via
run-scala-test.sh.Related issue: #11550