Skip to content

[SPARK-25371][SQL] struct() should allow being called with 0 args #22373

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
mgaido91 wants to merge 3 commits into from
Closed

[SPARK-25371][SQL] struct() should allow being called with 0 args #22373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bc026e
[SPARK-25371][SQL] VectorAssembler shpuld not fail with empty inputCols
mgaido91 Sep 9, 2018
41bd5bd
Revert check in struct for more than one argument
mgaido91 Sep 10, 2018
69ff3cb
fix imports
mgaido91 Sep 10, 2018
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
Prev Previous commit
Next Next commit
Revert check in struct for more than one argument
  • Loading branch information
@mgaido91
mgaido91 committed Sep 10, 2018
commit 41bd5bdbc1b8fbaca3ffbba02ac5d367e3fdc8cd
7 changes: 1 addition & 6 deletions mllib/src/main/scala/org/apache/spark/ml/feature/VectorAssembler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,8 @@ class VectorAssembler @Since("1.4.0") (@Since("1.4.0") override val uid: String)
case _: NumericType | BooleanType => dataset(c).cast(DoubleType).as(s"${c}_double_$uid")
}
}
val udfInput = if (args.length > 0) {
struct(args: _*)
} else {
new Column(Literal.default(new StructType))
}

filteredDataset.select(col("*"), assembleFunc(udfInput).as($(outputCol), metadata))
filteredDataset.select(col("*"), assembleFunc(struct(args: _*)).as($(outputCol), metadata))
}

@Since("1.4.0")
Expand Down
5 changes: 1 addition & 4 deletions ...atalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,7 @@ trait CreateNamedStructLike extends Expression {
}

override def checkInputDataTypes(): TypeCheckResult = {
if (children.length < 1) {
TypeCheckResult.TypeCheckFailure(
s"input to function $prettyName requires at least one argument")
} else if (children.size % 2 != 0) {
if (children.size % 2 != 0) {
TypeCheckResult.TypeCheckFailure(s"$prettyName expects an even number of arguments.")
} else {
val invalidNames = nameExprs.filterNot(e => e.foldable && e.dataType == StringType)
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2677,8 +2677,6 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSQLContext {
val funcsMustHaveAtLeastOneArg =
("coalesce", (df: DataFrame) => df.select(coalesce())) ::
("coalesce", (df: DataFrame) => df.selectExpr("coalesce()")) ::
("named_struct", (df: DataFrame) => df.select(struct())) ::
("named_struct", (df: DataFrame) => df.selectExpr("named_struct()")) ::
("hash", (df: DataFrame) => df.select(hash())) ::
("hash", (df: DataFrame) => df.selectExpr("hash()")) :: Nil
funcsMustHaveAtLeastOneArg.foreach { case (name, func) =>
Expand Down