Repository: spark Updated Branches: refs/heads/master 3f958a999 -> 42b9eda80
[MINOR] Fix a typo in the method name `UserDefinedFunction.asNonNullabe` ## What changes were proposed in this pull request? The method name `asNonNullabe` should be `asNonNullable`. ## How was this patch tested? N/A Author: Xingbo Jiang <xingbo.ji...@databricks.com> Closes #18952 from jiangxb1987/typo. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/42b9eda8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/42b9eda8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/42b9eda8 Branch: refs/heads/master Commit: 42b9eda80e975d970c3e8da4047b318b83dd269f Parents: 3f958a9 Author: Xingbo Jiang <xingbo.ji...@databricks.com> Authored: Tue Aug 15 16:40:01 2017 -0700 Committer: gatorsmile <gatorsm...@gmail.com> Committed: Tue Aug 15 16:40:01 2017 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/UDFRegistration.scala | 52 ++++++++++---------- .../sql/expressions/UserDefinedFunction.scala | 2 +- .../scala/org/apache/spark/sql/functions.scala | 24 ++++----- 3 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/42b9eda8/sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala b/sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala index 737afb4..3ff4761 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala @@ -82,7 +82,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends * Registers a user-defined function (UDF), for a UDF that's already defined using the Dataset * API (i.e. of type UserDefinedFunction). To change a UDF to nondeterministic, call the API * `UserDefinedFunction.asNondeterministic()`. To change a UDF to nonNullable, call the API - * `UserDefinedFunction.asNonNullabe()`. + * `UserDefinedFunction.asNonNullable()`. * * Example: * {{{ @@ -90,7 +90,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends * spark.udf.register("random", foo.asNondeterministic()) * * val bar = udf(() => "bar") - * spark.udf.register("stringLit", bar.asNonNullabe()) + * spark.udf.register("stringLit", bar.asNonNullable()) * }}} * * @param name the name of the UDF. @@ -130,7 +130,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() }""") } @@ -175,7 +175,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -194,7 +194,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -213,7 +213,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -232,7 +232,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -251,7 +251,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -270,7 +270,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -289,7 +289,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -308,7 +308,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -327,7 +327,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -346,7 +346,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -365,7 +365,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -384,7 +384,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -403,7 +403,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -422,7 +422,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -441,7 +441,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -460,7 +460,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -479,7 +479,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -498,7 +498,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -517,7 +517,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -536,7 +536,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -555,7 +555,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -574,7 +574,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -593,7 +593,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends } functionRegistry.createOrReplaceTempFunction(name, builder) val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } ////////////////////////////////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/spark/blob/42b9eda8/sql/core/src/main/scala/org/apache/spark/sql/expressions/UserDefinedFunction.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/expressions/UserDefinedFunction.scala b/sql/core/src/main/scala/org/apache/spark/sql/expressions/UserDefinedFunction.scala index 011ee7e..03b654f 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/expressions/UserDefinedFunction.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/expressions/UserDefinedFunction.scala @@ -101,7 +101,7 @@ case class UserDefinedFunction protected[sql] ( * * @since 2.3.0 */ - def asNonNullabe(): UserDefinedFunction = { + def asNonNullable(): UserDefinedFunction = { if (!nullable) { this } else { http://git-wip-us.apache.org/repos/asf/spark/blob/42b9eda8/sql/core/src/main/scala/org/apache/spark/sql/functions.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala index 14ab8a2..53b2552 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala @@ -3226,7 +3226,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try($inputTypes).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() }""") } @@ -3245,7 +3245,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3261,7 +3261,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3277,7 +3277,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3293,7 +3293,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3309,7 +3309,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3325,7 +3325,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: ScalaReflection.schemaFor(typeTag[A5]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3341,7 +3341,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: ScalaReflection.schemaFor(typeTag[A5]).dataType :: ScalaReflection.schemaFor(typeTag[A6]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3357,7 +3357,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: ScalaReflection.schemaFor(typeTag[A5]).dataType :: ScalaReflection.schemaFor(typeTag[A6]).dataType :: ScalaReflection.schemaFor(typeTag[A7]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3373,7 +3373,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: ScalaReflection.schemaFor(typeTag[A5]).dataType :: ScalaReflection.schemaFor(typeTag[A6]).dataType :: ScalaReflection.schemaFor(typeTag[A7]).dataType :: ScalaReflection.schemaFor(typeTag[A8]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3389,7 +3389,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: ScalaReflection.schemaFor(typeTag[A5]).dataType :: ScalaReflection.schemaFor(typeTag[A6]).dataType :: ScalaReflection.schemaFor(typeTag[A7]).dataType :: ScalaReflection.schemaFor(typeTag[A8]).dataType :: ScalaReflection.schemaFor(typeTag[A9]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } /** @@ -3405,7 +3405,7 @@ object functions { val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT] val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: ScalaReflection.schemaFor(typeTag[A4]).dataType :: ScalaReflection.schemaFor(typeTag[A5]).dataType :: ScalaReflection.schemaFor(typeTag[A6]).dataType :: ScalaReflection.schemaFor(typeTag[A7]).dataType :: ScalaReflection.schemaFor(typeTag[A8]).dataType :: ScalaReflection.schemaFor(typeTag[A9]).dataType :: ScalaReflection.schemaFor(typeTag[A10]).dataType :: Nil).toOption val udf = UserDefinedFunction(f, dataType, inputTypes) - if (nullable) udf else udf.asNonNullabe() + if (nullable) udf else udf.asNonNullable() } // scalastyle:on parameter.number --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
