-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
[HUDI-4584] Fixing SQLConf
not being propagated to executor
#6352
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
61 changes: 61 additions & 0 deletions
61
...hudi-spark-client/src/main/scala/org/apache/spark/sql/execution/SQLConfInjectingRDD.scala
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* 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.execution | ||
|
||
import org.apache.spark.{Partition, TaskContext} | ||
import org.apache.spark.rdd.RDD | ||
import org.apache.spark.sql.catalyst.InternalRow | ||
import org.apache.spark.sql.internal.SQLConf | ||
|
||
import scala.reflect.ClassTag | ||
|
||
/** | ||
* NOTE: This is a generalized version of of Spark's [[SQLExecutionRDD]] | ||
* | ||
* It is just a wrapper over [[sqlRDD]] which sets and makes effective all the configs from the | ||
* captured [[SQLConf]] | ||
* | ||
* @param sqlRDD the `RDD` generated by the SQL plan | ||
* @param conf the `SQLConf` to apply to the execution of the SQL plan | ||
*/ | ||
class SQLConfInjectingRDD[T: ClassTag](var sqlRDD: RDD[T], @transient conf: SQLConf) extends RDD[T](sqlRDD) { | ||
private val sqlConfigs = conf.getAllConfs | ||
private lazy val sqlConfExecutorSide = { | ||
val newConf = new SQLConf() | ||
sqlConfigs.foreach { case (k, v) => newConf.setConfString(k, v) } | ||
newConf | ||
} | ||
|
||
override val partitioner = firstParent[InternalRow].partitioner | ||
|
||
override def getPartitions: Array[Partition] = firstParent[InternalRow].partitions | ||
|
||
override def compute(split: Partition, context: TaskContext): Iterator[T] = { | ||
// If we are in the context of a tracked SQL operation, `SQLExecution.EXECUTION_ID_KEY` is set | ||
// and we have nothing to do here. Otherwise, we use the `SQLConf` captured at the creation of | ||
// this RDD. | ||
if (context.getLocalProperty(SQLExecution.EXECUTION_ID_KEY) == null) { | ||
SQLConf.withExistingConf(sqlConfExecutorSide) { | ||
firstParent[T].iterator(split, context) | ||
} | ||
} else { | ||
firstParent[T].iterator(split, context) | ||
} | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any performance hit by doing this? Based on the function signature, this is done per Spark partition.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To clarify, does this happen for all subsequent chained RDD transformations?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure i understood your question: do you mean whether we're wrapping any other chained RDD, or whether the SQLConf will get propagated to every other chained RDD?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alexeykudinkin I was asking the latter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it will propagate to all RDDs in the execution chain (up to a shuffling point)