-
Notifications
You must be signed in to change notification settings - Fork 29.3k
[SPARK-8345] [ML] Add an SQL node as a feature transformer #7465
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * 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.ml.feature | ||
|
|
||
| import org.apache.spark.SparkContext | ||
| import org.apache.spark.annotation.Experimental | ||
| import org.apache.spark.ml.param.{ParamMap, Param} | ||
| import org.apache.spark.ml.Transformer | ||
| import org.apache.spark.ml.util.Identifiable | ||
| import org.apache.spark.sql.{SQLContext, DataFrame, Row} | ||
| import org.apache.spark.sql.types.StructType | ||
|
|
||
| /** | ||
| * :: Experimental :: | ||
| * Implements the transforms which are defined by SQL statement. | ||
| * Currently we only support SQL syntax like 'SELECT ... FROM __THIS__' | ||
| * where '__THIS__' represents the underlying table of the input dataset. | ||
| */ | ||
| @Experimental | ||
| class SQLTransformer (override val uid: String) extends Transformer { | ||
|
|
||
| def this() = this(Identifiable.randomUID("sql")) | ||
|
|
||
| /** | ||
| * SQL statement parameter. The statement is provided in string form. | ||
| * @group param | ||
| */ | ||
| final val statement: Param[String] = new Param[String](this, "statement", "SQL statement") | ||
|
|
||
| /** @group setParam */ | ||
| def setStatement(value: String): this.type = set(statement, value) | ||
|
|
||
| /** @group getParam */ | ||
| def getStatement(): String = $(statement) | ||
|
|
||
| private val tableIdentifier: String = "__THIS__" | ||
|
|
||
| override def transform(dataset: DataFrame): DataFrame = { | ||
| val outputSchema = transformSchema(dataset.schema, logging = true) | ||
| val tableName = Identifiable.randomUID("sql") | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use the |
||
| dataset.registerTempTable(tableName) | ||
| val realStatement = $(statement).replace(tableIdentifier, tableName) | ||
| val additiveDF = dataset.sqlContext.sql(realStatement) | ||
| val rdd = dataset.rdd.zip(additiveDF.rdd).map { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it is okay to return the DataFrame from
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will have different behavior with other transformers in ml.feature. Other transformers will return the DataFrame which is composed of original DataFrame and transformed DataFrame. But here if user did not use |
||
| case (r1, r2) => Row.merge(r1, r2) | ||
| } | ||
| dataset.sqlContext.createDataFrame(rdd, outputSchema) | ||
| } | ||
|
|
||
| override def transformSchema(schema: StructType): StructType = { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can use the input schema + the SQL statement to figure out the output schema? @liancheng
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We probably need an instance of |
||
| val sc = SparkContext.getOrCreate() | ||
| val sqlContext = SQLContext.getOrCreate(sc) | ||
| val dummyRDD = sc.parallelize(Seq(Row.empty)) | ||
| val dummyDF = sqlContext.createDataFrame(dummyRDD, schema) | ||
| dummyDF.registerTempTable(tableIdentifier) | ||
| val additiveSchema = sqlContext.sql($(statement)).schema | ||
| additiveSchema.fieldNames.foreach { | ||
| case name => | ||
| require(!schema.fieldNames.contains(name), s"Output column $name already exists.") | ||
| } | ||
| val outputSchema = StructType(Array.concat(schema.fields, additiveSchema.fields)) | ||
| outputSchema | ||
| } | ||
|
|
||
| override def copy(extra: ParamMap): SQLTransformer = defaultCopy(extra) | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * 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.ml.feature | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.ml.param.ParamsSuite | ||
| import org.apache.spark.mllib.util.MLlibTestSparkContext | ||
|
|
||
| class SQLTransformerSuite extends SparkFunSuite with MLlibTestSparkContext { | ||
|
|
||
| test("params") { | ||
| ParamsSuite.checkParams(new SQLTransformer()) | ||
| } | ||
|
|
||
| test("transform numeric data") { | ||
| val original = sqlContext.createDataFrame( | ||
| Seq((0, 1.0, 3.0), (2, 2.0, 5.0))).toDF("id", "v1", "v2") | ||
| val sqlTrans = new SQLTransformer().setStatement( | ||
| "SELECT (v1 + v2) AS v3, (v1 * v2) AS v4 FROM __THIS__") | ||
| val result = sqlTrans.transform(original) | ||
| val resultSchema = sqlTrans.transformSchema(original.schema) | ||
| val expected = sqlContext.createDataFrame( | ||
| Seq((0, 1.0, 3.0, 4.0, 3.0), (2, 2.0, 5.0, 7.0, 10.0))) | ||
| .toDF("id", "v1", "v2", "v3", "v4") | ||
| assert(result.schema.toString == resultSchema.toString) | ||
| assert(resultSchema == expected.schema) | ||
| assert(result.collect().toSeq == expected.collect().toSeq) | ||
| } | ||
|
|
||
| test("output column already exists") { | ||
| val original = sqlContext.createDataFrame( | ||
| Seq((0, 1.0, 3.0, 4.0), (2, 2.0, 5.0, 8.0))).toDF("id", "v1", "v2", "v3") | ||
| val sqlTrans = new SQLTransformer().setStatement( | ||
| "SELECT (v1 + v2) AS v3, (v1 * v2) AS v4 FROM __THIS__") | ||
| intercept[IllegalArgumentException] { | ||
| sqlTrans.transform(original) | ||
| } | ||
| } | ||
| } |
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.
Remove
()