Skip to content

Commit 42b9eda

Browse files
jiangxb1987gatorsmile
jiangxb1987
authored and
gatorsmile
committed
[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 <[email protected]> Closes apache#18952 from jiangxb1987/typo.
1 parent 3f958a9 commit 42b9eda

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

‎sql/core/src/main/scala/org/apache/spark/sql/UDFRegistration.scala

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
8282
* Registers a user-defined function (UDF), for a UDF that's already defined using the Dataset
8383
* API (i.e. of type UserDefinedFunction). To change a UDF to nondeterministic, call the API
8484
* `UserDefinedFunction.asNondeterministic()`. To change a UDF to nonNullable, call the API
85-
* `UserDefinedFunction.asNonNullabe()`.
85+
* `UserDefinedFunction.asNonNullable()`.
8686
*
8787
* Example:
8888
* {{{
8989
* val foo = udf(() => Math.random())
9090
* spark.udf.register("random", foo.asNondeterministic())
9191
*
9292
* val bar = udf(() => "bar")
93-
* spark.udf.register("stringLit", bar.asNonNullabe())
93+
* spark.udf.register("stringLit", bar.asNonNullable())
9494
* }}}
9595
*
9696
* @param name the name of the UDF.
@@ -130,7 +130,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
130130
}
131131
functionRegistry.createOrReplaceTempFunction(name, builder)
132132
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
133-
if (nullable) udf else udf.asNonNullabe()
133+
if (nullable) udf else udf.asNonNullable()
134134
}""")
135135
}
136136
@@ -175,7 +175,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
175175
}
176176
functionRegistry.createOrReplaceTempFunction(name, builder)
177177
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
178-
if (nullable) udf else udf.asNonNullabe()
178+
if (nullable) udf else udf.asNonNullable()
179179
}
180180

181181
/**
@@ -194,7 +194,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
194194
}
195195
functionRegistry.createOrReplaceTempFunction(name, builder)
196196
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
197-
if (nullable) udf else udf.asNonNullabe()
197+
if (nullable) udf else udf.asNonNullable()
198198
}
199199

200200
/**
@@ -213,7 +213,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
213213
}
214214
functionRegistry.createOrReplaceTempFunction(name, builder)
215215
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
216-
if (nullable) udf else udf.asNonNullabe()
216+
if (nullable) udf else udf.asNonNullable()
217217
}
218218

219219
/**
@@ -232,7 +232,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
232232
}
233233
functionRegistry.createOrReplaceTempFunction(name, builder)
234234
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
235-
if (nullable) udf else udf.asNonNullabe()
235+
if (nullable) udf else udf.asNonNullable()
236236
}
237237

238238
/**
@@ -251,7 +251,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
251251
}
252252
functionRegistry.createOrReplaceTempFunction(name, builder)
253253
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
254-
if (nullable) udf else udf.asNonNullabe()
254+
if (nullable) udf else udf.asNonNullable()
255255
}
256256

257257
/**
@@ -270,7 +270,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
270270
}
271271
functionRegistry.createOrReplaceTempFunction(name, builder)
272272
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
273-
if (nullable) udf else udf.asNonNullabe()
273+
if (nullable) udf else udf.asNonNullable()
274274
}
275275

276276
/**
@@ -289,7 +289,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
289289
}
290290
functionRegistry.createOrReplaceTempFunction(name, builder)
291291
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
292-
if (nullable) udf else udf.asNonNullabe()
292+
if (nullable) udf else udf.asNonNullable()
293293
}
294294

295295
/**
@@ -308,7 +308,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
308308
}
309309
functionRegistry.createOrReplaceTempFunction(name, builder)
310310
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
311-
if (nullable) udf else udf.asNonNullabe()
311+
if (nullable) udf else udf.asNonNullable()
312312
}
313313

314314
/**
@@ -327,7 +327,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
327327
}
328328
functionRegistry.createOrReplaceTempFunction(name, builder)
329329
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
330-
if (nullable) udf else udf.asNonNullabe()
330+
if (nullable) udf else udf.asNonNullable()
331331
}
332332

333333
/**
@@ -346,7 +346,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
346346
}
347347
functionRegistry.createOrReplaceTempFunction(name, builder)
348348
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
349-
if (nullable) udf else udf.asNonNullabe()
349+
if (nullable) udf else udf.asNonNullable()
350350
}
351351

352352
/**
@@ -365,7 +365,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
365365
}
366366
functionRegistry.createOrReplaceTempFunction(name, builder)
367367
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
368-
if (nullable) udf else udf.asNonNullabe()
368+
if (nullable) udf else udf.asNonNullable()
369369
}
370370

371371
/**
@@ -384,7 +384,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
384384
}
385385
functionRegistry.createOrReplaceTempFunction(name, builder)
386386
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
387-
if (nullable) udf else udf.asNonNullabe()
387+
if (nullable) udf else udf.asNonNullable()
388388
}
389389

390390
/**
@@ -403,7 +403,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
403403
}
404404
functionRegistry.createOrReplaceTempFunction(name, builder)
405405
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
406-
if (nullable) udf else udf.asNonNullabe()
406+
if (nullable) udf else udf.asNonNullable()
407407
}
408408

409409
/**
@@ -422,7 +422,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
422422
}
423423
functionRegistry.createOrReplaceTempFunction(name, builder)
424424
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
425-
if (nullable) udf else udf.asNonNullabe()
425+
if (nullable) udf else udf.asNonNullable()
426426
}
427427

428428
/**
@@ -441,7 +441,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
441441
}
442442
functionRegistry.createOrReplaceTempFunction(name, builder)
443443
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
444-
if (nullable) udf else udf.asNonNullabe()
444+
if (nullable) udf else udf.asNonNullable()
445445
}
446446

447447
/**
@@ -460,7 +460,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
460460
}
461461
functionRegistry.createOrReplaceTempFunction(name, builder)
462462
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
463-
if (nullable) udf else udf.asNonNullabe()
463+
if (nullable) udf else udf.asNonNullable()
464464
}
465465

466466
/**
@@ -479,7 +479,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
479479
}
480480
functionRegistry.createOrReplaceTempFunction(name, builder)
481481
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
482-
if (nullable) udf else udf.asNonNullabe()
482+
if (nullable) udf else udf.asNonNullable()
483483
}
484484

485485
/**
@@ -498,7 +498,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
498498
}
499499
functionRegistry.createOrReplaceTempFunction(name, builder)
500500
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
501-
if (nullable) udf else udf.asNonNullabe()
501+
if (nullable) udf else udf.asNonNullable()
502502
}
503503

504504
/**
@@ -517,7 +517,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
517517
}
518518
functionRegistry.createOrReplaceTempFunction(name, builder)
519519
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
520-
if (nullable) udf else udf.asNonNullabe()
520+
if (nullable) udf else udf.asNonNullable()
521521
}
522522

523523
/**
@@ -536,7 +536,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
536536
}
537537
functionRegistry.createOrReplaceTempFunction(name, builder)
538538
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
539-
if (nullable) udf else udf.asNonNullabe()
539+
if (nullable) udf else udf.asNonNullable()
540540
}
541541

542542
/**
@@ -555,7 +555,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
555555
}
556556
functionRegistry.createOrReplaceTempFunction(name, builder)
557557
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
558-
if (nullable) udf else udf.asNonNullabe()
558+
if (nullable) udf else udf.asNonNullable()
559559
}
560560

561561
/**
@@ -574,7 +574,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
574574
}
575575
functionRegistry.createOrReplaceTempFunction(name, builder)
576576
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
577-
if (nullable) udf else udf.asNonNullabe()
577+
if (nullable) udf else udf.asNonNullable()
578578
}
579579

580580
/**
@@ -593,7 +593,7 @@ class UDFRegistration private[sql] (functionRegistry: FunctionRegistry) extends
593593
}
594594
functionRegistry.createOrReplaceTempFunction(name, builder)
595595
val udf = UserDefinedFunction(func, dataType, inputTypes).withName(name)
596-
if (nullable) udf else udf.asNonNullabe()
596+
if (nullable) udf else udf.asNonNullable()
597597
}
598598

599599
//////////////////////////////////////////////////////////////////////////////////////////////

‎sql/core/src/main/scala/org/apache/spark/sql/expressions/UserDefinedFunction.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ case class UserDefinedFunction protected[sql] (
101101
*
102102
* @since 2.3.0
103103
*/
104-
def asNonNullabe(): UserDefinedFunction = {
104+
def asNonNullable(): UserDefinedFunction = {
105105
if (!nullable) {
106106
this
107107
} else {

‎sql/core/src/main/scala/org/apache/spark/sql/functions.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3226,7 +3226,7 @@ object functions {
32263226
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
32273227
val inputTypes = Try($inputTypes).toOption
32283228
val udf = UserDefinedFunction(f, dataType, inputTypes)
3229-
if (nullable) udf else udf.asNonNullabe()
3229+
if (nullable) udf else udf.asNonNullable()
32303230
}""")
32313231
}
32323232
@@ -3245,7 +3245,7 @@ object functions {
32453245
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
32463246
val inputTypes = Try(Nil).toOption
32473247
val udf = UserDefinedFunction(f, dataType, inputTypes)
3248-
if (nullable) udf else udf.asNonNullabe()
3248+
if (nullable) udf else udf.asNonNullable()
32493249
}
32503250

32513251
/**
@@ -3261,7 +3261,7 @@ object functions {
32613261
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
32623262
val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: Nil).toOption
32633263
val udf = UserDefinedFunction(f, dataType, inputTypes)
3264-
if (nullable) udf else udf.asNonNullabe()
3264+
if (nullable) udf else udf.asNonNullable()
32653265
}
32663266

32673267
/**
@@ -3277,7 +3277,7 @@ object functions {
32773277
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
32783278
val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: Nil).toOption
32793279
val udf = UserDefinedFunction(f, dataType, inputTypes)
3280-
if (nullable) udf else udf.asNonNullabe()
3280+
if (nullable) udf else udf.asNonNullable()
32813281
}
32823282

32833283
/**
@@ -3293,7 +3293,7 @@ object functions {
32933293
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
32943294
val inputTypes = Try(ScalaReflection.schemaFor(typeTag[A1]).dataType :: ScalaReflection.schemaFor(typeTag[A2]).dataType :: ScalaReflection.schemaFor(typeTag[A3]).dataType :: Nil).toOption
32953295
val udf = UserDefinedFunction(f, dataType, inputTypes)
3296-
if (nullable) udf else udf.asNonNullabe()
3296+
if (nullable) udf else udf.asNonNullable()
32973297
}
32983298

32993299
/**
@@ -3309,7 +3309,7 @@ object functions {
33093309
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
33103310
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
33113311
val udf = UserDefinedFunction(f, dataType, inputTypes)
3312-
if (nullable) udf else udf.asNonNullabe()
3312+
if (nullable) udf else udf.asNonNullable()
33133313
}
33143314

33153315
/**
@@ -3325,7 +3325,7 @@ object functions {
33253325
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
33263326
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
33273327
val udf = UserDefinedFunction(f, dataType, inputTypes)
3328-
if (nullable) udf else udf.asNonNullabe()
3328+
if (nullable) udf else udf.asNonNullable()
33293329
}
33303330

33313331
/**
@@ -3341,7 +3341,7 @@ object functions {
33413341
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
33423342
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
33433343
val udf = UserDefinedFunction(f, dataType, inputTypes)
3344-
if (nullable) udf else udf.asNonNullabe()
3344+
if (nullable) udf else udf.asNonNullable()
33453345
}
33463346

33473347
/**
@@ -3357,7 +3357,7 @@ object functions {
33573357
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
33583358
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
33593359
val udf = UserDefinedFunction(f, dataType, inputTypes)
3360-
if (nullable) udf else udf.asNonNullabe()
3360+
if (nullable) udf else udf.asNonNullable()
33613361
}
33623362

33633363
/**
@@ -3373,7 +3373,7 @@ object functions {
33733373
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
33743374
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
33753375
val udf = UserDefinedFunction(f, dataType, inputTypes)
3376-
if (nullable) udf else udf.asNonNullabe()
3376+
if (nullable) udf else udf.asNonNullable()
33773377
}
33783378

33793379
/**
@@ -3389,7 +3389,7 @@ object functions {
33893389
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
33903390
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
33913391
val udf = UserDefinedFunction(f, dataType, inputTypes)
3392-
if (nullable) udf else udf.asNonNullabe()
3392+
if (nullable) udf else udf.asNonNullable()
33933393
}
33943394

33953395
/**
@@ -3405,7 +3405,7 @@ object functions {
34053405
val ScalaReflection.Schema(dataType, nullable) = ScalaReflection.schemaFor[RT]
34063406
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
34073407
val udf = UserDefinedFunction(f, dataType, inputTypes)
3408-
if (nullable) udf else udf.asNonNullabe()
3408+
if (nullable) udf else udf.asNonNullable()
34093409
}
34103410

34113411
// scalastyle:on parameter.number

0 commit comments

Comments
 (0)