Skip to content

[SPARK-29914][ML][FOLLOWUP] CountVectorizer del big attribute array #26767

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 1 commit into from
Closed

[SPARK-29914][ML][FOLLOWUP] CountVectorizer del big attribute array #26767

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
6 changes: 2 additions & 4 deletions mllib/src/main/scala/org/apache/spark/ml/feature/CountVectorizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import org.apache.hadoop.fs.Path
import org.apache.spark.annotation.Since
import org.apache.spark.broadcast.Broadcast
import org.apache.spark.ml.{Estimator, Model}
import org.apache.spark.ml.attribute.{Attribute, AttributeGroup, NumericAttribute}
import org.apache.spark.ml.linalg.{Vectors, VectorUDT}
import org.apache.spark.ml.param._
import org.apache.spark.ml.param.shared.{HasInputCol, HasOutputCol}
Expand Down Expand Up @@ -334,9 +333,8 @@ class CountVectorizerModel(
override def transformSchema(schema: StructType): StructType = {
var outputSchema = validateAndTransformSchema(schema)
if ($(outputCol).nonEmpty) {
val attrs: Array[Attribute] = vocabulary.map(_ => new NumericAttribute)
val field = new AttributeGroup($(outputCol), attrs).toStructField()
outputSchema = SchemaUtils.updateField(outputSchema, field)
outputSchema = SchemaUtils.updateAttributeGroupSize(outputSchema,
$(outputCol), vocabulary.length)
}
outputSchema
}
Expand Down
5 changes: 2 additions & 3 deletions mllib/src/main/scala/org/apache/spark/ml/feature/RobustScaler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.apache.spark.mllib.util.MLUtils
import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.util.QuantileSummaries
import org.apache.spark.sql.functions._
import org.apache.spark.sql.types.{StructField, StructType}
import org.apache.spark.sql.types.StructType

/**
* Params for [[RobustScaler]] and [[RobustScalerModel]].
Expand Down Expand Up @@ -99,8 +99,7 @@ private[feature] trait RobustScalerParams extends Params with HasInputCol with H
SchemaUtils.checkColumnType(schema, $(inputCol), new VectorUDT)
require(!schema.fieldNames.contains($(outputCol)),
s"Output column ${$(outputCol)} already exists.")
val outputFields = schema.fields :+ StructField($(outputCol), new VectorUDT, false)
StructType(outputFields)
SchemaUtils.appendColumn(schema, $(outputCol), new VectorUDT)
}
}

Expand Down