Skip to content

[SPARK-58546][ML] Avoid redundant StringIndexer label lookups #57745

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
zhengruifeng wants to merge 2 commits into from
Closed

[SPARK-58546][ML] Avoid redundant StringIndexer label lookups #57745

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b7d1c
[SPARK-58546][ML] Avoid redundant StringIndexer label lookups
zhengruifeng Aug 4, 2026
5848de6
[SPARK-58546][ML] Move StringIndexer invalid handling outside UDF
zhengruifeng Aug 4, 2026
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
46 changes: 24 additions & 22 deletions mllib/src/main/scala/org/apache/spark/ml/feature/StringIndexer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,28 +363,32 @@ class StringIndexerModel (
.where(conditions.reduce(_ and _))
}

private def getIndexer(labels: Seq[String], labelToIndex: OpenHashMap[String, Double]) = {
val keepInvalid = (getHandleInvalid == StringIndexer.KEEP_INVALID)

udf { label: String =>
if (label == null) {
if (keepInvalid) {
labels.length
private def getIndexer(
labels: Seq[String],
labelToIndex: OpenHashMap[String, Double],
keepInvalid: Boolean) = {
val unknownIndex = labels.length.toDouble
if (keepInvalid) {
udf { label: String =>
if (label == null) {
unknownIndex
} else {
labelToIndex.get(label).getOrElse(unknownIndex)
}
}.asNondeterministic()
} else {
udf { label: String =>
if (label == null) {
throw new SparkException("StringIndexer encountered NULL value. To handle or skip " +
"NULLS, try setting StringIndexer.handleInvalid.")
}
} else {
if (labelToIndex.contains(label)) {
labelToIndex(label)
} else if (keepInvalid) {
labels.length
} else {
throw new SparkException(s"Unseen label: $label. To handle unseen labels, " +
s"set Param handleInvalid to ${StringIndexer.KEEP_INVALID}.")
labelToIndex.get(label).getOrElse {
throw new SparkException(s"Unseen label: $label. To handle unseen labels, " +
s"set Param handleInvalid to ${StringIndexer.KEEP_INVALID}.")
}
}
}
}.asNondeterministic()
}.asNondeterministic()
}
}

@Since("2.0.0")
Expand All @@ -400,6 +404,7 @@ class StringIndexerModel (
map
}
val outputColumns = new Array[Column](outputColNames.length)
val keepInvalid = getHandleInvalid == StringIndexer.KEEP_INVALID

// Skips invalid rows if `handleInvalid` is set to `StringIndexer.SKIP_INVALID`.
val filteredDataset = if (getHandleInvalid == StringIndexer.SKIP_INVALID) {
Expand All @@ -416,16 +421,13 @@ class StringIndexerModel (

try {
dataset.col(inputColName)
val filteredLabels = getHandleInvalid match {
case StringIndexer.KEEP_INVALID => labels :+ "__unknown"
case _ => labels
}
val filteredLabels = if (keepInvalid) labels :+ "__unknown" else labels
val metadata = NominalAttribute.defaultAttr
.withName(outputColName)
.withValues(filteredLabels)
.toMetadata()

val indexer = getIndexer(labels.toImmutableArraySeq, labelToIndex)
val indexer = getIndexer(labels.toImmutableArraySeq, labelToIndex, keepInvalid)

outputColumns(i) = indexer(dataset(inputColName).cast(StringType))
.as(outputColName, metadata)
Expand Down