You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "changgyoopark-db (via GitHub)" <gi...@apache.org> on 2025/01/21 10:34:43 UTC
[PR] [WIP][SPARK_50903][CONNECT] Let the plan cache only contain analysed plans [spark]
changgyoopark-db opened a new pull request, #49584:
URL: https://github.com/apache/spark/pull/49584
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "changgyoopark-db (via GitHub)" <gi...@apache.org>.
changgyoopark-db commented on code in PR #49584:
URL: https://github.com/apache/spark/pull/49584#discussion_r1936815612
##########
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala:
##########
@@ -440,46 +443,64 @@ case class SessionHolder(userId: String, sessionId: String, session: SparkSessio
* `spark.connect.session.planCache.enabled` is true.
* @param rel
* The relation to transform.
- * @param cachePlan
- * Whether to cache the result logical plan.
* @param transform
* Function to transform the relation into a logical plan.
* @return
- * The logical plan.
+ * The logical plan and a flag indicating that the plan cache was hit.
*/
- private[connect] def usePlanCache(rel: proto.Relation, cachePlan: Boolean)(
- transform: proto.Relation => LogicalPlan): LogicalPlan = {
- val planCacheEnabled = Option(session)
- .forall(_.sessionState.conf.getConf(Connect.CONNECT_SESSION_PLAN_CACHE_ENABLED, true))
- // We only cache plans that have a plan ID.
- val hasPlanId = rel.hasCommon && rel.getCommon.hasPlanId
-
- def getPlanCache(rel: proto.Relation): Option[LogicalPlan] =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- Option(cache.getIfPresent(rel)) match {
- case Some(plan) =>
- logDebug(s"Using cached plan for relation '$rel': $plan")
- Some(plan)
- case None => None
- }
- case _ => None
- }
- def putPlanCache(rel: proto.Relation, plan: LogicalPlan): Unit =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- cache.put(rel, plan)
- case _ =>
+ private[connect] def usePlanCache(rel: proto.Relation)(
+ transform: proto.Relation => LogicalPlan): (LogicalPlan, Boolean) =
+ planCache match {
+ case Some(cache) if planCacheEnabled(rel) =>
+ Option(cache.getIfPresent(rel)) match {
Review Comment:
That's a good point, but unfortunately, it's a guava cache that lacks computeIfAbsent +. You still can't avoid concurrent recomputation with computeIfAbsent since the key will be available once the value is ready; avoiding duplicate work requires a mutex.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell commented on code in PR #49584:
URL: https://github.com/apache/spark/pull/49584#discussion_r1936120463
##########
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala:
##########
@@ -440,46 +443,64 @@ case class SessionHolder(userId: String, sessionId: String, session: SparkSessio
* `spark.connect.session.planCache.enabled` is true.
* @param rel
* The relation to transform.
- * @param cachePlan
- * Whether to cache the result logical plan.
* @param transform
* Function to transform the relation into a logical plan.
* @return
- * The logical plan.
+ * The logical plan and a flag indicating that the plan cache was hit.
*/
- private[connect] def usePlanCache(rel: proto.Relation, cachePlan: Boolean)(
- transform: proto.Relation => LogicalPlan): LogicalPlan = {
- val planCacheEnabled = Option(session)
- .forall(_.sessionState.conf.getConf(Connect.CONNECT_SESSION_PLAN_CACHE_ENABLED, true))
- // We only cache plans that have a plan ID.
- val hasPlanId = rel.hasCommon && rel.getCommon.hasPlanId
-
- def getPlanCache(rel: proto.Relation): Option[LogicalPlan] =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- Option(cache.getIfPresent(rel)) match {
- case Some(plan) =>
- logDebug(s"Using cached plan for relation '$rel': $plan")
- Some(plan)
- case None => None
- }
- case _ => None
- }
- def putPlanCache(rel: proto.Relation, plan: LogicalPlan): Unit =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- cache.put(rel, plan)
- case _ =>
+ private[connect] def usePlanCache(rel: proto.Relation)(
+ transform: proto.Relation => LogicalPlan): (LogicalPlan, Boolean) =
+ planCache match {
+ case Some(cache) if planCacheEnabled(rel) =>
+ Option(cache.getIfPresent(rel)) match {
+ case Some(plan) =>
+ logDebug(s"Using cached plan for relation '$rel': $plan")
+ (plan, true)
+ case None => (transform(rel), false)
+ }
+ case _ => (transform(rel), false)
+ }
+
+ /**
+ * Create a data frame from the supplied relation, and update the plan cache.
+ *
+ * @param rel
+ * A proto.Relation to create a data frame.
+ * @param options
+ * Options to pass to the data frame.
+ * @return
+ * The created data frame.
+ */
+ private[connect] def createDataFrame(
+ rel: proto.Relation,
+ planner: SparkConnectPlanner,
+ options: Option[(QueryPlanningTracker, ShuffleCleanupMode)] = None): DataFrame = {
+ val (plan, cacheHit) = planner.transformRelationWithCache(rel)
+ val df = options match {
+ case Some((tracker, shuffleCleanupMode)) =>
+ Dataset.ofRows(session, plan, tracker, shuffleCleanupMode)
+ case _ => Dataset.ofRows(session, plan)
+ }
+ if (!cacheHit && planCache.isDefined && planCacheEnabled(rel)) {
+ if (df.queryExecution.isLazyAnalysis) {
+ val plan = df.queryExecution.logical
+ logDebug(s"Cache a lazyily analyzed logical plan for '$rel': $plan")
+ planCache.get.put(rel, plan)
+ } else {
+ val plan = df.queryExecution.analyzed
+ logDebug(s"Cache an analyzed logical plan for '$rel': $plan")
+ planCache.get.put(rel, plan)
}
+ }
+ df
+ }
- getPlanCache(rel)
- .getOrElse({
- val plan = transform(rel)
- if (cachePlan) {
- putPlanCache(rel, plan)
- }
- plan
- })
+ // Return true if the plan cache is enabled for the session and the relation.
+ private def planCacheEnabled(rel: proto.Relation): Boolean = {
Review Comment:
Naming. Use `canCachePlan(..)` instead?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #49584:
URL: https://github.com/apache/spark/pull/49584#issuecomment-3256599494
We're closing this PR because it hasn't been updated in a while. This isn't a judgement on the merit of the PR in any way. It's just a way of keeping the PR queue manageable.
If you'd like to revive this PR, please reopen it and ask a committer to remove the Stale tag!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell commented on code in PR #49584:
URL: https://github.com/apache/spark/pull/49584#discussion_r1936121699
##########
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala:
##########
@@ -440,46 +443,64 @@ case class SessionHolder(userId: String, sessionId: String, session: SparkSessio
* `spark.connect.session.planCache.enabled` is true.
* @param rel
* The relation to transform.
- * @param cachePlan
- * Whether to cache the result logical plan.
* @param transform
* Function to transform the relation into a logical plan.
* @return
- * The logical plan.
+ * The logical plan and a flag indicating that the plan cache was hit.
*/
- private[connect] def usePlanCache(rel: proto.Relation, cachePlan: Boolean)(
- transform: proto.Relation => LogicalPlan): LogicalPlan = {
- val planCacheEnabled = Option(session)
- .forall(_.sessionState.conf.getConf(Connect.CONNECT_SESSION_PLAN_CACHE_ENABLED, true))
- // We only cache plans that have a plan ID.
- val hasPlanId = rel.hasCommon && rel.getCommon.hasPlanId
-
- def getPlanCache(rel: proto.Relation): Option[LogicalPlan] =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- Option(cache.getIfPresent(rel)) match {
- case Some(plan) =>
- logDebug(s"Using cached plan for relation '$rel': $plan")
- Some(plan)
- case None => None
- }
- case _ => None
- }
- def putPlanCache(rel: proto.Relation, plan: LogicalPlan): Unit =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- cache.put(rel, plan)
- case _ =>
+ private[connect] def usePlanCache(rel: proto.Relation)(
+ transform: proto.Relation => LogicalPlan): (LogicalPlan, Boolean) =
+ planCache match {
+ case Some(cache) if planCacheEnabled(rel) =>
+ Option(cache.getIfPresent(rel)) match {
Review Comment:
NIT: You could use computeIfAbsent here. That way you can avoid concurrently recomputing the same key.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "hvanhovell (via GitHub)" <gi...@apache.org>.
hvanhovell commented on code in PR #49584:
URL: https://github.com/apache/spark/pull/49584#discussion_r1936138008
##########
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala:
##########
@@ -440,46 +443,64 @@ case class SessionHolder(userId: String, sessionId: String, session: SparkSessio
* `spark.connect.session.planCache.enabled` is true.
* @param rel
* The relation to transform.
- * @param cachePlan
- * Whether to cache the result logical plan.
* @param transform
* Function to transform the relation into a logical plan.
* @return
- * The logical plan.
+ * The logical plan and a flag indicating that the plan cache was hit.
*/
- private[connect] def usePlanCache(rel: proto.Relation, cachePlan: Boolean)(
- transform: proto.Relation => LogicalPlan): LogicalPlan = {
- val planCacheEnabled = Option(session)
- .forall(_.sessionState.conf.getConf(Connect.CONNECT_SESSION_PLAN_CACHE_ENABLED, true))
- // We only cache plans that have a plan ID.
- val hasPlanId = rel.hasCommon && rel.getCommon.hasPlanId
-
- def getPlanCache(rel: proto.Relation): Option[LogicalPlan] =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- Option(cache.getIfPresent(rel)) match {
- case Some(plan) =>
- logDebug(s"Using cached plan for relation '$rel': $plan")
- Some(plan)
- case None => None
- }
- case _ => None
- }
- def putPlanCache(rel: proto.Relation, plan: LogicalPlan): Unit =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- cache.put(rel, plan)
- case _ =>
+ private[connect] def usePlanCache(rel: proto.Relation)(
+ transform: proto.Relation => LogicalPlan): (LogicalPlan, Boolean) =
+ planCache match {
+ case Some(cache) if planCacheEnabled(rel) =>
+ Option(cache.getIfPresent(rel)) match {
+ case Some(plan) =>
+ logDebug(s"Using cached plan for relation '$rel': $plan")
+ (plan, true)
+ case None => (transform(rel), false)
+ }
+ case _ => (transform(rel), false)
+ }
+
+ /**
+ * Create a data frame from the supplied relation, and update the plan cache.
+ *
+ * @param rel
+ * A proto.Relation to create a data frame.
+ * @param options
+ * Options to pass to the data frame.
+ * @return
+ * The created data frame.
+ */
+ private[connect] def createDataFrame(
+ rel: proto.Relation,
+ planner: SparkConnectPlanner,
+ options: Option[(QueryPlanningTracker, ShuffleCleanupMode)] = None): DataFrame = {
+ val (plan, cacheHit) = planner.transformRelationWithCache(rel)
+ val df = options match {
+ case Some((tracker, shuffleCleanupMode)) =>
+ Dataset.ofRows(session, plan, tracker, shuffleCleanupMode)
+ case _ => Dataset.ofRows(session, plan)
+ }
+ if (!cacheHit && planCache.isDefined && planCacheEnabled(rel)) {
+ if (df.queryExecution.isLazyAnalysis) {
+ val plan = df.queryExecution.logical
+ logDebug(s"Cache a lazyily analyzed logical plan for '$rel': $plan")
+ planCache.get.put(rel, plan)
+ } else {
+ val plan = df.queryExecution.analyzed
Review Comment:
We may have to add some invalidation logic here. The problem is that some of objects (tables/views/udfs) used in the query can change, in that case we may want to validate that the objects used are the most recent ones.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #49584: [SPARK-50903][CONNECT] Cache logical plans after analysis
URL: https://github.com/apache/spark/pull/49584
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "changgyoopark-db (via GitHub)" <gi...@apache.org>.
changgyoopark-db commented on code in PR #49584:
URL: https://github.com/apache/spark/pull/49584#discussion_r1954742185
##########
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala:
##########
@@ -440,46 +443,64 @@ case class SessionHolder(userId: String, sessionId: String, session: SparkSessio
* `spark.connect.session.planCache.enabled` is true.
* @param rel
* The relation to transform.
- * @param cachePlan
- * Whether to cache the result logical plan.
* @param transform
* Function to transform the relation into a logical plan.
* @return
- * The logical plan.
+ * The logical plan and a flag indicating that the plan cache was hit.
*/
- private[connect] def usePlanCache(rel: proto.Relation, cachePlan: Boolean)(
- transform: proto.Relation => LogicalPlan): LogicalPlan = {
- val planCacheEnabled = Option(session)
- .forall(_.sessionState.conf.getConf(Connect.CONNECT_SESSION_PLAN_CACHE_ENABLED, true))
- // We only cache plans that have a plan ID.
- val hasPlanId = rel.hasCommon && rel.getCommon.hasPlanId
-
- def getPlanCache(rel: proto.Relation): Option[LogicalPlan] =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- Option(cache.getIfPresent(rel)) match {
- case Some(plan) =>
- logDebug(s"Using cached plan for relation '$rel': $plan")
- Some(plan)
- case None => None
- }
- case _ => None
- }
- def putPlanCache(rel: proto.Relation, plan: LogicalPlan): Unit =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- cache.put(rel, plan)
- case _ =>
+ private[connect] def usePlanCache(rel: proto.Relation)(
+ transform: proto.Relation => LogicalPlan): (LogicalPlan, Boolean) =
+ planCache match {
+ case Some(cache) if planCacheEnabled(rel) =>
+ Option(cache.getIfPresent(rel)) match {
+ case Some(plan) =>
+ logDebug(s"Using cached plan for relation '$rel': $plan")
+ (plan, true)
+ case None => (transform(rel), false)
+ }
+ case _ => (transform(rel), false)
+ }
+
+ /**
+ * Create a data frame from the supplied relation, and update the plan cache.
+ *
+ * @param rel
+ * A proto.Relation to create a data frame.
+ * @param options
+ * Options to pass to the data frame.
+ * @return
+ * The created data frame.
+ */
+ private[connect] def createDataFrame(
+ rel: proto.Relation,
+ planner: SparkConnectPlanner,
+ options: Option[(QueryPlanningTracker, ShuffleCleanupMode)] = None): DataFrame = {
+ val (plan, cacheHit) = planner.transformRelationWithCache(rel)
+ val df = options match {
+ case Some((tracker, shuffleCleanupMode)) =>
+ Dataset.ofRows(session, plan, tracker, shuffleCleanupMode)
+ case _ => Dataset.ofRows(session, plan)
+ }
+ if (!cacheHit && planCache.isDefined && planCacheEnabled(rel)) {
+ if (df.queryExecution.isLazyAnalysis) {
+ val plan = df.queryExecution.logical
+ logDebug(s"Cache a lazyily analyzed logical plan for '$rel': $plan")
+ planCache.get.put(rel, plan)
+ } else {
+ val plan = df.queryExecution.analyzed
Review Comment:
Added [LogicalPlan.isOutdated](https://github.com/apache/spark/pull/49584/files#diff-fbc6da30b8372e4f9aeb35ccf0d39eb796715d192c7eaeab109376584de0790eR194) and updated the [usePlanCache](https://github.com/apache/spark/pull/49584/files#diff-5df2afb8d8bbff99d75988d1f936705329a2430a56f3ebb1143f4a75d9cff6aeR457) method.
-> Calling 'refresh' seemed suboptimal, as schema changes often require a re-planning of the plan.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-50903][CONNECT] Cache logical plans after analysis [spark]
Posted by "changgyoopark-db (via GitHub)" <gi...@apache.org>.
changgyoopark-db commented on code in PR #49584:
URL: https://github.com/apache/spark/pull/49584#discussion_r1936816392
##########
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala:
##########
@@ -440,46 +443,64 @@ case class SessionHolder(userId: String, sessionId: String, session: SparkSessio
* `spark.connect.session.planCache.enabled` is true.
* @param rel
* The relation to transform.
- * @param cachePlan
- * Whether to cache the result logical plan.
* @param transform
* Function to transform the relation into a logical plan.
* @return
- * The logical plan.
+ * The logical plan and a flag indicating that the plan cache was hit.
*/
- private[connect] def usePlanCache(rel: proto.Relation, cachePlan: Boolean)(
- transform: proto.Relation => LogicalPlan): LogicalPlan = {
- val planCacheEnabled = Option(session)
- .forall(_.sessionState.conf.getConf(Connect.CONNECT_SESSION_PLAN_CACHE_ENABLED, true))
- // We only cache plans that have a plan ID.
- val hasPlanId = rel.hasCommon && rel.getCommon.hasPlanId
-
- def getPlanCache(rel: proto.Relation): Option[LogicalPlan] =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- Option(cache.getIfPresent(rel)) match {
- case Some(plan) =>
- logDebug(s"Using cached plan for relation '$rel': $plan")
- Some(plan)
- case None => None
- }
- case _ => None
- }
- def putPlanCache(rel: proto.Relation, plan: LogicalPlan): Unit =
- planCache match {
- case Some(cache) if planCacheEnabled && hasPlanId =>
- cache.put(rel, plan)
- case _ =>
+ private[connect] def usePlanCache(rel: proto.Relation)(
+ transform: proto.Relation => LogicalPlan): (LogicalPlan, Boolean) =
+ planCache match {
+ case Some(cache) if planCacheEnabled(rel) =>
+ Option(cache.getIfPresent(rel)) match {
+ case Some(plan) =>
+ logDebug(s"Using cached plan for relation '$rel': $plan")
+ (plan, true)
+ case None => (transform(rel), false)
+ }
+ case _ => (transform(rel), false)
+ }
+
+ /**
+ * Create a data frame from the supplied relation, and update the plan cache.
+ *
+ * @param rel
+ * A proto.Relation to create a data frame.
+ * @param options
+ * Options to pass to the data frame.
+ * @return
+ * The created data frame.
+ */
+ private[connect] def createDataFrame(
+ rel: proto.Relation,
+ planner: SparkConnectPlanner,
+ options: Option[(QueryPlanningTracker, ShuffleCleanupMode)] = None): DataFrame = {
+ val (plan, cacheHit) = planner.transformRelationWithCache(rel)
+ val df = options match {
+ case Some((tracker, shuffleCleanupMode)) =>
+ Dataset.ofRows(session, plan, tracker, shuffleCleanupMode)
+ case _ => Dataset.ofRows(session, plan)
+ }
+ if (!cacheHit && planCache.isDefined && planCacheEnabled(rel)) {
+ if (df.queryExecution.isLazyAnalysis) {
+ val plan = df.queryExecution.logical
+ logDebug(s"Cache a lazyily analyzed logical plan for '$rel': $plan")
+ planCache.get.put(rel, plan)
+ } else {
+ val plan = df.queryExecution.analyzed
Review Comment:
Agreed. I'll need to think about the interface.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org