Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
[SPARK-23329][SQL] Fixed python style problem
  • Loading branch information
misutoth committed Mar 1, 2018
commit 10afda5d97146af7e02cc3b18968f89f074e093c
18 changes: 9 additions & 9 deletions R/pkg/R/functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ setMethod("abs",
})

#' @details
#' \code{acos}: Computes the inverse cosine of the given value,
#' \code{acos}: Returns the inverse cosine of the given value,
#' as if computed by \code{java.lang.Math.acos()}
#'
#' @rdname column_math_functions
Expand Down Expand Up @@ -334,7 +334,7 @@ setMethod("ascii",
})

#' @details
#' \code{asin}: Computes the inverse sine of the given value,
#' \code{asin}: Returns the inverse sine of the given value,
#' as if computed by \code{java.lang.Math.asin()}
#'
#' @rdname column_math_functions
Expand All @@ -349,7 +349,7 @@ setMethod("asin",
})

#' @details
#' \code{atan}: Computes the inverse tangent of the given value,
#' \code{atan}: Returns the inverse tangent of the given value,
#' as if computed by \code{java.lang.Math.atan()}
#'
#' @rdname column_math_functions
Expand Down Expand Up @@ -613,7 +613,7 @@ setMethod("covar_pop", signature(col1 = "characterOrColumn", col2 = "characterOr
})

#' @details
#' \code{cos}: Computes the cosine of the given value,
#' \code{cos}: Returns the cosine of the given value,
#' as if computed by \code{java.lang.Math.cos()}. Units in radians.
#'
#' @rdname column_math_functions
Expand All @@ -628,7 +628,7 @@ setMethod("cos",
})

#' @details
#' \code{cosh}: Computes the hyperbolic cosine of the given value,
#' \code{cosh}: Returns the hyperbolic cosine of the given value,
#' as if computed by \code{java.lang.Math.cosh()}.
#'
#' @rdname column_math_functions
Expand Down Expand Up @@ -1465,7 +1465,7 @@ setMethod("sign", signature(x = "Column"),
})

#' @details
#' \code{sin}: Computes the sine of the given value,
#' \code{sin}: Returns the sine of the given value,
#' as if computed by \code{java.lang.Math.sin()}. Units in radians.
#'
#' @rdname column_math_functions
Expand All @@ -1480,7 +1480,7 @@ setMethod("sin",
})

#' @details
#' \code{sinh}: Computes the hyperbolic sine of the given value,
#' \code{sinh}: Returns the hyperbolic sine of the given value,
#' as if computed by \code{java.lang.Math.sinh()}.
#'
#' @rdname column_math_functions
Expand Down Expand Up @@ -1657,7 +1657,7 @@ setMethod("sumDistinct",
})

#' @details
#' \code{tan}: Computes the tangent of the given value,
#' \code{tan}: Returns the tangent of the given value,
#' as if computed by \code{java.lang.Math.tan()}.
#' Units in radians.
#'
Expand All @@ -1673,7 +1673,7 @@ setMethod("tan",
})

#' @details
#' \code{tanh}: Computes the hyperbolic tangent of the given value,
#' \code{tanh}: Returns the hyperbolic tangent of the given value,
#' as if computed by \code{java.lang.Math.tanh()}.
#'
#' @rdname column_math_functions
Expand Down
16 changes: 9 additions & 7 deletions python/pyspark/sql/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ def _():
:return: sine of the angle, as if computed by `java.lang.Math.sin()`""",
'sinh': """:param col: hyperbolic angle
:return: hyperbolic sine of the given value,
as if computed by `java.lang.Math.sinh()`""",
as if computed by `java.lang.Math.sinh()`""",
'tan': """:param col: angle in radians
:return: tangent of the given value, as if computed by `java.lang.Math.tan()`""",
'tanh': """:param col: hyperbolic angle
:return: hyperbolic tangent of the given value,
as if computed by `java.lang.Math.tanh()`""",
as if computed by `java.lang.Math.tanh()`""",
'toDegrees': '.. note:: Deprecated in 2.1, use :func:`degrees` instead.',
'toRadians': '.. note:: Deprecated in 2.1, use :func:`radians` instead.',
'bitwiseNOT': 'Computes bitwise not.',
Expand Down Expand Up @@ -183,13 +183,15 @@ def _():

# math functions that take two arguments as input
_binary_mathfunctions = {
'atan2': """:param col1: coordinate on y-axis
'atan2': """
:param col1: coordinate on y-axis
:param col2: coordinate on x-axis
:return: the `theta` component of the point
(`r`, `theta`)
in polar coordinates that corresponds to the point
(`x`, `y`) in Cartesian coordinates,
as if computed by `java.lang.Math.atan2()`""",
(`r`, `theta`)
in polar coordinates that corresponds to the point
(`x`, `y`) in Cartesian coordinates,
as if computed by `java.lang.Math.atan2()`
""",
'hypot': 'Computes ``sqrt(a^2 + b^2)`` without intermediate overflow or underflow.',
'pow': 'Returns the value of the first argument raised to the power of the second argument.',
}
Expand Down