Skip to content

Commit 168d7b3

Browse files
committed
[SPARK-23329][SQL] Removed unnecessary aligning, reworded inverse functions
1 parent 0a0c4ae commit 168d7b3

1 file changed

Lines changed: 73 additions & 77 deletions

File tree

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

Lines changed: 73 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,78 +1313,75 @@ object functions {
13131313
//////////////////////////////////////////////////////////////////////////////////////////////
13141314

13151315
/**
1316-
* @return angle in radians whose cosine is `e`, as if computed by [[java.lang.Math#acos]]
1316+
* @return inverse cosine of `e` in radians, as if computed by [[java.lang.Math#acos]]
13171317
*
13181318
* @group math_funcs
13191319
* @since 1.4.0
13201320
*/
13211321
def acos(e: Column): Column = withExpr { Acos(e.expr) }
13221322

1323-
// scalastyle:off line.size.limit
13241323
/**
1325-
* @return angle in radians whose cosine is `columnName` as if computed by [[java.lang.Math#acos]]
1324+
* @return inverse cosine of `columnName`, as if computed by [[java.lang.Math#acos]]
13261325
*
13271326
* @group math_funcs
13281327
* @since 1.4.0
13291328
*/
13301329
def acos(columnName: String): Column = acos(Column(columnName))
13311330

13321331
/**
1333-
* @return angle in radians whose sine is `e`, as if computed by [[java.lang.Math#asin]]
1332+
* @return inverse sine of `e` in radians, as if computed by [[java.lang.Math#asin]]
13341333
*
13351334
* @group math_funcs
13361335
* @since 1.4.0
13371336
*/
13381337
def asin(e: Column): Column = withExpr { Asin(e.expr) }
13391338

13401339
/**
1341-
* @return angle in radians whose sine is `columnName`, as if computed by [[java.lang.Math#asin]]
1340+
* @return inverse sine of `columnName`, as if computed by [[java.lang.Math#asin]]
13421341
*
13431342
* @group math_funcs
13441343
* @since 1.4.0
13451344
*/
13461345
def asin(columnName: String): Column = asin(Column(columnName))
13471346

13481347
/**
1349-
* @return angle in radians whose tangent is `e`, as if computed by [[java.lang.Math#atan]]
1348+
* @return inverse tangent of `e`, as if computed by [[java.lang.Math#atan]]
13501349
*
13511350
* @group math_funcs
13521351
* @since 1.4.0
13531352
*/
13541353
def atan(e: Column): Column = withExpr { Atan(e.expr) }
13551354

1356-
// scalastyle:off line.size.limit
13571355
/**
1358-
* @return angle in radians whose tangent is `columnName`, as if computed by [[java.lang.Math#atan]]
1356+
* @return inverse tangent of `columnName`, as if computed by [[java.lang.Math#atan]]
13591357
*
13601358
* @group math_funcs
13611359
* @since 1.4.0
13621360
*/
13631361
def atan(columnName: String): Column = atan(Column(columnName))
13641362

13651363
/**
1366-
*
13671364
* @param y coordinate on y-axis
13681365
* @param x coordinate on x-axis
1369-
* @return the <i>theta</i> component of the point
1370-
* (<i>r</i>,&nbsp;<i>theta</i>)
1371-
* in polar coordinates that corresponds to the point
1372-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1373-
* as if computed by [[java.lang.Math#atan2]]
1366+
* @return the <i>theta</i> component of the point
1367+
* (<i>r</i>,&nbsp;<i>theta</i>)
1368+
* in polar coordinates that corresponds to the point
1369+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1370+
* as if computed by [[java.lang.Math#atan2]]
13741371
*
13751372
* @group math_funcs
13761373
* @since 1.4.0
13771374
*/
13781375
def atan2(y: Column, x: Column): Column = withExpr { Atan2(y.expr, x.expr) }
13791376

13801377
/**
1381-
* @param y coordinate on y-axis
1378+
* @param y coordinate on y-axis
13821379
* @param xName coordinate on x-axis
1383-
* @return the <i>theta</i> component of the point
1384-
* (<i>r</i>,&nbsp;<i>theta</i>)
1385-
* in polar coordinates that corresponds to the point
1386-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1387-
* as if computed by [[java.lang.Math#atan2]]
1380+
* @return the <i>theta</i> component of the point
1381+
* (<i>r</i>,&nbsp;<i>theta</i>)
1382+
* in polar coordinates that corresponds to the point
1383+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1384+
* as if computed by [[java.lang.Math#atan2]]
13881385
*
13891386
* @group math_funcs
13901387
* @since 1.4.0
@@ -1393,12 +1390,12 @@ object functions {
13931390

13941391
/**
13951392
* @param yName coordinate on y-axis
1396-
* @param x coordinate on x-axis
1397-
* @return the <i>theta</i> component of the point
1398-
* (<i>r</i>,&nbsp;<i>theta</i>)
1399-
* in polar coordinates that corresponds to the point
1400-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1401-
* as if computed by [[java.lang.Math#atan2]]
1393+
* @param x coordinate on x-axis
1394+
* @return the <i>theta</i> component of the point
1395+
* (<i>r</i>,&nbsp;<i>theta</i>)
1396+
* in polar coordinates that corresponds to the point
1397+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1398+
* as if computed by [[java.lang.Math#atan2]]
14021399
*
14031400
* @group math_funcs
14041401
* @since 1.4.0
@@ -1408,11 +1405,11 @@ object functions {
14081405
/**
14091406
* @param yName coordinate on y-axis
14101407
* @param xName coordinate on x-axis
1411-
* @return the <i>theta</i> component of the point
1412-
* (<i>r</i>,&nbsp;<i>theta</i>)
1413-
* in polar coordinates that corresponds to the point
1414-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1415-
* as if computed by [[java.lang.Math#atan2]]
1408+
* @return the <i>theta</i> component of the point
1409+
* (<i>r</i>,&nbsp;<i>theta</i>)
1410+
* in polar coordinates that corresponds to the point
1411+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1412+
* as if computed by [[java.lang.Math#atan2]]
14161413
*
14171414
* @group math_funcs
14181415
* @since 1.4.0
@@ -1421,27 +1418,27 @@ object functions {
14211418
atan2(Column(yName), Column(xName))
14221419

14231420
/**
1424-
* @param y coordinate on y-axis
1421+
* @param y coordinate on y-axis
14251422
* @param xValue coordinate on x-axis
1426-
* @return the <i>theta</i> component of the point
1427-
* (<i>r</i>,&nbsp;<i>theta</i>)
1428-
* in polar coordinates that corresponds to the point
1429-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1430-
* as if computed by [[java.lang.Math#atan2]]
1423+
* @return the <i>theta</i> component of the point
1424+
* (<i>r</i>,&nbsp;<i>theta</i>)
1425+
* in polar coordinates that corresponds to the point
1426+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1427+
* as if computed by [[java.lang.Math#atan2]]
14311428
*
14321429
* @group math_funcs
14331430
* @since 1.4.0
14341431
*/
14351432
def atan2(y: Column, xValue: Double): Column = atan2(y, lit(xValue))
14361433

14371434
/**
1438-
* @param yName coordinate on y-axis
1435+
* @param yName coordinate on y-axis
14391436
* @param xValue coordinate on x-axis
1440-
* @return the <i>theta</i> component of the point
1441-
* (<i>r</i>,&nbsp;<i>theta</i>)
1442-
* in polar coordinates that corresponds to the point
1443-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1444-
* as if computed by [[java.lang.Math#atan2]]
1437+
* @return the <i>theta</i> component of the point
1438+
* (<i>r</i>,&nbsp;<i>theta</i>)
1439+
* in polar coordinates that corresponds to the point
1440+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1441+
* as if computed by [[java.lang.Math#atan2]]
14451442
*
14461443
* @group math_funcs
14471444
* @since 1.4.0
@@ -1450,12 +1447,12 @@ object functions {
14501447

14511448
/**
14521449
* @param yValue coordinate on y-axis
1453-
* @param x coordinate on x-axis
1454-
* @return the <i>theta</i> component of the point
1455-
* (<i>r</i>,&nbsp;<i>theta</i>)
1456-
* in polar coordinates that corresponds to the point
1457-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1458-
* as if computed by [[java.lang.Math#atan2]]
1450+
* @param x coordinate on x-axis
1451+
* @return the <i>theta</i> component of the point
1452+
* (<i>r</i>,&nbsp;<i>theta</i>)
1453+
* in polar coordinates that corresponds to the point
1454+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1455+
* as if computed by [[java.lang.Math#atan2]]
14591456
*
14601457
* @group math_funcs
14611458
* @since 1.4.0
@@ -1464,12 +1461,12 @@ object functions {
14641461

14651462
/**
14661463
* @param yValue coordinate on y-axis
1467-
* @param xName coordinate on x-axis
1468-
* @return the <i>theta</i> component of the point
1469-
* (<i>r</i>,&nbsp;<i>theta</i>)
1470-
* in polar coordinates that corresponds to the point
1471-
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1472-
* as if computed by [[java.lang.Math#atan2]]
1464+
* @param xName coordinate on x-axis
1465+
* @return the <i>theta</i> component of the point
1466+
* (<i>r</i>,&nbsp;<i>theta</i>)
1467+
* in polar coordinates that corresponds to the point
1468+
* (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates,
1469+
* as if computed by [[java.lang.Math#atan2]]
14731470
*
14741471
* @group math_funcs
14751472
* @since 1.4.0
@@ -1538,7 +1535,7 @@ object functions {
15381535

15391536
/**
15401537
* @param e angle in radians
1541-
* @return cosine of the angle, as if computed by [[java.lang.Math#cos]]
1538+
* @return cosine of the angle, as if computed by [[java.lang.Math#cos]]
15421539
*
15431540
* @group math_funcs
15441541
* @since 1.4.0
@@ -1547,7 +1544,7 @@ object functions {
15471544

15481545
/**
15491546
* @param columnName angle in radians
1550-
* @return cosine of the angle, as if computed by [[java.lang.Math#cos]]
1547+
* @return cosine of the angle, as if computed by [[java.lang.Math#cos]]
15511548
*
15521549
* @group math_funcs
15531550
* @since 1.4.0
@@ -1556,7 +1553,7 @@ object functions {
15561553

15571554
/**
15581555
* @param e angle in radians
1559-
* @return hyperbolic cosine of the angle, as if computed by [[java.lang.Math#cosh]]
1556+
* @return hyperbolic cosine of the angle, as if computed by [[java.lang.Math#cosh]]
15601557
*
15611558
* @group math_funcs
15621559
* @since 1.4.0
@@ -1565,7 +1562,7 @@ object functions {
15651562

15661563
/**
15671564
* @param columnName angle in radians
1568-
* @return hyperbolic cosine of the angle, as if computed by [[java.lang.Math#cosh]]
1565+
* @return hyperbolic cosine of the angle, as if computed by [[java.lang.Math#cosh]]
15691566
*
15701567
* @group math_funcs
15711568
* @since 1.4.0
@@ -2009,7 +2006,7 @@ object functions {
20092006

20102007
/**
20112008
* @param e angle in radians
2012-
* @return sine of the angle, as if computed by [[java.lang.Math#sin]]
2009+
* @return sine of the angle, as if computed by [[java.lang.Math#sin]]
20132010
*
20142011
* @group math_funcs
20152012
* @since 1.4.0
@@ -2018,7 +2015,7 @@ object functions {
20182015

20192016
/**
20202017
* @param columnName angle in radians
2021-
* @return sine of the angle, as if computed by [[java.lang.Math#sin]]
2018+
* @return sine of the angle, as if computed by [[java.lang.Math#sin]]
20222019
*
20232020
* @group math_funcs
20242021
* @since 1.4.0
@@ -2027,7 +2024,7 @@ object functions {
20272024

20282025
/**
20292026
* @param e hyperbolic angle
2030-
* @return hyperbolic sine of the given value, as if computed by [[java.lang.Math#sinh]]
2027+
* @return hyperbolic sine of the given value, as if computed by [[java.lang.Math#sinh]]
20312028
*
20322029
* @group math_funcs
20332030
* @since 1.4.0
@@ -2036,7 +2033,7 @@ object functions {
20362033

20372034
/**
20382035
* @param columnName hyperbolic angle
2039-
* @return hyperbolic sine of the given value, as if computed by [[java.lang.Math#sinh]]
2036+
* @return hyperbolic sine of the given value, as if computed by [[java.lang.Math#sinh]]
20402037
*
20412038
* @group math_funcs
20422039
* @since 1.4.0
@@ -2045,15 +2042,15 @@ object functions {
20452042

20462043
/**
20472044
* @param e angle in radians
2048-
* @return tangent of the given value, as if computed by [[java.lang.Math#tan]]
2045+
* @return tangent of the given value, as if computed by [[java.lang.Math#tan]]
20492046
*
20502047
* @group math_funcs
20512048
* @since 1.4.0
20522049
*/
20532050
def tan(e: Column): Column = withExpr { Tan(e.expr) }
20542051

20552052
/**
2056-
* @param columnName angle in radians
2053+
* @param columnName angle in radians
20572054
* @return tangent of the given value, as if computed by [[java.lang.Math#tan]]
20582055
*
20592056
* @group math_funcs
@@ -2063,17 +2060,16 @@ object functions {
20632060

20642061
/**
20652062
* @param e hyperbolic angle
2066-
* @return hyperbolic tangent of the given value, as if computed by [[java.lang.Math#tanh]]
2063+
* @return hyperbolic tangent of the given value, as if computed by [[java.lang.Math#tanh]]
20672064
*
20682065
* @group math_funcs
20692066
* @since 1.4.0
20702067
*/
20712068
def tanh(e: Column): Column = withExpr { Tanh(e.expr) }
20722069

20732070
/**
2074-
* @param columnName hyperbolic angle
2075-
* @return hyperbolic tangent of the given value,
2076-
* as if computed by [[java.lang.Math#tanh]]
2071+
* @param columnName hyperbolic angle
2072+
* @return hyperbolic tangent of the given value, as if computed by [[java.lang.Math#tanh]]
20772073
*
20782074
* @group math_funcs
20792075
* @since 1.4.0
@@ -2097,8 +2093,8 @@ object functions {
20972093
/**
20982094
* Converts an angle measured in radians to an approximately equivalent angle measured in degrees.
20992095
*
2100-
* @param e angle in radians
2101-
* @return angle in degrees, as if computed by [[java.lang.Math#toDegrees]]
2096+
* @param e angle in radians
2097+
* @return angle in degrees, as if computed by [[java.lang.Math#toDegrees]]
21022098
*
21032099
* @group math_funcs
21042100
* @since 2.1.0
@@ -2108,8 +2104,8 @@ object functions {
21082104
/**
21092105
* Converts an angle measured in radians to an approximately equivalent angle measured in degrees.
21102106
*
2111-
* @param columnName angle in radians
2112-
* @return angle in degrees, as if computed by [[java.lang.Math#toDegrees]]
2107+
* @param columnName angle in radians
2108+
* @return angle in degrees, as if computed by [[java.lang.Math#toDegrees]]
21132109
*
21142110
* @group math_funcs
21152111
* @since 2.1.0
@@ -2133,8 +2129,8 @@ object functions {
21332129
/**
21342130
* Converts an angle measured in degrees to an approximately equivalent angle measured in radians.
21352131
*
2136-
* @param e angle in degrees
2137-
* @return angle in radians, as if computed by [[java.lang.Math#toRadians]]
2132+
* @param e angle in degrees
2133+
* @return angle in radians, as if computed by [[java.lang.Math#toRadians]]
21382134
*
21392135
* @group math_funcs
21402136
* @since 2.1.0
@@ -2144,8 +2140,8 @@ object functions {
21442140
/**
21452141
* Converts an angle measured in degrees to an approximately equivalent angle measured in radians.
21462142
*
2147-
* @param columnName angle in degrees
2148-
* @return angle in radians, as if computed by [[java.lang.Math#toRadians]]
2143+
* @param columnName angle in degrees
2144+
* @return angle in radians, as if computed by [[java.lang.Math#toRadians]]
21492145
*
21502146
* @group math_funcs
21512147
* @since 2.1.0

0 commit comments

Comments
 (0)