Skip to content

[SPARK-54564] [SQL] Make QueryPlanningTracker as HybridAnalyzer field #53277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −32
Open

[SPARK-54564] [SQL] Make QueryPlanningTracker as HybridAnalyzer field #53277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,15 @@ class Analyzer(
AnalysisContext.reset()
try {
AnalysisHelper.markInAnalyzer {
HybridAnalyzer.fromLegacyAnalyzer(legacyAnalyzer = this).apply(plan, tracker)
HybridAnalyzer.fromLegacyAnalyzer(legacyAnalyzer = this, tracker = tracker).apply(plan)
}
} finally {
AnalysisContext.reset()
}
} else {
AnalysisContext.withNewAnalysisContext {
AnalysisHelper.markInAnalyzer {
HybridAnalyzer.fromLegacyAnalyzer(legacyAnalyzer = this).apply(plan, tracker)
HybridAnalyzer.fromLegacyAnalyzer(legacyAnalyzer = this, tracker = tracker).apply(plan)
}
}
}
Expand Down
7 changes: 5 additions & 2 deletions ...alyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/resolver/HybridAnalyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class HybridAnalyzer(
legacyAnalyzer: Analyzer,
resolverGuard: ResolverGuard,
resolver: Resolver,
tracker: QueryPlanningTracker,
extendedResolutionChecks: Seq[LogicalPlan => Unit] = Seq.empty,
extendedRewriteRules: Seq[Rule[LogicalPlan]] = Seq.empty,
exposeExplicitlyUnsupportedResolverFeature: Boolean = false)
Expand All @@ -74,7 +75,7 @@ class HybridAnalyzer(
)
private val sampleRateGenerator = new Random()

def apply(plan: LogicalPlan, tracker: QueryPlanningTracker): LogicalPlan = {
def apply(plan: LogicalPlan): LogicalPlan = {
val dualRun =
conf.getConf(SQLConf.ANALYZER_DUAL_RUN_LEGACY_AND_SINGLE_PASS_RESOLVER) &&
checkDualRunSampleRate() &&
Expand Down Expand Up @@ -296,7 +297,8 @@ object HybridAnalyzer {
*/
def fromLegacyAnalyzer(
legacyAnalyzer: Analyzer,
exposeExplicitlyUnsupportedResolverFeature: Boolean = false): HybridAnalyzer = {
exposeExplicitlyUnsupportedResolverFeature: Boolean = false,
tracker: QueryPlanningTracker): HybridAnalyzer = {
new HybridAnalyzer(
legacyAnalyzer = legacyAnalyzer,
resolverGuard = new ResolverGuard(legacyAnalyzer.catalogManager),
Expand All @@ -307,6 +309,7 @@ object HybridAnalyzer {
metadataResolverExtensions = legacyAnalyzer.singlePassMetadataResolverExtensions,
externalRelationResolution = Some(legacyAnalyzer.getRelationResolution)
),
tracker = tracker,
extendedResolutionChecks = legacyAnalyzer.singlePassExtendedResolutionChecks,
extendedRewriteRules = legacyAnalyzer.singlePassPostHocResolutionRules,
exposeExplicitlyUnsupportedResolverFeature = exposeExplicitlyUnsupportedResolverFeature
Expand Down
71 changes: 43 additions & 28 deletions sql/core/src/test/scala/org/apache/spark/sql/analysis/resolver/HybridAnalyzerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
extends HybridAnalyzer(
legacyAnalyzer = legacyAnalyzer,
resolverGuard = resolverGuard,
resolver = resolver
resolver = resolver,
tracker = new QueryPlanningTracker
) {
override protected[sql] def normalizePlan(plan: LogicalPlan): LogicalPlan = {
throw new Exception("Broken plan normalization")
Expand Down Expand Up @@ -177,8 +178,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new HybridAnalyzer(
new ValidatingAnalyzer(bridgeRelations = true),
new ResolverGuard(spark.sessionState.catalogManager),
new ValidatingResolver(bridgeRelations = true)
).apply(unresolvedPlan, new QueryPlanningTracker),
new ValidatingResolver(bridgeRelations = true),
new QueryPlanningTracker
).apply(unresolvedPlan),
resolvedPlan
)
}
Expand All @@ -192,8 +194,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new BrokenResolver(
QueryCompilationErrors.unsupportedSinglePassAnalyzerFeature("test"),
bridgeRelations = true
)
).apply(unresolvedPlan, new QueryPlanningTracker)
),
new QueryPlanningTracker
).apply(unresolvedPlan)
),
condition = "UNSUPPORTED_SINGLE_PASS_ANALYZER_FEATURE",
parameters = Map("feature" -> "test")
Expand All @@ -208,8 +211,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new BrokenResolver(
new StackOverflowError("Stack Overflow"),
bridgeRelations = true
)
).apply(unresolvedPlan, new QueryPlanningTracker)
),
new QueryPlanningTracker
).apply(unresolvedPlan)
)
}

Expand All @@ -219,8 +223,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new HybridAnalyzer(
new ValidatingAnalyzer(bridgeRelations = true),
new ResolverGuard(spark.sessionState.catalogManager),
new HardCodedResolver(resolvedPlan, bridgeRelations = true)
).apply(malformedUnresolvedPlan, new QueryPlanningTracker)
new HardCodedResolver(resolvedPlan, bridgeRelations = true),
new QueryPlanningTracker
).apply(malformedUnresolvedPlan)
),
condition = "HYBRID_ANALYZER_EXCEPTION.FIXED_POINT_FAILED_SINGLE_PASS_SUCCEEDED",
parameters = Map("singlePassOutput" -> resolvedPlan.toString)
Expand All @@ -233,8 +238,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new HybridAnalyzer(
new ValidatingAnalyzer(bridgeRelations = true),
new ResolverGuard(spark.sessionState.catalogManager),
new ValidatingResolver(bridgeRelations = true)
).apply(malformedUnresolvedPlan, new QueryPlanningTracker)
new ValidatingResolver(bridgeRelations = true),
new QueryPlanningTracker
).apply(malformedUnresolvedPlan)
),
condition = "UNRESOLVED_COLUMN.WITH_SUGGESTION",
parameters = Map(
Expand All @@ -250,8 +256,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new HybridAnalyzer(
new ValidatingAnalyzer(bridgeRelations = true),
new ResolverGuard(spark.sessionState.catalogManager),
new HardCodedResolver(malformedResolvedPlan, bridgeRelations = true)
).apply(unresolvedPlan, new QueryPlanningTracker)
new HardCodedResolver(malformedResolvedPlan, bridgeRelations = true),
new QueryPlanningTracker
).apply(unresolvedPlan)
),
condition = "HYBRID_ANALYZER_EXCEPTION.LOGICAL_PLAN_COMPARISON_MISMATCH",
parameters = Map(
Expand All @@ -277,8 +284,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new HybridAnalyzer(
new ValidatingAnalyzer(bridgeRelations = true),
new ResolverGuard(spark.sessionState.catalogManager),
new HardCodedResolver(resolvedPlan, bridgeRelations = true)
).apply(plan, new QueryPlanningTracker)
new HardCodedResolver(resolvedPlan, bridgeRelations = true),
new QueryPlanningTracker
).apply(plan)
),
condition = "HYBRID_ANALYZER_EXCEPTION.OUTPUT_SCHEMA_COMPARISON_MISMATCH",
parameters = Map(
Expand All @@ -294,7 +302,7 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new ValidatingAnalyzer(bridgeRelations = true),
new ResolverGuard(spark.sessionState.catalogManager),
new HardCodedResolver(resolvedPlan, bridgeRelations = true)
).apply(unresolvedPlan, new QueryPlanningTracker)
).apply(unresolvedPlan)
}
}

Expand All @@ -306,8 +314,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new BrokenResolver(
new ExplicitlyUnsupportedResolverFeature("FAILURE"),
bridgeRelations = true
)
).apply(unresolvedPlan, new QueryPlanningTracker),
),
new QueryPlanningTracker
).apply(unresolvedPlan),
resolvedPlan
)
}
Expand All @@ -331,8 +340,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
new BrokenResolver(
new Exception("Single-pass resolver should not be invoked"),
bridgeRelations = false
)
).apply(plan, new QueryPlanningTracker)
),
new QueryPlanningTracker
).apply(plan)
},
resolvedPlan
)
Expand All @@ -358,8 +368,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
bridgeRelations = false
),
new ResolverGuard(spark.sessionState.catalogManager),
new ValidatingResolver(bridgeRelations = false)
).apply(plan, new QueryPlanningTracker)
new ValidatingResolver(bridgeRelations = false),
new QueryPlanningTracker
).apply(plan)
},
resolvedPlan
)
Expand Down Expand Up @@ -387,8 +398,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
bridgeRelations = false
),
new ResolverGuard(spark.sessionState.catalogManager),
new ValidatingResolver(bridgeRelations = false)
).apply(plan, new QueryPlanningTracker)
new ValidatingResolver(bridgeRelations = false),
new QueryPlanningTracker
).apply(plan)
},
resolvedPlan
)
Expand All @@ -401,8 +413,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
bridgeRelations = true
),
new ResolverGuard(spark.sessionState.catalogManager),
new ValidatingResolver(bridgeRelations = true)
).apply(plan, new QueryPlanningTracker),
new ValidatingResolver(bridgeRelations = true),
new QueryPlanningTracker
).apply(plan),
resolvedPlan
)
}
Expand All @@ -425,8 +438,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
legacyAnalyzer = new ValidatingAnalyzer(bridgeRelations = true),
resolverGuard = new ResolverGuard(spark.sessionState.catalogManager),
resolver = new ValidatingResolver(bridgeRelations = true),
tracker = new QueryPlanningTracker,
extendedResolutionChecks = Seq(new BrokenCheckRule)
).apply(plan, new QueryPlanningTracker)
).apply(plan)
}

withSQLConf(
Expand All @@ -437,8 +451,9 @@ class HybridAnalyzerSuite extends QueryTest with SharedSparkSession {
legacyAnalyzer = new ValidatingAnalyzer(bridgeRelations = true),
resolverGuard = new ResolverGuard(spark.sessionState.catalogManager),
resolver = new ValidatingResolver(bridgeRelations = true),
tracker = new QueryPlanningTracker,
extendedResolutionChecks = Seq(new BrokenCheckRule)
).apply(plan, new QueryPlanningTracker),
).apply(plan),
resolvedPlan
)
}
Expand Down