Skip to content

[SPARK-21418][SQL] NoSuchElementException: None.get in DataSourceScanExec with sun.io.serialization.extendedDebugInfo=true #19123

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

Closed
srowen wants to merge 1 commit into from
Closed

[SPARK-21418][SQL] NoSuchElementException: None.get in DataSourceScanExec with sun.io.serialization.extendedDebugInfo=true #19123

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
9 changes: 6 additions & 3 deletions core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2639,9 +2639,12 @@ private[spark] object Utils extends Logging {
* Redact the sensitive information in the given string.
*/
def redact(conf: SparkConf, text: String): String = {
if (text == null || text.isEmpty || !conf.contains(STRING_REDACTION_PATTERN)) return text
val regex = conf.get(STRING_REDACTION_PATTERN).get
regex.replaceAllIn(text, REDACTION_REPLACEMENT_TEXT)
if (text == null || text.isEmpty || conf == null || !conf.contains(STRING_REDACTION_PATTERN)) {
text
} else {
val regex = conf.get(STRING_REDACTION_PATTERN).get
regex.replaceAllIn(text, REDACTION_REPLACEMENT_TEXT)
}
}

private def redact(redactionPattern: Regex, kvs: Seq[(String, String)]): Seq[(String, String)] = {
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ trait DataSourceScanExec extends LeafExecNode with CodegenSupport {
* Shorthand for calling redactString() without specifying redacting rules
*/
private def redact(text: String): String = {
Utils.redact(SparkSession.getActiveSession.get.sparkContext.conf, text)
Utils.redact(SparkSession.getActiveSession.map(_.sparkContext.conf).orNull, text)
}
}

Expand Down